gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Documentation management

This commit is contained in:
Fabio Sinibaldi 2022-11-18 14:28:15 +01:00
parent b1515d1c33
commit deec4a584c
7 changed files with 82 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geoportal-service/enunciate.xml
View File

@ -17,7 +17,7 @@
<ruby-json-client disabled="true" />
<java-json-client disabled="true" />
<javascript-client disabled="true" />
<docs docsDir="${project.build.directory}" docsSubdir="docs" />
<docs docsDir="${project.build.directory}" docsSubdir="api-docs" />
<!-- REPLACE THE ${project.artifactId} WITH YOUR APPLICATION NAME. E.g. /gcat, /uri-resolver. if the ${project.artifactId} is not matching your APPLICATION Name /> -->
<swagger basePath="/${project.artifactId}" />
<docs freemarkerTemplate="${project.basedir}/src/main/resources/META-INF/enunciate/d4science_docs.fmt">

1
geoportal-service/gcube/extra-resources/WEB-INF/gcube-app.xml
View File

@ -6,5 +6,6 @@
<version>${project.version}</version>
<description>${project.description}</description>
<exclude>/srv/docs/*</exclude>
<exclude>/srv/api-docs/*</exclude>
</application>

64
geoportal-service/pom.xml
View File

@ -174,26 +174,7 @@
<build>
<plugins>
<!-- Enunciate Maven plugin -->
<plugin>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-maven-plugin</artifactId>
<version>${enunciate.version}</version>
<configuration>
</configuration>
<executions>
<execution>
<id>assemble</id>
<goals>
<goal>assemble</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- SPHINX PLUGIN triggered at 'compile'-->
<plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
@ -214,6 +195,22 @@
</executions>
</plugin>
<!-- Enunciate Maven plugin -->
<plugin>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-maven-plugin</artifactId>
<version>${enunciate.version}</version>
<configuration>
</configuration>
<executions>
<execution>
<id>assemble</id>
<goals>
<goal>assemble</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Copy Enunciate Documentation from your-application/docs to your-application.war -->
<plugin>
@ -240,35 +237,6 @@
</execution>
</executions>
</plugin>
</plugins>
</build>
<!-- https://trustin.github.io/sphinx-maven-plugin/basic-usage.html#executing-within-normal-lifecycle-->
<!-- <reporting>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-project-info-reports-plugin</artifactId>-->
<!-- <version>2.9</version>-->
<!-- <reportSets>-->
<!-- <reportSet>-->
<!-- <reports />-->
<!-- </reportSet>-->
<!-- </reportSets>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>kr.motd.maven</groupId>-->
<!-- <artifactId>sphinx-maven-plugin</artifactId>-->
<!-- <version>2.10.0</version>-->
<!-- <configuration>-->
<!-- <builder>html</builder>-->
<!-- <configDirectory>src/site/sphinx</configDirectory>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </reporting>-->
</project>

14
geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java
View File

@ -131,13 +131,13 @@ public abstract class MongoManager {
}
public Document updateDoc(ObjectId id, Document updateSet) {
MongoCollection<Document> coll=getCollection();
return coll.findOneAndUpdate(
eq(mongoIDFieldName(),id),
updateSet,
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER));
}
// public Document updateDoc() {
// MongoCollection<Document> coll=getCollection();
// return coll.findOneAndUpdate(
// eq(mongoIDFieldName(),id),
// updateSet,
// new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER));
// }
}

10
geoportal-service/src/main/webapp/WEB-INF/web.xml
View File

@ -18,6 +18,16 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/docs/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/api-docs/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>org.gcube.application.geoportal.service.GeoPortalService</servlet-name>
<url-pattern>/srv/*</url-pattern>

1
geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java
View File

@ -8,6 +8,7 @@ public class MongoTester extends MongoManager {
return new MongoTester("legacyConcessioni",ID);}
private String theID=null;

46
geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ProjectsManualUpdate.java Normal file
View File

@ -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));
}
}