Support custom config files

liberty-ls/src/main/java/io/openliberty/tools/langserver/LibertyConfigFileManager.java

@@ -31,8 +31,8 @@
 
 public class LibertyConfigFileManager {
     public static final String LIBERTY_PLUGIN_CONFIG_XML = "liberty-plugin-config.xml";
-    public static final String CUSTOM_SERVER_ENV_XML_TAG = "serverEnvFile";
-    public static final String CUSTOM_BOOTSTRAP_PREOPERTIES_XML_TAG = "bootstrapPropertiesFile";
+    public static final String CUSTOM_SERVER_ENV_XML_TAG = "serverEnv";
+    public static final String CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG = "bootstrapPropertiesFile";
 
     private static Set<String> customServerEnvFiles = new HashSet<String>();
     private static Set<String> customBootstrapFiles = new HashSet<String>();
@@ -70,14 +70,14 @@ public static void processLibertyPluginConfigXml(String uri) {
         }
         Map<String, String> customConfigFiles = XmlReader.readTagsFromXml(uri,
                 CUSTOM_SERVER_ENV_XML_TAG,
-                CUSTOM_BOOTSTRAP_PREOPERTIES_XML_TAG);
+                CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG);
         // TODO: handle deletions. maybe use map with <uri, path> ? and clear all that
         // match uri
         if (customConfigFiles.containsKey(CUSTOM_SERVER_ENV_XML_TAG)) {
             customServerEnvFiles.add(customConfigFiles.get(CUSTOM_SERVER_ENV_XML_TAG));
         }
-        if (customConfigFiles.containsKey(CUSTOM_BOOTSTRAP_PREOPERTIES_XML_TAG)) {
-            customBootstrapFiles.add(customConfigFiles.get(CUSTOM_BOOTSTRAP_PREOPERTIES_XML_TAG));
+        if (customConfigFiles.containsKey(CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG)) {
+            customBootstrapFiles.add(customConfigFiles.get(CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG));
         }
     }
 

liberty-ls/src/main/java/io/openliberty/tools/langserver/LibertyLanguageServer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2020, 2022 IBM Corporation and others.
+* Copyright (c) 2020, 2023 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,7 +29,7 @@
 import io.openliberty.tools.langserver.common.ParentProcessWatcher.ProcessLanguageServer;
 
 public class LibertyLanguageServer extends AbstractLanguageServer implements ProcessLanguageServer, LanguageClientAware {
-
+    protected String test;
     public static final String LANGUAGE_ID = "LANGUAGE_ID_LIBERTY";
     private static final Logger LOGGER = Logger.getLogger(LibertyLanguageServer.class.getName());
 
@@ -124,8 +124,4 @@ public LanguageClient getLanguageClient() {
     public void setLanguageClient(LanguageClient languageClient) {
         this.languageClient = languageClient;
     }
-
-    private void initLibertyConfigFileManager() {
-
-    }
 }

liberty-ls/src/main/java/io/openliberty/tools/langserver/LibertyWorkspaceService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2020, 2022 IBM Corporation and others.
+* Copyright (c) 2020, 2023 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,6 @@ public class LibertyWorkspaceService implements WorkspaceService {
 
     public LibertyWorkspaceService(LibertyLanguageServer libertyls) {
         this.libertyLanguageServer = libertyls;
-        // TODO: init scanning liberty-plugin-config.xml files
     }
 
     @Override

liberty-ls/src/main/java/io/openliberty/tools/langserver/diagnostic/LibertyPropertiesDiagnosticService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2022 IBM Corporation and others.
+* Copyright (c) 2022, 2023 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
 
 import io.openliberty.tools.langserver.LibertyConfigFileManager;
 import io.openliberty.tools.langserver.ls.LibertyTextDocument;
-import io.openliberty.tools.langserver.utils.ParserFileHelperUtil;
 import io.openliberty.tools.langserver.utils.PropertiesValidationResult;
 import io.openliberty.tools.langserver.utils.ServerPropertyValues;
 

liberty-ls/src/main/java/io/openliberty/tools/langserver/utils/ParserFileHelperUtil.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2022 IBM Corporation and others.
+* Copyright (c) 2022, 2023 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,4 +29,4 @@ public String getLine(String text, int line) {
         }
         return null;
     }
-}
+}

liberty-ls/src/main/java/io/openliberty/tools/langserver/utils/XmlReader.java

