Refactor: Remove unused methods and clean up code

Author: lm-sousa

LARAI/resources/larai/test/api/StringsTest.js

@@ -1,7 +1,5 @@
 import Strings from "@specs-feup/lara/api/lara/Strings.js";
 
-console.log("Escaped HTML: " + Strings.escapeHtml("<h1>Hello</h1>"));
-
 // Replacer
 console.log("Replacer 1: " + Strings.replacer("WWRWW", "WRW", "W"));
 console.log("Replacer 2: " + Strings.replacer("W R W", /\s/g, ""));

LARAI/resources/larai/test/api/results/StringsTest.js.txt

@@ -1,3 +1,2 @@
-Escaped HTML: <h1>Hello</h1>
 Replacer 1: WWW
 Replacer 2: WRW

LARAI/src/org/lara/interpreter/cli/JOptionsInterface.java

@@ -14,7 +14,6 @@
 package org.lara.interpreter.cli;
 
 import org.lara.interpreter.joptions.config.interpreter.LaraiKeys;
-import org.lara.interpreter.utils.LaraIUtils;
 import org.lara.interpreter.weaver.options.WeaverOption;
 import org.suikasoft.jOptions.Datakey.DataKey;
 import org.suikasoft.jOptions.Interfaces.DataStore;
@@ -28,8 +27,6 @@
 
 public class JOptionsInterface {
 
-    private static final String LARAPATH = "$LARAI";
-
     private static final Map<WeaverOption, DataKey<?>> CONVERSION_MAP;
 
     static {
@@ -71,7 +68,6 @@ public static DataStore getDataStore(String name, Properties properties) {
             }
 
             String property = properties.getProperty(key.toString());
-            property.replace(LARAPATH, LaraIUtils.getJarFoldername());
             data.setString(datakey, property);
         }
 

LARAI/src/org/lara/interpreter/joptions/config/interpreter/LaraIDataStore.java

@@ -18,9 +18,7 @@
 import org.lara.interpreter.weaver.options.WeaverOption;
 import org.suikasoft.jOptions.Datakey.DataKey;
 import org.suikasoft.jOptions.Interfaces.DataStore;
-import org.suikasoft.jOptions.JOptionsUtils;
 import pt.up.fe.specs.util.SpecsIo;
-import pt.up.fe.specs.util.SpecsLogs;
 import java.io.File;
 import java.util.*;
 
@@ -34,24 +32,16 @@
 public class LaraIDataStore implements LaraiKeys {
 
     public static final String CONFIG_FILE_NAME = "larai.properties";
-    private static final String SYSTEM_OPTIONS_FILENAME = "system_options.xml";
 
     public static String getConfigFileName() {
         return CONFIG_FILE_NAME;
     }
 
-    public static String getSystemOptionsFilename() {
-        return SYSTEM_OPTIONS_FILENAME;
-    }
-
     private final DataStore dataStore;
 
     public LaraIDataStore(LaraI lara, DataStore dataStore, WeaverEngine weaverEngine) {
 
-        // Merge system-wise options with local options
-
-        // this.dataStore = dataStore;
-        this.dataStore = mergeSystemAndLocalOptions(weaverEngine, dataStore);
+        this.dataStore = dataStore;
 
         for (WeaverOption option : weaverEngine.getOptions()) {
             DataKey<?> key = option.dataKey();
@@ -61,59 +51,6 @@ public LaraIDataStore(LaraI lara, DataStore dataStore, WeaverEngine weaverEngine
         setLaraProperties();
     }
 
-    private DataStore mergeSystemAndLocalOptions(WeaverEngine weaverEngine, DataStore localArgs) {
-        var systemOptionsFilename = weaverEngine.getName() + "_" + getSystemOptionsFilename();
-
-        var storeDef = localArgs.getStoreDefinitionTry().orElse(null);
-
-        if (storeDef == null) {
-            SpecsLogs.debug(() -> "Local data store does not have a store definition, system-wide options in file '"
-                    + systemOptionsFilename + "' not supported");
-            return localArgs;
-        }
-
-        var persistence = localArgs.getPersistence().orElse(null);
-
-        if (persistence == null) {
-            SpecsLogs.debug(
-                    () -> "Local data store does not have an instance of AppPersistence set, system-wide options in file '"
-                            + systemOptionsFilename + "' not supported");
-            return localArgs;
-        }
-
-        DataStore defaultOptions = JOptionsUtils.loadDataStore(systemOptionsFilename, getClass(),
-                storeDef, persistence);
-
-        defaultOptions.getConfigFile().ifPresent(defaultOptionsFile -> SpecsLogs
-                .debug("Loading default options in file '" + defaultOptionsFile.getAbsolutePath() + "'"));
-
-        SpecsLogs.debug(() -> "Loading system-wide options");
-        SpecsLogs.debug(() -> "Original options: " + localArgs);
-
-        // Merge default values in localArgs
-        var localArgsKeys = localArgs.getKeysWithValues();
-
-        for (var key : defaultOptions.getKeysWithValues()) {
-
-            // Only set if no value is set yet
-            if (localArgsKeys.contains(key)) {
-                continue;
-            }
-
-            // And if key is part of the store definition
-            if (!storeDef.hasKey(key)) {
-                continue;
-            }
-
-            localArgs.setRaw(key, defaultOptions.get(key));
-        }
-
-        SpecsLogs.debug(() -> "Merged options  : " + localArgs);
-
-        // return mergedOptions;
-        return localArgs;
-    }
-
     /**
      * Set an option on lara according to the value given, if the option exists on
      * the enum {@link Argument}

LARAI/src/org/lara/interpreter/joptions/config/interpreter/LaraiStoreDefinition.java

@@ -22,7 +22,6 @@
 import java.util.Properties;
 
 import org.lara.interpreter.cli.JOptionsInterface;
-import org.lara.interpreter.utils.LaraIUtils;
 import org.suikasoft.jOptions.Datakey.DataKey;
 import org.suikasoft.jOptions.Interfaces.DataStore;
 import org.suikasoft.jOptions.storedefinition.StoreDefinition;
@@ -56,12 +55,9 @@ private static DataStore getDefaultValues() {
     }
 
     private static Properties getDefaultProperties() {
-        String jarLoc = LaraIUtils.getJarFoldername();
         Properties properties = new Properties();
 
-        File globalFile = new File(jarLoc, LaraIDataStore.getConfigFileName());
         File localFile = new File(LaraIDataStore.getConfigFileName());
-        loadProperties(properties, globalFile);
         loadProperties(properties, localFile);
 
         return properties;

LARAI/src/org/lara/interpreter/utils/LaraIUtils.java

@@ -16,9 +16,7 @@
 import org.apache.commons.cli.Options;
 import org.lara.interpreter.cli.CLIOption;
 import org.lara.interpreter.cli.OptionsParser;
-import larai.LaraI;
 import pt.up.fe.specs.util.SpecsSystem;
-import pt.up.fe.specs.util.utilities.JarPath;
 
 public class LaraIUtils {
 
@@ -39,18 +37,4 @@ public static boolean printHelp(CommandLine cmd, Options options) {
         }
         return false;
     }
-
-    /**
-     * Enables lazy initialization of jarParth
-     *
-     * @author Joao Bispo
-     */
-    private static class JarPathHolder {
-        public static final String instance = new JarPath(LaraI.class, LaraI.PROPERTY_JAR_PATH).buildJarPath();
-
-    }
-
-    public static String getJarFoldername() {
-        return JarPathHolder.instance;
-    }
 }

LARAI/test/org/lara/interpreter/joptions/config/interpreter/LaraIDataStoreTest.java

@@ -69,16 +69,6 @@ void testGetConfigFileName() {
         assertThat(fileName).isEqualTo("larai.properties");
     }
 
-    @Test
-    @DisplayName("getSystemOptionsFilename() should return correct file name")
-    void testGetSystemOptionsFilename() {
-        // When
-        String fileName = LaraIDataStore.getSystemOptionsFilename();
-
-        // Then
-        assertThat(fileName).isEqualTo("system_options.xml");
-    }
-
     @Test
     @DisplayName("constructor should create instance with empty weaver options")
     void testConstructor_EmptyWeaverOptions() {

LARAI/test/org/lara/interpreter/utils/LaraIUtilsTest.java

@@ -105,30 +105,6 @@ void testPrintHelp_NoOptions() {
         assertThat(outputStreamCaptor.toString()).isEmpty();
     }
 
-    @Test
-    @DisplayName("getJarFoldername should return non-null jar path")
-    void testGetJarFoldername() {
-        // When
-        String jarPath = LaraIUtils.getJarFoldername();
-
-        // Then
-        assertThat(jarPath).isNotNull();
-        // Note: The actual path depends on the runtime environment
-        // We can only verify it's not null and is a string
-    }
-
-    @Test
-    @DisplayName("getJarFoldername should return same instance on multiple calls (lazy initialization)")
-    void testGetJarFoldername_LazyInitialization() {
-        // When
-        String jarPath1 = LaraIUtils.getJarFoldername();
-        String jarPath2 = LaraIUtils.getJarFoldername();
-
-        // Then
-        assertThat(jarPath1).isEqualTo(jarPath2);
-        assertThat(jarPath1).isSameAs(jarPath2); // Should be the same instance
-    }
-
     @Test
     @DisplayName("printHelp should handle both help and version options correctly")
     void testPrintHelp_PriorityHandling() {

Lara-JS/src-api/lara/Strings.ts

@@ -39,15 +39,6 @@ export default class Strings {
     return string.replace(oldSequence, newSequence);
   }
 
-  /**
-   * Escapes HTML code.
-   *
-   * @returns String with escaped code
-   */
-  static escapeHtml(html: string) {
-    return JavaTypes.ApacheStrings.escapeHtml(html);
-  }
-
   /**
    * Escapes JSON content.
    *

Lara-JS/src-api/lara/util/JavaTypes.ts

@@ -29,7 +29,6 @@ export namespace JavaClasses {
     escapeJson(str: string): string;
   }
   export interface SpecsSystem extends JavaClass {}
-  export interface ApacheStrings extends JavaClass {}
   export interface StringLines extends JavaClass {}
   export interface LaraIo extends JavaClass {}
   export interface SpecsIo extends JavaClass {}
@@ -159,12 +158,6 @@ export default class JavaTypes {
     ) as JavaClasses.SpecsSystem;
   }
 
-  static get ApacheStrings() {
-    return JavaTypes.getType(
-      "pt.up.fe.specs.lang.ApacheStrings"
-    ) as JavaClasses.ApacheStrings;
-  }
-
   static get StringLines() {
     return JavaTypes.getType(
       "pt.up.fe.specs.util.utilities.StringLines"