Smart devices cache was not working fine in Spring Boot.

Issue 204052
459dbff

Author: iroqueta

common/src/main/java/com/genexus/BaseProvider.java

@@ -1,6 +1,7 @@
 package com.genexus;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.ListIterator;
@@ -18,6 +19,10 @@
 import com.genexus.common.interfaces.SpecificImplementation;
 import com.genexus.util.GXDirectory;
 import com.genexus.util.GXFileCollection;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
 public abstract class BaseProvider implements IGXSmartCacheProvider
 	{
@@ -50,33 +55,66 @@ private void loadQueryTables()
 				String path = SpecificImplementation.Application.getModelContext().getHttpContext().getDefaultPath();
 				String configurationDirectoryPath = path + File.separatorChar + "Metadata" + File.separatorChar + "TableAccess";
 				ConcurrentHashMap<String, Vector<String>> qTables = new ConcurrentHashMap<String, Vector<String>>();
-				GXDirectory configurationDirectory = new GXDirectory(configurationDirectoryPath);
-				GXFileCollection files = configurationDirectory.getFiles();
+				if (ApplicationContext.getInstance().isSpringBootApp())
+					loadQueryTablesSpringBoot(configurationDirectoryPath, qTables);
+				else
+					loadQueryTablesFileSystem(configurationDirectoryPath, qTables);
+				startupDate = CommonUtil.now(false,false);
+				queryTables = qTables;
+			}
+		}
+
+		private void loadQueryTablesFileSystem(String configurationDirectoryPath, ConcurrentHashMap<String, Vector<String>> qTables){
+			GXDirectory configurationDirectory = new GXDirectory(configurationDirectoryPath);
+			GXFileCollection files = configurationDirectory.getFiles();
+			XMLReader reader = new XMLReader();
+			boolean anyTables=false;
+			for(int i=1; i <= files.getItemCount(); i++)
+			{
+				AbstractGXFile xmlFile = files.item(i);
+				String xmlFileName = xmlFile.getAbsoluteName();
+				String xmlFileNameNoExt = xmlFile.getNameNoExt();
+				anyTables = processXMLFile(reader, anyTables, xmlFileName, xmlFileNameNoExt, qTables);
+			}
+		}
+
+		private void loadQueryTablesSpringBoot(String configurationDirectoryPath, ConcurrentHashMap<String, Vector<String>> qTables){
+			PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+			try {
+				Resource[] resources = resolver.getResources("classpath:" + configurationDirectoryPath + "/*");
 				XMLReader reader = new XMLReader();
-				short ok;
 				boolean anyTables=false;
-				for(int i=1; i <= files.getItemCount(); i++)
-				{
-					Vector<String> lst = new Vector<String>();
-					lst.add(FORCED_INVALIDATE); // Caso en que se invalido el cache manualmente
-					AbstractGXFile xmlFile = files.item(i);
-					reader.open(xmlFile.getAbsoluteName());
-					ok = reader.readType(1, "Table");
-					while (ok == 1)
-					{
-						anyTables=true;
-						lst.add(normalizeKey((String) reader.getAttributeByName("name")));
-						ok = reader.readType(1, "Table");
-					}
-					reader.close();
-					if (anyTables) {
-						qTables.put(normalizeKey((String) xmlFile.getNameNoExt()), lst);
-					}
+				for (Resource resource : resources) {
+					String xmlFileName = resource.getFilename();
+					String xmlFileNameNoExt = xmlFileName.substring(0, xmlFileName.lastIndexOf('.'));
+					xmlFileName = resource instanceof FileSystemResource? ((FileSystemResource) resource).getPath() : ((ClassPathResource) resource).getPath();
+					anyTables = processXMLFile(reader, anyTables, xmlFileName, xmlFileNameNoExt, qTables);
 				}
-				startupDate = CommonUtil.now(false,false);
-				queryTables = qTables;
+			}
+			catch (IOException e){
+				logger.error("Error loading Query Tables ", e);
 			}
 		}
+
+		private boolean processXMLFile(XMLReader reader, boolean anyTables, String xmlFileName, String xmlFileNameNoExt, ConcurrentHashMap<String, Vector<String>> qTables) {
+			Vector<String> lst = new Vector<>();
+			lst.add(FORCED_INVALIDATE); // Caso en que se invalido el cache manualmente
+			reader.open(xmlFileName);
+			short ok = reader.readType(1, "Table");
+			boolean anyLocalTables = false;
+			while (ok == 1)
+			{
+				anyLocalTables = true;
+				lst.add(normalizeKey(reader.getAttributeByName("name")));
+				ok = reader.readType(1, "Table");
+			}
+			reader.close();
+			if (anyTables || anyLocalTables) {
+				qTables.put(normalizeKey(xmlFileNameNoExt), lst);
+			}
+			return anyTables || anyLocalTables;
+		}
+
 		public ConcurrentHashMap<String, Vector<String>> queryTables() {
 			if (queryTables == null)
 			{