diff --git a/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java b/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java index 78eaa7527d8097b66a3adbe4173a2d6e3bfd8cbe..ae992b1c76b9b450db9d88f82997762ee1a01e83 100644 --- a/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java +++ b/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java @@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory; @PropertySuffixes(extraSuffixes = { }, hostNames = false) public final class ConfigIsochrone { private static final Logger LOGGER = LoggerFactory.getLogger(ConfigIsochrone.class); - private static final int PREFIX_MAX_LENGTH = 4; private static ConfigIsochrone instance = null; private ConnectionFactory factory; @@ -71,11 +70,6 @@ public final class ConfigIsochrone { @PropertyValue("org.postgresql.port") private Integer port; - @NotNull - @DefaultValue("") - @PropertyValue("prefix") - private String prefix; - @NotNull @PropertyValue("org.postgresql.username") private String user; @@ -144,18 +138,6 @@ public final class ConfigIsochrone { return maxConnections; } - public String getPrefix() { - if (prefix == null) { - return null; - } - - if (prefix.length() > PREFIX_MAX_LENGTH) { - return prefix.substring(0, PREFIX_MAX_LENGTH); - } - - return prefix; - } - public boolean isPooling() { return pooling; } diff --git a/src/main/resources/config.xml b/src/main/resources/config.xml index ae96077dcd263246fc8c12d4f065b7374c2fa2d9..76c113fafc693536a85b2090cabf0a21cb12e95e 100644 --- a/src/main/resources/config.xml +++ b/src/main/resources/config.xml @@ -11,7 +11,4 @@ <entry key="org.postgresql.username">niko</entry> <entry key="org.postgresql.password">secretPhdPassword#2014!</entry> <entry key="org.postgresql.port">5432</entry> - - <!-- Postgres/Geoserver prefix --> - <entry key="tablePrefix"></entry> </properties> diff --git a/src/test/resources/config-test.xml b/src/test/resources/config-test.xml index b8fdfea6bdcaf5f3cc1681fbb764a6a4c8bd0d86..b6a7ae3f77ed74353c96d14156c224d282bdfa40 100644 --- a/src/test/resources/config-test.xml +++ b/src/test/resources/config-test.xml @@ -3,7 +3,4 @@ <properties> <!-- Postgres database --> <entry key="org.postgresql.servername">dbis-isochrone.uibk.ac.at</entry> - - <!-- Postgres/Geoserver prefix --> - <entry key="prefix">test</entry> </properties>