diff --git a/CHANGELOG.md b/CHANGELOG.md index 1065331..0061f6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-logic +## [v1.0.15-SNAPSHOT] - 2021-07-29 +Exposed PostgisDB connection descriptor + ## [v1.0.14] - 2020-12-11 Fixes "no transaction" issue diff --git a/pom.xml b/pom.xml index b4725b6..4991cc7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-logic - 1.0.14 + 1.0.14-SNAPSHOT Geoportal Logic @@ -36,7 +36,7 @@ org.gcube.distribution gcube-bom - 2.0.0 + 2.0.1 pom import @@ -45,12 +45,7 @@ - - - org.gcube.core - common-gcube-calls - - + org.apache.commons commons-csv @@ -123,13 +118,13 @@ org.gcube.spatial.data gis-interface - [2.4.6-SNAPSHOT,3.0.0) + [2.4.6,3.0.0) org.gcube.spatial.data geonetwork - [3.4.5-SNAPSHOT,4.0.0) + [3.4.5,4.0.0) diff --git a/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManager.java b/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManager.java index 5944606..96b4ad1 100644 --- a/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManager.java +++ b/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManager.java @@ -131,9 +131,14 @@ public class PostgisDBManager implements PostgisDBManagerI { target.setObjectInPreparedStatement(field, value, stmt, 1); return stmt.executeUpdate(); } - - - /* (non-Javadoc) + + @Override + public DatabaseConnection getConnectionDescriptor() { + return config; + } + + + /* (non-Javadoc) * @see org.gcube.application.geoportal.PostgisDBManagerI#deleteTable(java.lang.String) */ @Override diff --git a/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManagerI.java b/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManagerI.java index 0d22d0d..8bc3bf4 100644 --- a/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManagerI.java +++ b/src/main/java/org/gcube/application/geoportal/storage/PostgisDBManagerI.java @@ -4,6 +4,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.gcube.application.geoportal.model.db.DatabaseConnection; import org.gcube.application.geoportal.model.db.PostgisTable; import org.gcube.application.geoportal.model.db.PostgisTable.Field; import org.gcube.application.geoportal.model.db.PostgisTable.POINT; @@ -37,5 +38,5 @@ public interface PostgisDBManagerI { int deleteByFieldValue(PostgisTable target, Field field, Object value) throws SQLException; - + DatabaseConnection getConnectionDescriptor(); } \ No newline at end of file diff --git a/src/test/java/org/gcube/application/geoportal/PostgisMockup.java b/src/test/java/org/gcube/application/geoportal/PostgisMockup.java index 541f4db..773bbbc 100644 --- a/src/test/java/org/gcube/application/geoportal/PostgisMockup.java +++ b/src/test/java/org/gcube/application/geoportal/PostgisMockup.java @@ -4,6 +4,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.gcube.application.geoportal.model.db.DatabaseConnection; import org.gcube.application.geoportal.model.db.PostgisTable; import org.gcube.application.geoportal.model.db.PostgisTable.Field; import org.gcube.application.geoportal.model.db.PostgisTable.POINT; @@ -25,7 +26,12 @@ public class PostgisMockup implements PostgisDBManagerI { // TODO Auto-generated method stub return 0; } - + + @Override + public DatabaseConnection getConnectionDescriptor() { + return null; + } + @Override public void deleteTable(String tableName) throws SQLException { // TODO Auto-generated method stub