Merged from patches
This commit is contained in:
parent
4d52bf7123
commit
5f28029db1
|
@ -1,14 +1,13 @@
|
||||||
package org.gcube.application.geoportal.service.engine.postgis;
|
package org.gcube.application.geoportal.service.engine.postgis;
|
||||||
|
|
||||||
import lombok.Synchronized;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.gcube.application.cms.implementations.ISInterface;
|
||||||
|
import org.gcube.application.cms.implementations.ImplementationProvider;
|
||||||
import org.gcube.application.geoportal.common.model.legacy.BBOX;
|
import org.gcube.application.geoportal.common.model.legacy.BBOX;
|
||||||
|
import org.gcube.application.geoportal.common.model.rest.ConfigurationException;
|
||||||
import org.gcube.application.geoportal.common.model.rest.DatabaseConnection;
|
import org.gcube.application.geoportal.common.model.rest.DatabaseConnection;
|
||||||
import org.gcube.application.geoportal.service.engine.ImplementationProvider;
|
|
||||||
import org.gcube.application.geoportal.service.model.internal.db.PostgisTable;
|
import org.gcube.application.geoportal.service.model.internal.db.PostgisTable;
|
||||||
import org.gcube.application.geoportal.service.model.internal.faults.ConfigurationException;
|
|
||||||
import org.gcube.application.geoportal.service.model.internal.faults.DataParsingException;
|
import org.gcube.application.geoportal.service.model.internal.faults.DataParsingException;
|
||||||
import org.gcube.application.geoportal.service.utils.ISUtils;
|
|
||||||
|
|
||||||
import java.sql.*;
|
import java.sql.*;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
|
@ -40,8 +39,8 @@ public class PostgisDBManager implements PostgisDBManagerI {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static PostgisDBManagerI get(boolean autocommit) throws SQLException, ConfigurationException {
|
private static PostgisDBManagerI get(boolean autocommit) throws SQLException, ConfigurationException {
|
||||||
DatabaseConnection config=
|
DatabaseConnection config = ImplementationProvider.get().getProvidedObjectByClass(ISInterface.class)
|
||||||
ImplementationProvider.get().getIsProvider().getIS().queryForDB("postgis", "Concessioni");
|
.queryForDatabase("Database","postgis", "GNA_DB","Concessioni");
|
||||||
log.debug("Found configuration : "+config);
|
log.debug("Found configuration : "+config);
|
||||||
PostgisDBManager toReturn=new PostgisDBManager(config);
|
PostgisDBManager toReturn=new PostgisDBManager(config);
|
||||||
toReturn.conn.setAutoCommit(autocommit);
|
toReturn.conn.setAutoCommit(autocommit);
|
||||||
|
|
Loading…
Reference in New Issue