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 13:04:02 +01:00
parent 6e49a8d654
commit 10234dc38a
10 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/AbstractGenericClient.java
View File

@ -1,6 +1,5 @@
package org.gcube.spatial.data.clients;
import org.gcube.spatial.data.clients.model.ConnectionDescriptor;
import lombok.extern.slf4j.Slf4j;

18
sdi-generic-client/src/test/java/org/gcube/spatial/data/clients/Tests.java
View File

@ -3,28 +3,10 @@ package org.gcube.spatial.data.clients;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.gcube.spatial.data.clients.model.ClientInfo;
import org.gcube.spatial.data.clients.model.engine.Engine;
import org.gcube.spatial.data.clients.model.engine.Range;
import org.junit.Test;
public class Tests {
@Test
public void testRanges() {
ClientInfo gnClient=new ClientInfo("gn2-client","GeoNetwork 2","Client to communicate with GN 2","org.gcube.sdi.some.clients.Client",
new Engine(Engine.GN_ENGINE,"",new Range("1.1.0",null)));
assertFalse(new Range("1.1.0",null).supports("0.0.1"));
assertFalse(new Range(null,"3.4").supports("4.2.1"));
assertTrue(new Range("1.1.0",null).supports("2.0.1"));
assertTrue(new Range("1.1.0","2.2").supports("2.0.1"));
assertTrue(new Range("1.2",null).supports("1.2.1"));
assertTrue(new Range(null,"3.4").supports("1.2.1"));
}

0
sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/SDIGenericClient.java → sdi-interface/src/main/java/org/gcube/spatial/data/clients/SDIGenericClient.java
View File

0
sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/ClientInfo.java → sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/ClientInfo.java
View File

0
sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/ConnectionDescriptor.java → sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/ConnectionDescriptor.java
View File

0
sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/ComparableVersion.java → sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/ComparableVersion.java
View File

0
sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/Engine.java → sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/Engine.java
View File

0
sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/Range.java → sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/Range.java
View File

5
sdi-interface/src/main/java/org/gcube/spatial/data/plugins/GISServicePlugin.java
View File

@ -1,5 +0,0 @@
package org.gcube.spatial.data.plugins;
public interface GISServicePlugin {
}

30
sdi-interface/src/test/java/org/gcube/spatial/data/sdi/Clients.java Normal file
View File

@ -0,0 +1,30 @@
package org.gcube.spatial.data.sdi;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.gcube.spatial.data.clients.model.ClientInfo;
import org.gcube.spatial.data.clients.model.engine.Engine;
import org.gcube.spatial.data.clients.model.engine.Range;
import org.junit.Test;
public class Clients {
@Test
public void testRanges() {
ClientInfo gnClient=new ClientInfo("gn2-client","GeoNetwork 2","Client to communicate with GN 2","org.gcube.sdi.some.clients.Client",
new Engine(Engine.GN_ENGINE,"",new Range("1.1.0",null)));
assertFalse(new Range("1.1.0",null).supports("0.0.1"));
assertFalse(new Range(null,"3.4").supports("4.2.1"));
assertTrue(new Range("1.1.0",null).supports("2.0.1"));
assertTrue(new Range("1.1.0","2.2").supports("2.0.1"));
assertTrue(new Range("1.2",null).supports("1.2.1"));
assertTrue(new Range(null,"3.4").supports("1.2.1"));
}
}