diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java index 64c371f..2409646 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java @@ -242,6 +242,8 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements IndexDocumentRequest indexRequest = new IndexDocumentRequest( request.getUseCaseDescriptor(),request.getCaller(), request.getContext(),request.getDocument()); + indexRequest.setCallParameters(parameters); + IndexDocumentReport indexReport = null; try { indexRequest.setCallParameters(evaluateAdditionalIndexParameters(indexRequest)); @@ -250,6 +252,7 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements log.error("Unable to serve index request.",e); indexReport = new IndexDocumentReport(indexRequest); indexReport.setStatus(Report.Status.ERROR); + indexReport.setMessages(new ArrayList<>()); indexReport.getMessages().add("Unable to evaluate centroids : "+e.getMessage()); } return handleReport(indexReport,report); diff --git a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java index fa89fc2..ee9f6d9 100644 --- a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java +++ b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java @@ -195,6 +195,7 @@ public class ConcessioniLifeCycleManager extends Default3PhaseManager implements @Override protected Document evaluateAdditionalIndexParameters(IndexDocumentRequest request) throws IndexingException { Document toReturn = super.evaluateAdditionalIndexParameters(request); + if(toReturn == null) toReturn = new Document(); Project indexingProject = request.getDocument(); // Evaluate to display project IDs diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java index 0420b09..370cd9d 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java @@ -12,7 +12,6 @@ import org.gcube.application.geoportal.common.model.document.access.Access; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest; -import org.gcube.application.geoportal.service.model.internal.faults.*; import org.gcube.common.storagehub.model.exceptions.StorageHubException; import java.io.IOException; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java index 5419e3a..96c0be4 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java @@ -50,7 +50,6 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.*; import org.gcube.application.geoportal.common.utils.ContextUtils; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.service.engine.providers.PluginManager; -import org.gcube.application.geoportal.service.model.internal.faults.*; import org.gcube.application.geoportal.service.utils.UserUtils; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.model.exceptions.StorageHubException; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java index aa83182..6151d6e 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java @@ -16,7 +16,6 @@ import org.gcube.application.geoportal.common.utils.FileSets; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.BasicServiceTestUnit; -import org.gcube.application.geoportal.service.model.internal.faults.*; import org.gcube.application.geoportal.service.utils.UserUtils; import org.gcube.common.storagehub.model.exceptions.StorageHubException; import org.junit.Before; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java index 0cc80d3..43fe74c 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java @@ -72,6 +72,11 @@ public class PostgisDBManager implements PostgisDBManagerI { return conn.prepareStatement(insertStmt); } + @Override + public PreparedStatement prepareStatement(String stmt) throws SQLException { + return conn.prepareStatement(stmt); + } + @Override public int deleteByFieldValue(PostgisTable target, PostgisTable.Field field, Object value) throws SQLException { diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java index d929eaa..f81da84 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java @@ -16,7 +16,7 @@ public interface PostgisDBManagerI { PreparedStatement prepareInsertStatement(PostgisTable target, boolean createTable, boolean geometryAsText) throws SQLException; - PreparedStatement prepareStatement(String stmt); + PreparedStatement prepareStatement(String stmt) throws SQLException; void deleteTable(String tableName) throws SQLException; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java index ec81b6f..f982102 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java @@ -235,6 +235,13 @@ public class PostgisTable { toFill.setString(psFieldIndex, ((String) value)); else toFill.setBytes(psFieldIndex, (byte[])value); } + case BOOLEAN: { + if(value instanceof String) + toFill.setBoolean(psFieldIndex,Boolean.parseBoolean(value.toString())); + if(value instanceof Boolean) + toFill.setBoolean(psFieldIndex,(Boolean) value); + + } } }