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

refactoring

This commit is contained in:
Fabio Sinibaldi 2021-02-16 16:16:29 +01:00
parent b667110c4f
commit a09b47a379
10 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/CatalogDescriptor.java → sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/CatalogDescriptor.java
View File

12
sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java
View File

@ -6,9 +6,9 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.spatial.data.sdi.model.services.GeoNetworkServiceDefinition;
import org.gcube.spatial.data.sdi.model.services.GeoServerDefinition;
import org.gcube.spatial.data.sdi.model.services.ThreddsDefinition;
import org.gcube.spatial.data.sdi.model.service.GeoNetworkDescriptor;
import org.gcube.spatial.data.sdi.model.service.GeoServerDescriptor;
import org.gcube.spatial.data.sdi.model.service.ThreddsDescriptor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@ -32,10 +32,10 @@ public class ScopeConfiguration {
private String contextName;
@NonNull
private List<GeoNetworkServiceDefinition> geonetworkConfiguration;
private List<GeoNetworkDescriptor> geonetworkConfiguration;
@NonNull
private List<GeoServerDefinition> geoserverClusterConfiguration;
private List<GeoServerDescriptor> geoserverClusterConfiguration;
@NonNull
private List<ThreddsDefinition> threddsConfiguration;
private List<ThreddsDescriptor> threddsConfiguration;
}

0
sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoNetworkDescriptor.java → sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoNetworkDescriptor.java
View File

0
sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServerDescriptor.java → sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServerDescriptor.java
View File

0
sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServiceDescriptor.java → sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServiceDescriptor.java
View File

0
sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/ThreddsDescriptor.java → sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/ThreddsDescriptor.java
View File

0
sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/Version.java → sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/Version.java
View File

6
sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java
View File

@ -4,14 +4,14 @@ import org.junit.BeforeClass;
public class BasicScopedTests {
String sdiHostname="sdi-t.pre.d4science.org";
String scope ="/pred4s/preprod/preVRE";
static String sdiHostname="sdi-t.pre.d4science.org";
static String scope ="/pred4s/preprod/preVRE";
//
// String sdiHostname="sdi-d-d4s.d4science.org";
// String scope = "/gcube/devsec/devVRE";
@BeforeClass
public void setScope(){
public static void setScope(){
TokenSetter.set(scope);
}

6
sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java
View File

@ -14,4 +14,10 @@ public class SDITests extends BasicScopedTests{
}
@Test
public void getScopeHealth() throws RemoteException {
SDIManagement sdi=SDIAbstractPlugin.management().build();
System.out.println(sdi.getReport());
}
}

41
sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java
View File

@ -1,41 +0,0 @@
package org.gcube.spatial.data.sdi.model;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.spatial.data.sdi.model.service.GeoNetworkDescriptor;
import org.gcube.spatial.data.sdi.model.service.GeoServerDescriptor;
import org.gcube.spatial.data.sdi.model.service.ThreddsDescriptor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
@RequiredArgsConstructor
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class ScopeConfiguration {
@NonNull
private String contextName;
@NonNull
private List<GeoNetworkDescriptor> geonetworkConfiguration;
@NonNull
private List<GeoServerDescriptor> geoserverClusterConfiguration;
@NonNull
private List<ThreddsDescriptor> threddsConfiguration;
}