From 10234dc38a01e2ba154c01063d6e9bf845da4ffb Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 16 Feb 2021 13:04:02 +0100 Subject: [PATCH] Refactoring --- .../data/clients/AbstractGenericClient.java | 1 - .../org/gcube/spatial/data/clients/Tests.java | 18 ----------- .../data/clients/SDIGenericClient.java | 0 .../data/clients/model/ClientInfo.java | 0 .../clients/model/ConnectionDescriptor.java | 0 .../model/engine/ComparableVersion.java | 0 .../data/clients/model/engine/Engine.java | 0 .../data/clients/model/engine/Range.java | 0 .../data/plugins/GISServicePlugin.java | 5 ---- .../org/gcube/spatial/data/sdi/Clients.java | 30 +++++++++++++++++++ 10 files changed, 30 insertions(+), 24 deletions(-) rename {sdi-generic-client => sdi-interface}/src/main/java/org/gcube/spatial/data/clients/SDIGenericClient.java (100%) rename {sdi-generic-client => sdi-interface}/src/main/java/org/gcube/spatial/data/clients/model/ClientInfo.java (100%) rename {sdi-generic-client => sdi-interface}/src/main/java/org/gcube/spatial/data/clients/model/ConnectionDescriptor.java (100%) rename {sdi-generic-client => sdi-interface}/src/main/java/org/gcube/spatial/data/clients/model/engine/ComparableVersion.java (100%) rename {sdi-generic-client => sdi-interface}/src/main/java/org/gcube/spatial/data/clients/model/engine/Engine.java (100%) rename {sdi-generic-client => sdi-interface}/src/main/java/org/gcube/spatial/data/clients/model/engine/Range.java (100%) delete mode 100644 sdi-interface/src/main/java/org/gcube/spatial/data/plugins/GISServicePlugin.java create mode 100644 sdi-interface/src/test/java/org/gcube/spatial/data/sdi/Clients.java diff --git a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/AbstractGenericClient.java b/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/AbstractGenericClient.java index 5423e57..9dec254 100644 --- a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/AbstractGenericClient.java +++ b/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/AbstractGenericClient.java @@ -1,6 +1,5 @@ package org.gcube.spatial.data.clients; -import org.gcube.spatial.data.clients.model.ConnectionDescriptor; import lombok.extern.slf4j.Slf4j; diff --git a/sdi-generic-client/src/test/java/org/gcube/spatial/data/clients/Tests.java b/sdi-generic-client/src/test/java/org/gcube/spatial/data/clients/Tests.java index abe90b2..fe9a684 100644 --- a/sdi-generic-client/src/test/java/org/gcube/spatial/data/clients/Tests.java +++ b/sdi-generic-client/src/test/java/org/gcube/spatial/data/clients/Tests.java @@ -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")); - } diff --git a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/SDIGenericClient.java b/sdi-interface/src/main/java/org/gcube/spatial/data/clients/SDIGenericClient.java similarity index 100% rename from sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/SDIGenericClient.java rename to sdi-interface/src/main/java/org/gcube/spatial/data/clients/SDIGenericClient.java diff --git a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/ClientInfo.java b/sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/ClientInfo.java similarity index 100% rename from sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/ClientInfo.java rename to sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/ClientInfo.java diff --git a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/ConnectionDescriptor.java b/sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/ConnectionDescriptor.java similarity index 100% rename from sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/ConnectionDescriptor.java rename to sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/ConnectionDescriptor.java diff --git a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/ComparableVersion.java b/sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/ComparableVersion.java similarity index 100% rename from sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/ComparableVersion.java rename to sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/ComparableVersion.java diff --git a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/Engine.java b/sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/Engine.java similarity index 100% rename from sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/Engine.java rename to sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/Engine.java diff --git a/sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/Range.java b/sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/Range.java similarity index 100% rename from sdi-generic-client/src/main/java/org/gcube/spatial/data/clients/model/engine/Range.java rename to sdi-interface/src/main/java/org/gcube/spatial/data/clients/model/engine/Range.java diff --git a/sdi-interface/src/main/java/org/gcube/spatial/data/plugins/GISServicePlugin.java b/sdi-interface/src/main/java/org/gcube/spatial/data/plugins/GISServicePlugin.java deleted file mode 100644 index 8a5c693..0000000 --- a/sdi-interface/src/main/java/org/gcube/spatial/data/plugins/GISServicePlugin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.gcube.spatial.data.plugins; - -public interface GISServicePlugin { - -} diff --git a/sdi-interface/src/test/java/org/gcube/spatial/data/sdi/Clients.java b/sdi-interface/src/test/java/org/gcube/spatial/data/sdi/Clients.java new file mode 100644 index 0000000..5606815 --- /dev/null +++ b/sdi-interface/src/test/java/org/gcube/spatial/data/sdi/Clients.java @@ -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")); + } + + +}