gCubeSystem
/
sdi-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed swagger

This commit is contained in:
Fabio Sinibaldi 2020-10-13 15:01:12 +02:00
parent d3380737ec
commit eeb6b242a9
7 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -105,7 +105,7 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
<scope>provided</scope> <!-- <scope>provided</scope> -->
</dependency> </dependency>
<dependency> <dependency>
@ -151,11 +151,11 @@
<!-- swagger --> <!-- swagger -->
<dependency> <!-- <dependency> -->
<groupId>io.swagger</groupId> <!-- <groupId>io.swagger</groupId> -->
<artifactId>swagger-jersey2-jaxrs</artifactId> <!-- <artifactId>swagger-jersey2-jaxrs</artifactId> -->
<version>1.5.0</version> <!-- <version>1.5.0</version> -->
</dependency> <!-- </dependency> -->
<!-- GN EXTERNAL --> <!-- GN EXTERNAL -->

28
src/main/java/org/gcube/spatial/data/sdi/SDIService.java
View File

@ -8,11 +8,9 @@ import org.gcube.smartgears.ContextProvider;
import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.configuration.container.ContainerConfiguration;
import org.gcube.smartgears.context.application.ApplicationContext; import org.gcube.smartgears.context.application.ApplicationContext;
import org.gcube.spatial.data.sdi.model.ServiceConstants; import org.gcube.spatial.data.sdi.model.ServiceConstants;
import org.gcube.spatial.data.sdi.rest.GeoNetwork;
import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.ResourceConfig;
import io.swagger.jaxrs.config.BeanConfig;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
@ApplicationPath(ServiceConstants.APPLICATION) @ApplicationPath(ServiceConstants.APPLICATION)
@ -27,8 +25,8 @@ public class SDIService extends ResourceConfig{
super(); super();
packages("org.gcube.spatial.data"); packages("org.gcube.spatial.data");
// packages("org.gcube.spatial.data.sdi.model"); // packages("org.gcube.spatial.data.sdi.model");
register(io.swagger.jaxrs.listing.ApiListingResource.class); // register(io.swagger.jaxrs.listing.ApiListingResource.class);
register(io.swagger.jaxrs.listing.SwaggerSerializers.class); // register(io.swagger.jaxrs.listing.SwaggerSerializers.class);
register(MultiPartFeature.class); register(MultiPartFeature.class);
// register(MoxyXmlFeature.class); // register(MoxyXmlFeature.class);
ApplicationContext context=ContextProvider.get(); ApplicationContext context=ContextProvider.get();
@ -55,17 +53,17 @@ public class SDIService extends ResourceConfig{
//SWAGGER //SWAGGER
BeanConfig beanConfig = new BeanConfig(); // BeanConfig beanConfig = new BeanConfig();
beanConfig.setVersion("1.0.0"); // beanConfig.setVersion("1.0.0");
beanConfig.setSchemes(new String[]{"http","https"}); // beanConfig.setSchemes(new String[]{"http","https"});
beanConfig.setHost(hostName+":"+port); // beanConfig.setHost(hostName+":"+port);
beanConfig.setBasePath("/gcube/service/"); // beanConfig.setBasePath("/gcube/service/");
beanConfig.setResourcePackage(GeoNetwork.class.getPackage().getName()); // beanConfig.setResourcePackage(GeoNetwork.class.getPackage().getName());
beanConfig.setTitle("SDI Service"); // beanConfig.setTitle("SDI Service");
beanConfig.setDescription("REST Interface towards SDI facilities"); // beanConfig.setDescription("REST Interface towards SDI facilities");
beanConfig.setPrettyPrint(true); // beanConfig.setPrettyPrint(true);
beanConfig.setScan(true); // beanConfig.setScan(true);
//
// System.out.println("********************** SDI INIT *****************************"); // System.out.println("********************** SDI INIT *****************************");

2
src/main/java/org/gcube/spatial/data/sdi/rest/GeoNetwork.java
View File

@ -25,11 +25,9 @@ import org.gcube.spatial.data.sdi.model.services.ServiceDefinition.Type;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures; import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Path(ServiceConstants.GeoNetwork.INTERFACE) @Path(ServiceConstants.GeoNetwork.INTERFACE)
@Api(value=ServiceConstants.GeoNetwork.INTERFACE)
@Slf4j @Slf4j
@ManagedBy(SDIServiceManager.class) @ManagedBy(SDIServiceManager.class)
public class GeoNetwork { public class GeoNetwork {

2
src/main/java/org/gcube/spatial/data/sdi/rest/GeoServer.java
View File

@ -24,11 +24,9 @@ import org.gcube.spatial.data.sdi.model.services.ServiceDefinition.Type;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures; import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Path(ServiceConstants.GeoServer.INTERFACE) @Path(ServiceConstants.GeoServer.INTERFACE)
@Api(value=ServiceConstants.GeoServer.INTERFACE)
@Slf4j @Slf4j
@ManagedBy(SDIServiceManager.class) @ManagedBy(SDIServiceManager.class)
public class GeoServer { public class GeoServer {

3
src/main/java/org/gcube/spatial/data/sdi/rest/SDI.java
View File

@ -17,11 +17,10 @@ import org.gcube.spatial.data.sdi.model.health.HealthReport;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures; import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Path(ServiceConstants.INTERFACE) @Path(ServiceConstants.INTERFACE)
@Api(value=ServiceConstants.INTERFACE) //@Api(value=ServiceConstants.INTERFACE)
@ManagedBy(SDIServiceManager.class) @ManagedBy(SDIServiceManager.class)
@Slf4j @Slf4j
public class SDI { public class SDI {

3
src/main/java/org/gcube/spatial/data/sdi/rest/Thredds.java
View File

@ -15,11 +15,10 @@ import org.gcube.spatial.data.sdi.SDIServiceManager;
import org.gcube.spatial.data.sdi.engine.ThreddsManager; import org.gcube.spatial.data.sdi.engine.ThreddsManager;
import org.gcube.spatial.data.sdi.utils.ScopeUtils; import org.gcube.spatial.data.sdi.utils.ScopeUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Path("Thredds") @Path("Thredds")
@Api(value="Thredds") //@Api(value="Thredds")
@Slf4j @Slf4j
@ManagedBy(SDIServiceManager.class) @ManagedBy(SDIServiceManager.class)
public class Thredds { public class Thredds {

35
src/test/java/org/gcube/spatial/data/sdi/test/MainTest.java
View File

@ -12,14 +12,13 @@ import org.gcube.spatial.data.sdi.LocalConfiguration;
import org.gcube.spatial.data.sdi.SDIService; import org.gcube.spatial.data.sdi.SDIService;
import org.gcube.spatial.data.sdi.engine.GISManager; import org.gcube.spatial.data.sdi.engine.GISManager;
import org.gcube.spatial.data.sdi.engine.GeoNetworkManager; import org.gcube.spatial.data.sdi.engine.GeoNetworkManager;
import org.gcube.spatial.data.sdi.engine.TemplateManager;
import org.gcube.spatial.data.sdi.engine.RoleManager; import org.gcube.spatial.data.sdi.engine.RoleManager;
import org.gcube.spatial.data.sdi.engine.SDIManager; import org.gcube.spatial.data.sdi.engine.SDIManager;
import org.gcube.spatial.data.sdi.engine.TemplateManager;
import org.gcube.spatial.data.sdi.engine.TemporaryPersistence; import org.gcube.spatial.data.sdi.engine.TemporaryPersistence;
import org.gcube.spatial.data.sdi.engine.ThreddsManager; import org.gcube.spatial.data.sdi.engine.ThreddsManager;
import org.gcube.spatial.data.sdi.model.ServiceConstants; import org.gcube.spatial.data.sdi.model.ServiceConstants;
import org.gcube.spatial.data.sdi.model.metadata.TemplateDescriptor; import org.gcube.spatial.data.sdi.model.metadata.TemplateDescriptor;
import org.gcube.spatial.data.sdi.rest.GeoNetwork;
import org.gcube.spatial.data.sdi.test.factories.GISManagerFactory; import org.gcube.spatial.data.sdi.test.factories.GISManagerFactory;
import org.gcube.spatial.data.sdi.test.factories.GeoNetworkManagerFactory; import org.gcube.spatial.data.sdi.test.factories.GeoNetworkManagerFactory;
import org.gcube.spatial.data.sdi.test.factories.MetadataTemplateManagerFactory; import org.gcube.spatial.data.sdi.test.factories.MetadataTemplateManagerFactory;
@ -34,8 +33,6 @@ import org.glassfish.jersey.test.JerseyTest;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import io.swagger.jaxrs.config.BeanConfig;
public class MainTest extends JerseyTest{ public class MainTest extends JerseyTest{
@BeforeClass @BeforeClass
@ -69,22 +66,22 @@ public class MainTest extends JerseyTest{
ResourceConfig config= new ResourceConfig(SDIService.class); ResourceConfig config= new ResourceConfig(SDIService.class);
config.register(new MyBinder()); config.register(new MyBinder());
config.register(io.swagger.jaxrs.listing.ApiListingResource.class); // config.register(io.swagger.jaxrs.listing.ApiListingResource.class);
config.register(io.swagger.jaxrs.listing.SwaggerSerializers.class); // config.register(io.swagger.jaxrs.listing.SwaggerSerializers.class);
//
// //SWAGGER // //SWAGGER
BeanConfig beanConfig = new BeanConfig(); // BeanConfig beanConfig = new BeanConfig();
beanConfig.setVersion("1.0.0"); // beanConfig.setVersion("1.0.0");
beanConfig.setSchemes(new String[]{"http","https"}); // beanConfig.setSchemes(new String[]{"http","https"});
beanConfig.setHost("localhost:9998"); // beanConfig.setHost("localhost:9998");
beanConfig.setBasePath("gcube/service"); // beanConfig.setBasePath("gcube/service");
String packageName=GeoNetwork.class.getPackage().getName(); // String packageName=GeoNetwork.class.getPackage().getName();
System.out.println("PACKAGE : "+packageName); // System.out.println("PACKAGE : "+packageName);
beanConfig.setResourcePackage(packageName); // beanConfig.setResourcePackage(packageName);
beanConfig.setScan(true); // beanConfig.setScan(true);
System.out.println(beanConfig.getSwagger()); // System.out.println(beanConfig.getSwagger());
//
//
//Multipart //Multipart
// config.packages("org.glassfish.jersey.media.multipart"); // config.packages("org.glassfish.jersey.media.multipart");