@@ -74,8 +74,8 @@ public static Map<String, String> getElementValues(File file, Set<String> elemen
         } catch (FileNotFoundException e) {
             LOGGER.severe("Unable to access file "+ file.getName());
         } catch (XMLStreamException e) {
-            LOGGER.severe("Error received trying to read XML file: " + file.getName());
-            e.printStackTrace();
+            LOGGER.severe("Error received trying to read XML file: " + file.getName() + 
+                          "\n\tError" + e.getMessage());
         } finally {
             if (reader != null) {
                 try {

liberty-ls/src/test/java/io/openliberty/tools/langserver/xml/XmlReaderTest.java

@@ -23,27 +23,27 @@ public class XmlReaderTest {
     public void readLibertyPluginConfigXml() throws IOException {
         File lpcXml = new File(resourcesDir, "xml/unix/liberty-plugin-config.xml");
         Map<String, String> tagValues = XmlReader.readTagsFromXml(lpcXml.toURI().getPath(), 
-                LibertyConfigFileManager.CUSTOM_BOOTSTRAP_PREOPERTIES_XML_TAG, 
+                LibertyConfigFileManager.CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG, 
                 LibertyConfigFileManager.CUSTOM_SERVER_ENV_XML_TAG);
 
         assertNotNull(tagValues);
         assertEquals("Did not find custom config files", 2, tagValues.size());
 
         Set<String> elementNames = new HashSet<String> ();
         elementNames.add("configFile");
-        elementNames.add("bootstrapPropertiesFile");
-        elementNames.add("serverEnvFile");
+        elementNames.add(LibertyConfigFileManager.CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG);
+        elementNames.add(LibertyConfigFileManager.CUSTOM_SERVER_ENV_XML_TAG);
 
         Map<String, String> values = XmlReader.getElementValues(lpcXml, elementNames);
         assertTrue("Did not find expected number of elements in liberty-plugin-config.xml file. Expected 3, found "+values.size(), values.size() == 3);
 
         assertTrue("Expected configFile element not found", values.containsKey("configFile"));
         assertTrue("Expected configFile value not found. Value found: "+values.get("configFile"), values.get("configFile").equals("/user/sample-project/src/main/liberty/config/server.xml"));
 
-        assertTrue("Expected bootstrapPropertiesFile element not found", values.containsKey("bootstrapPropertiesFile"));
-        assertTrue("Expected bootstrapPropertiesFile value not found. Value found: "+values.get("bootstrapPropertiesFile"), values.get("bootstrapPropertiesFile").equals("/user/sample-project/src/main/liberty/config/custombootstrapprops.properties"));
+        assertTrue("Expected bootstrapPropertiesFile element not found", values.containsKey(LibertyConfigFileManager.CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG));
+        assertTrue("Expected bootstrapPropertiesFile value not found. Value found: "+values.get(LibertyConfigFileManager.CUSTOM_BOOTSTRAP_PROPERTIES_XML_TAG), values.get("bootstrapPropertiesFile").equals("/user/sample-project/src/main/liberty/config/custombootstrapprops.properties"));
 
-        assertTrue("Expected serverEnvFile element not found", values.containsKey("serverEnvFile"));
-        assertTrue("Expected serverEnvFile value not found. Value found: "+values.get("serverEnvFile"), values.get("serverEnvFile").equals("/user/sample-project/src/main/liberty/config/customserverenv.env"));
+        assertTrue("Expected serverEnvFile element not found", values.containsKey(LibertyConfigFileManager.CUSTOM_SERVER_ENV_XML_TAG));
+        assertTrue("Expected serverEnvFile value not found. Value found: "+values.get(LibertyConfigFileManager.CUSTOM_SERVER_ENV_XML_TAG), values.get(LibertyConfigFileManager.CUSTOM_SERVER_ENV_XML_TAG).equals("/user/sample-project/src/main/liberty/config/customserverenv.env"));
     }
 }

liberty-ls/src/test/resources/xml/unix/liberty-plugin-config.xml

@@ -8,7 +8,7 @@
     <configDirectory>/user/sample-project/src/main/liberty/config</configDirectory>
     <configFile>/user/sample-project/src/main/liberty/config/server.xml</configFile>
     <bootstrapPropertiesFile>/user/sample-project/src/main/liberty/config/custombootstrapprops.properties</bootstrapPropertiesFile>
-    <serverEnvFile>/user/sample-project/src/main/liberty/config/customserverenv.env</serverEnvFile>
+    <serverEnv>/user/sample-project/src/main/liberty/config/customserverenv.env</serverEnvFile>
     <appsDirectory>apps</appsDirectory>
     <looseApplication>true</looseApplication>
     <stripVersion>false</stripVersion>
@@ -31,4 +31,4 @@
     <projectCompileDependency>org.opentest4j:opentest4j:1.2.0</projectCompileDependency>
     <projectCompileDependency>org.junit.platform:junit-platform-commons:1.8.2</projectCompileDependency>
     <projectCompileDependency>org.apiguardian:apiguardian-api:1.1.2</projectCompileDependency>
-</liberty-plugin-config>
+</liberty-plugin-config>