clean-up to remove apparently unused PORT ENV (related to FINERACT-762)
This environment variable is actually never used. The port of a Tenant DB instead appears to be read from schemaServerPort of the tenant_server_connections table.
This commit is contained in:
committed by
Michael Vorburger ⛑️
parent
f1c7a7b4bc
commit
a5b35b8d31
+4
-19
@@ -30,40 +30,25 @@ public class JDBCDriverConfig {
|
|||||||
private final static String DRIVER_CLASS_PROPERTYNAME = "DRIVERCLASS_NAME";
|
private final static String DRIVER_CLASS_PROPERTYNAME = "DRIVERCLASS_NAME";
|
||||||
private final static String PROTOCOL_PROPERTYNAME = "PROTOCOL";
|
private final static String PROTOCOL_PROPERTYNAME = "PROTOCOL";
|
||||||
private final static String SUBPROTOCOL_PROPERTYNAME = "SUB_PROTOCOL";
|
private final static String SUBPROTOCOL_PROPERTYNAME = "SUB_PROTOCOL";
|
||||||
private final static String PORT_PROPERTYNAME = "PORT";
|
|
||||||
|
|
||||||
private String driverClassName;
|
private String driverClassName;
|
||||||
private String protocol;
|
private String protocol;
|
||||||
private String subProtocol;
|
private String subProtocol;
|
||||||
private Integer port;
|
|
||||||
|
|
||||||
@Autowired ApplicationContext context;
|
@Autowired ApplicationContext context;
|
||||||
|
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
protected void init() {
|
protected void init() {
|
||||||
Environment environment = context.getEnvironment() ;
|
Environment environment = context.getEnvironment();
|
||||||
driverClassName = environment.getProperty(DRIVER_CLASS_PROPERTYNAME) ;
|
driverClassName = environment.getProperty(DRIVER_CLASS_PROPERTYNAME);
|
||||||
protocol = environment.getProperty(PROTOCOL_PROPERTYNAME) ;
|
protocol = environment.getProperty(PROTOCOL_PROPERTYNAME);
|
||||||
subProtocol = environment.getProperty(SUBPROTOCOL_PROPERTYNAME) ;
|
subProtocol = environment.getProperty(SUBPROTOCOL_PROPERTYNAME);
|
||||||
port = Integer.parseInt(environment.getProperty(PORT_PROPERTYNAME)) ;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDriverClassName() {
|
public String getDriverClassName() {
|
||||||
return this.driverClassName;
|
return this.driverClassName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProtocol() {
|
|
||||||
return this.protocol;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getSubProtocol() {
|
|
||||||
return this.subProtocol;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getPort() {
|
|
||||||
return this.port;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String constructProtocol(String schemaServer, String schemaServerPort, String schemaName) {
|
public String constructProtocol(String schemaServer, String schemaServerPort, String schemaName) {
|
||||||
final String url = new StringBuilder(protocol).append(":").append(subProtocol).append("://").append(schemaServer).append(':').append(schemaServerPort)
|
final String url = new StringBuilder(protocol).append(":").append(subProtocol).append("://").append(schemaServer).append(':').append(schemaServerPort)
|
||||||
.append('/').append(schemaName).toString();
|
.append('/').append(schemaName).toString();
|
||||||
|
|||||||
@@ -20,7 +20,6 @@
|
|||||||
DRIVERCLASS_NAME:org.drizzle.jdbc.DrizzleDriver
|
DRIVERCLASS_NAME:org.drizzle.jdbc.DrizzleDriver
|
||||||
PROTOCOL:jdbc
|
PROTOCOL:jdbc
|
||||||
SUB_PROTOCOL:mysql:thin
|
SUB_PROTOCOL:mysql:thin
|
||||||
PORT:3306
|
|
||||||
|
|
||||||
fineract_tenants_driver:org.drizzle.jdbc.DrizzleDriver
|
fineract_tenants_driver:org.drizzle.jdbc.DrizzleDriver
|
||||||
fineract_tenants_url:jdbc:mysql:thin://localhost:3306/fineract_tenants
|
fineract_tenants_url:jdbc:mysql:thin://localhost:3306/fineract_tenants
|
||||||
|
|||||||
Reference in New Issue
Block a user