diff --git a/geoportal-service/enunciate.xml b/geoportal-service/enunciate.xml index c8e07dd..11c8453 100644 --- a/geoportal-service/enunciate.xml +++ b/geoportal-service/enunciate.xml @@ -17,7 +17,7 @@ - + diff --git a/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml b/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml index 0882312..907178e 100644 --- a/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml +++ b/geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml @@ -6,5 +6,6 @@ ${project.version} ${project.description} /srv/docs/* + /srv/api-docs/* diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index eba287b..0df9cb7 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -174,26 +174,7 @@ - - - com.webcohesion.enunciate - enunciate-maven-plugin - ${enunciate.version} - - - - - assemble - - assemble - - - - - - - kr.motd.maven sphinx-maven-plugin @@ -214,6 +195,22 @@ + + + com.webcohesion.enunciate + enunciate-maven-plugin + ${enunciate.version} + + + + + assemble + + assemble + + + + @@ -240,35 +237,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java index 858cf33..c781259 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java @@ -131,13 +131,13 @@ public abstract class MongoManager { } - public Document updateDoc(ObjectId id, Document updateSet) { - MongoCollection coll=getCollection(); - return coll.findOneAndUpdate( - eq(mongoIDFieldName(),id), - updateSet, - new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)); - } +// public Document updateDoc() { +// MongoCollection coll=getCollection(); +// return coll.findOneAndUpdate( +// eq(mongoIDFieldName(),id), +// updateSet, +// new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)); +// } } diff --git a/geoportal-service/src/main/webapp/WEB-INF/web.xml b/geoportal-service/src/main/webapp/WEB-INF/web.xml index 0835e02..b387ccd 100644 --- a/geoportal-service/src/main/webapp/WEB-INF/web.xml +++ b/geoportal-service/src/main/webapp/WEB-INF/web.xml @@ -18,6 +18,16 @@ 1 + + + default + /docs/* + + + default + /api-docs/* + + org.gcube.application.geoportal.service.GeoPortalService /srv/* diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java index c7d41a4..a3123aa 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java @@ -8,6 +8,7 @@ public class MongoTester extends MongoManager { return new MongoTester("legacyConcessioni",ID);} + private String theID=null; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ProjectsManualUpdate.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ProjectsManualUpdate.java new file mode 100644 index 0000000..e996714 --- /dev/null +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ProjectsManualUpdate.java @@ -0,0 +1,46 @@ +package org.gcube.application.geoportal.service.engine.mongo; + +import com.mongodb.Block; +import com.mongodb.client.model.Filters; +import org.bson.BSON; +import org.bson.Document; +import org.bson.types.ObjectId; +import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.serialization.Serialization; +import org.gcube.application.cms.tests.TokenSetter; +import org.gcube.application.geoportal.common.model.document.Project; +import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.utils.tests.GCubeTest; +import org.gcube.application.geoportal.service.engine.providers.MongoClientProvider; +import org.gcube.application.geoportal.service.model.internal.db.Mongo; + +import java.util.function.Consumer; + +public class ProjectsManualUpdate { + + public static void main(String[] args) throws ConfigurationException { + ImplementationProvider.get().setEngine(new MongoClientProvider() { + @Override + public Mongo getObject() throws ConfigurationException { + TokenSetter.set(GCubeTest.getContext()); + return super.getObject(); + } + },Mongo.class); + + MongoTester mongo = new MongoTester("profiledConcessioni"); + + // UPDATE PHASE = DRAFT +// mongo.getCollection().find().forEach((Consumer) t ->{ +// Project p= Serialization.convert(t, Project.class); +// p.getLifecycleInformation().setPhase(LifecycleInformation.CommonPhases.DRAFT_PHASE); +// try{ +// mongo.replaceDoc(Serialization.asDocumentWithId(p),new ObjectId(p.getId())); +// }catch(Throwable e){throw new RuntimeException(e);} +// }); + + + mongo.getCollection().deleteMany(Filters.eq("_theDocument",null)); + } + +}