Commit edf505ae authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Remove String[][] as configuration value type.

parent ccdad654

src/main/java/org/torproject/metrics/collector/conf/Configuration.java

+0 −24
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ public class Configuration extends Observable implements Cloneable { 
      Executors.newScheduledThreadPool(1);



  public static final String FIELDSEP = ",";

  public static final String ARRAYSEP = ";";



  private final Properties props = new Properties();

  private Path configurationFile;
@@ -142,29 +141,6 @@ public class Configuration extends Observable implements Cloneable { 
    return props.size();

  }



  /**

   * Returns {@code String[][]} from a property. Commas seperate array elements

   * and semicolons separate arrays, e.g.,

   * {@code propertyname = a1, a2, a3; b1, b2, b3}

   */

  public String[][] getStringArrayArray(Key key) throws ConfigurationException {

    try {

      checkClass(key, String[][].class);

      String[] interim = props.getProperty(key.name()).split(ARRAYSEP);

      String[][] res = new String[interim.length][];

      for (int i = 0; i < interim.length; i++) {

        res[i] = interim[i].trim().split(FIELDSEP);

        for (int j = 0; j < res[i].length; j++) {

          res[i][j] = res[i][j].trim();

        }

      }

      return res;

    } catch (RuntimeException re) {

      throw new ConfigurationException("Corrupt property: " + key

          + " reason: " + re.getMessage(), re);

    }

  }



  /**

   * Returns {@code String[]} from a property. Commas seperate array elements,

   * e.g.,

src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java

+0 −7
Original line number Diff line number Diff line
@@ -147,13 +147,6 @@ public class ConfigurationTest { 
        array, conf.getUrlArray(Key.RelaySyncOrigins));

  }



  @Test(expected = ConfigurationException.class)

  public void testArrayArrayValueException() throws Exception {

    Configuration conf = new Configuration();

    conf.setProperty(Key.RelayCacheOrigins.name(), "");

    conf.getStringArrayArray(Key.OutputPath);

  }



  @Test(expected = ConfigurationException.class)

  public void testPathValueException() throws Exception {

    Configuration conf = new Configuration();