Remove saving from Configuration for now. It's never used and should be explicit if it is ever added back

Author: bobbylight

SpellChecker/src/main/java/org/fife/com/swabunga/spell/engine/Configuration.java

@@ -34,6 +34,11 @@
  */
 public abstract class Configuration {
 
+  /**
+   * System property that, if defined, should be a fully qualified class name of a configuration.
+   */
+  public static final String PROPERTY_CONFIG_OVERRIDE = "jazzy.config";
+
   /** used by EditDistance: the cost of having to remove a character <br/>(integer greater than 0). */
   public static final String COST_REMOVE_CHAR = "EDIT_DEL1";
 
@@ -102,18 +107,18 @@ public abstract class Configuration {
   public abstract boolean getBoolean(String key);
 
   /**
-   * Sets one of the integer constants.
+   * Sets one of the integer constants. Does not persist the change.
    *
    * @param key one of the integer constants defined in this class
-   * @param value new integer value of the constant
+   * @param value new integer value of the constant.
    */
   public abstract void setInteger(String key, int value);
 
   /**
-   * Sets one of the boolean constants.
+   * Sets one of the boolean constants. Does not persist the change.
    *
    * @param key one of the boolean constants defined in this class
-   * @param value new boolean value of this setting
+   * @param value new boolean value of this setting.
    */
   public abstract void setBoolean(String key, boolean value);
 
@@ -122,8 +127,8 @@ public abstract class Configuration {
    *
    * @return Configuration
    */
-  public static final Configuration getConfiguration() {
-    String config = System.getProperty("jazzy.config"); // added by bd
+  public static Configuration getConfiguration() {
+    String config = System.getProperty(PROPERTY_CONFIG_OVERRIDE); // added by bd
     if (config != null && !config.isEmpty())
         return getConfiguration(config);
     return getConfiguration(null);
@@ -133,9 +138,9 @@ public static final Configuration getConfiguration() {
    * Returns a new instance of a Configuration class.
    *
    * @param className - the class to return, must be based on Configuration
-   * @return Configuration
+   * @return The configuration.
    */
-  public static final Configuration getConfiguration(String className) {
+  public static Configuration getConfiguration(String className) {
 
     Configuration result;
 

SpellChecker/src/main/java/org/fife/com/swabunga/spell/engine/DoubleMeta.java

@@ -196,12 +196,13 @@ private static boolean stringAt(String string, int start, int length, String[] l
    */
   @Override
 public final String transform(String word) {
+    if (word == null || word.isEmpty()) {
+      return "";
+    }
 	StringBuilder primary = new StringBuilder(word.length() + 5);
     String in = word.toUpperCase() + "     ";
     int current = 0;
     int length = in.length();
-    if (length < 1)
-      return "";
     int last = length - 1;
     boolean isSlavoGermaic = slavoGermanic(in);
     if (stringAt(in, 0, 2, MY_LIST))

SpellChecker/src/main/java/org/fife/com/swabunga/spell/engine/PropertyConfiguration.java

@@ -20,7 +20,8 @@
 package org.fife.com.swabunga.spell.engine;
 
 import java.io.*;
-import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 
@@ -37,72 +38,46 @@ public class PropertyConfiguration extends Configuration {
    */
   private Properties prop;
 
-  /**
-   * The name of the file containing spell engine properties.
-   */
-  private URL filename;
+  private static final String DEFAULT_PROPERTIES = "org/fife/com/swabunga/spell/engine/configuration.properties";
+
+  private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
   /**
    * Constructs and loads spell engine properties configuration.
    */
   public PropertyConfiguration() {
+      this(DEFAULT_PROPERTIES);
+  }
+
+  public PropertyConfiguration(String resource) {
     prop = new Properties();
-    try {
-      filename = getClass().getClassLoader().getResource("org/fife/com/swabunga/spell/engine/configuration.properties");
-      InputStream in = filename.openStream();
-      prop.load(in);
-    } catch (IOException ioe) {
-      ioe.printStackTrace();
+    InputStream in = getClass().getClassLoader().getResourceAsStream(resource);
+    if (in != null) {
+        try (BufferedReader r = new BufferedReader(new InputStreamReader(in, DEFAULT_CHARSET))) {
+            prop.load(r);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
   }
 
-  /**
-   * @see org.fife.com.swabunga.spell.engine.Configuration#getBoolean(String)
-   */
   @Override
   public boolean getBoolean(String key) {
-	  // robert: Avoid Boolean allocations
 	  return Boolean.parseBoolean(prop.getProperty(key));
   }
 
-  /**
-   * @see org.fife.com.swabunga.spell.engine.Configuration#getInteger(String)
-   */
   @Override
   public int getInteger(String key) {
-	  // robert: Avoid Integer allocations
 	  return Integer.parseInt(prop.getProperty(key), 10);
   }
 
-  /**
-   * @see org.fife.com.swabunga.spell.engine.Configuration#setBoolean(String, boolean)
-   */
   @Override
   public void setBoolean(String key, boolean value) {
     prop.setProperty(key, String.valueOf(value));
-    save();
   }
 
-  /**
-   * @see org.fife.com.swabunga.spell.engine.Configuration#setInteger(String, int)
-   */
   @Override
   public void setInteger(String key, int value) {
     prop.setProperty(key, Integer.toString(value));
-    save();
   }
-
-  /**
-   * Writes the property list (key and element pairs) in the
-   * PropertyConfiguration file.
-   */
-  public void save() {
-    File file = new File(filename.getFile());
-    try (FileOutputStream fout = new FileOutputStream(file)) {
-        prop.store(fout, "HEADER");
-    } catch (IOException ioe) {
-        ioe.printStackTrace();
-    }
-  }
-
 }

SpellChecker/src/main/java/org/fife/com/swabunga/spell/event/AbstractWordTokenizer.java

@@ -38,7 +38,7 @@ public abstract class AbstractWordTokenizer implements WordTokenizer {
     /**
      * The word being analyzed.
      */
-    protected Word currentWord;
+    private Word currentWord;
     /**
      * The word finder used to filter out words which are non pertinent to spell checking.
      */

SpellChecker/src/main/java/org/fife/com/swabunga/spell/event/SpellChecker.java

@@ -232,14 +232,14 @@ public static boolean beginsAsINETWord(String word) {
    * @return true if this word looks like an Internet address.
    * @see #beginsAsINETWord(String)
    */
-  public static final boolean isINETWord(String word) {
+  public static boolean isINETWord(String word) {
     return beginsAsINETWord(word) || word.indexOf('@') > 0;
   }
 
 
   /**
    * Verifies if the word that is being spell checked contains all
-   * upper-cases characters.
+   * upper-cased characters.
    *
    * @param word The word to analyze for upper-cases characters
    * @return true if this word contains all upper case characters
@@ -554,5 +554,4 @@ private boolean isSupposedToBeCapitalized(String word, WordTokenizer wordTokeniz
     return configCapitalize && wordTokenizer.isNewSentence() && Character.isLowerCase(word.charAt(0));
   }
 
-
 }

SpellChecker/src/test/java/org/fife/com/swabunga/spell/engine/ConfigurationTest.java

@@ -1,19 +1,65 @@
 package org.fife.com.swabunga.spell.engine;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link Configuration}.
  */
 class ConfigurationTest {
 
+    private String origJazzyConfig;
+
+    @BeforeEach
+    void setUp() {
+        origJazzyConfig = System.getProperty(Configuration.PROPERTY_CONFIG_OVERRIDE);
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (origJazzyConfig != null) {
+            System.setProperty(Configuration.PROPERTY_CONFIG_OVERRIDE, origJazzyConfig);
+        } else {
+            System.clearProperty(Configuration.PROPERTY_CONFIG_OVERRIDE);
+        }
+    }
+
+    @Test
+    void testGetConfiguration_zeroArg_null_defaultValue() {
+        Configuration config = Configuration.getConfiguration();
+        Assertions.assertNotNull(config);
+    }
+
+    @Test
+    void testGetConfiguration_zeroArg_fromSystemProperty_defined() {
+        System.setProperty(Configuration.PROPERTY_CONFIG_OVERRIDE,
+                "org.fife.com.swabunga.spell.engine.PropertyConfiguration");
+        Configuration config = Configuration.getConfiguration();
+        Assertions.assertNotNull(config);
+    }
+
+    @Test
+    void testGetConfiguration_zeroArg_fromSystemProperty_emptyString_triggersDefaults() {
+        System.setProperty(Configuration.PROPERTY_CONFIG_OVERRIDE, "no.such.ClassConfiguration");
+        Configuration config = Configuration.getConfiguration();
+        Assertions.assertNotNull(config);
+    }
+
     @Test
-    void testGetConfiguration_zeroArg_defaultValue() {
+    void testGetConfiguration_zeroArg_fromSystemProperty_notDefined_triggersDefaults() {
+        System.setProperty(Configuration.PROPERTY_CONFIG_OVERRIDE, "");
         Configuration config = Configuration.getConfiguration();
         Assertions.assertNotNull(config);
     }
 
+    @Test
+    void testGetConfiguration_oneArg_emptyString_defaultValue() {
+        Configuration config = Configuration.getConfiguration("");
+        Assertions.assertNotNull(config);
+    }
+
     @Test
     void testGetConfiguration_oneArg_errorTriggersDefaults() {
         Configuration config = Configuration.getConfiguration("not/there");