From ea2c1392bd461c38359a90d63dd881e6aaf03511 Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Tue, 2 May 2017 15:00:33 +0000 Subject: [PATCH] Removed code which get properties no more needed git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@148243 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../dbinitialization/DatabaseEnvironment.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java index ed5f37b..a288fe5 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java @@ -29,12 +29,6 @@ public class DatabaseEnvironment { protected static final String REMOTE_PROTOCOL; protected static final String REMOTE_PROTOCOL_VARNAME = "REMOTE_PROTOCOL"; - protected static final String HTTP_PROTOCOL; - protected static final String HTTP_PROTOCOL_VARNAME = "HTTP_PROTOCOL"; - - protected static final String HTTP_PORT; - protected static final String HTTP_PORT_VARNAME = "HTTP_PORT"; - public static final String DB; protected static final String DB_VARNAME = "DB"; @@ -66,16 +60,11 @@ public class DatabaseEnvironment { public static final Map DEFAULT_PASSWORDS; - protected static final String HOSTS; - protected static final String[] HOST_ARRAY; public static final String SERVER_URI; public static final String DB_URI; - public static final String[] HTTP_URL_STRINGS; - - static { Properties properties = new Properties(); InputStream input = null; @@ -90,10 +79,7 @@ public class DatabaseEnvironment { HOSTS = properties.getProperty(HOST_VARNAME); REMOTE_PROTOCOL = properties.getProperty(REMOTE_PROTOCOL_VARNAME); - - HTTP_PROTOCOL = properties.getProperty(HTTP_PROTOCOL_VARNAME); - HTTP_PORT = properties.getProperty(HTTP_PORT_VARNAME); - + DB = properties.getProperty(DB_VARNAME); SERVER_URI = REMOTE_PROTOCOL + HOSTS; DB_URI = SERVER_URI + "/" + DB; @@ -135,13 +121,6 @@ public class DatabaseEnvironment { DEFAULT_PASSWORDS.put(PermissionMode.READER, DEFAULT_CREATED_READER_USER_PASSWORD); - HOST_ARRAY = HOSTS.split(";"); - HTTP_URL_STRINGS = new String[HOST_ARRAY.length]; - - for(int i=0; i