From 590be162b882ba472c81f5a6b2cf8efe5cbb3745 Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Thu, 26 Oct 2023 17:26:24 +0200 Subject: [PATCH] Refactoring packages --- .../{model => }/knowledge/AddElementToTreeAction.java | 2 +- .../discovery/{model => }/knowledge/ClassInformation.java | 2 +- .../discovery/{model => }/knowledge/Knowledge.java | 2 +- .../discovery/{model => }/knowledge/ModelKnowledge.java | 2 +- .../{model => }/knowledge/ModelKnowledgeValidator.java | 2 +- .../discovery/{model => }/knowledge/UsageKnowledge.java | 2 +- .../gcube/informationsystem/serialization/ElementMapper.java | 2 +- .../org/gcube/informationsystem/discovery/DiscoveryTest.java | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/org/gcube/informationsystem/discovery/{model => }/knowledge/AddElementToTreeAction.java (96%) rename src/main/java/org/gcube/informationsystem/discovery/{model => }/knowledge/ClassInformation.java (93%) rename src/main/java/org/gcube/informationsystem/discovery/{model => }/knowledge/Knowledge.java (98%) rename src/main/java/org/gcube/informationsystem/discovery/{model => }/knowledge/ModelKnowledge.java (98%) rename src/main/java/org/gcube/informationsystem/discovery/{model => }/knowledge/ModelKnowledgeValidator.java (97%) rename src/main/java/org/gcube/informationsystem/discovery/{model => }/knowledge/UsageKnowledge.java (95%) diff --git a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/AddElementToTreeAction.java b/src/main/java/org/gcube/informationsystem/discovery/knowledge/AddElementToTreeAction.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/discovery/model/knowledge/AddElementToTreeAction.java rename to src/main/java/org/gcube/informationsystem/discovery/knowledge/AddElementToTreeAction.java index 0635ef4..4f98e17 100644 --- a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/AddElementToTreeAction.java +++ b/src/main/java/org/gcube/informationsystem/discovery/knowledge/AddElementToTreeAction.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.discovery.model.knowledge; +package org.gcube.informationsystem.discovery.knowledge; import org.gcube.informationsystem.base.reference.Element; import org.gcube.informationsystem.discovery.DiscoveredElementAction; diff --git a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ClassInformation.java b/src/main/java/org/gcube/informationsystem/discovery/knowledge/ClassInformation.java similarity index 93% rename from src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ClassInformation.java rename to src/main/java/org/gcube/informationsystem/discovery/knowledge/ClassInformation.java index 73499ce..04b32f3 100644 --- a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ClassInformation.java +++ b/src/main/java/org/gcube/informationsystem/discovery/knowledge/ClassInformation.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.discovery.model.knowledge; +package org.gcube.informationsystem.discovery.knowledge; import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/Knowledge.java b/src/main/java/org/gcube/informationsystem/discovery/knowledge/Knowledge.java similarity index 98% rename from src/main/java/org/gcube/informationsystem/discovery/model/knowledge/Knowledge.java rename to src/main/java/org/gcube/informationsystem/discovery/knowledge/Knowledge.java index 52d9d14..1fab69a 100644 --- a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/Knowledge.java +++ b/src/main/java/org/gcube/informationsystem/discovery/knowledge/Knowledge.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.discovery.model.knowledge; +package org.gcube.informationsystem.discovery.knowledge; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ModelKnowledge.java b/src/main/java/org/gcube/informationsystem/discovery/knowledge/ModelKnowledge.java similarity index 98% rename from src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ModelKnowledge.java rename to src/main/java/org/gcube/informationsystem/discovery/knowledge/ModelKnowledge.java index 2177d26..f1ef74e 100644 --- a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ModelKnowledge.java +++ b/src/main/java/org/gcube/informationsystem/discovery/knowledge/ModelKnowledge.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.discovery.model.knowledge; +package org.gcube.informationsystem.discovery.knowledge; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ModelKnowledgeValidator.java b/src/main/java/org/gcube/informationsystem/discovery/knowledge/ModelKnowledgeValidator.java similarity index 97% rename from src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ModelKnowledgeValidator.java rename to src/main/java/org/gcube/informationsystem/discovery/knowledge/ModelKnowledgeValidator.java index 6601e8f..08374fb 100644 --- a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/ModelKnowledgeValidator.java +++ b/src/main/java/org/gcube/informationsystem/discovery/knowledge/ModelKnowledgeValidator.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.discovery.model.knowledge; +package org.gcube.informationsystem.discovery.knowledge; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/UsageKnowledge.java b/src/main/java/org/gcube/informationsystem/discovery/knowledge/UsageKnowledge.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/discovery/model/knowledge/UsageKnowledge.java rename to src/main/java/org/gcube/informationsystem/discovery/knowledge/UsageKnowledge.java index ade083f..a9d7a14 100644 --- a/src/main/java/org/gcube/informationsystem/discovery/model/knowledge/UsageKnowledge.java +++ b/src/main/java/org/gcube/informationsystem/discovery/knowledge/UsageKnowledge.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.discovery.model.knowledge; +package org.gcube.informationsystem.discovery.knowledge; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java b/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java index 56cbe34..b3f4f24 100644 --- a/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java +++ b/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java @@ -30,7 +30,7 @@ import org.gcube.com.fasterxml.jackson.databind.node.TextNode; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.base.reference.Element; import org.gcube.informationsystem.discovery.Discovery; -import org.gcube.informationsystem.discovery.model.knowledge.Knowledge; +import org.gcube.informationsystem.discovery.knowledge.Knowledge; import org.gcube.informationsystem.model.reference.ModelElement; import org.gcube.informationsystem.types.TypeMapper; import org.gcube.informationsystem.types.reference.Type; diff --git a/src/test/java/org/gcube/informationsystem/discovery/DiscoveryTest.java b/src/test/java/org/gcube/informationsystem/discovery/DiscoveryTest.java index 14f8c2d..b944809 100644 --- a/src/test/java/org/gcube/informationsystem/discovery/DiscoveryTest.java +++ b/src/test/java/org/gcube/informationsystem/discovery/DiscoveryTest.java @@ -4,8 +4,8 @@ import java.util.Map; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.base.reference.Element; -import org.gcube.informationsystem.discovery.model.knowledge.Knowledge; -import org.gcube.informationsystem.discovery.model.knowledge.ModelKnowledge; +import org.gcube.informationsystem.discovery.knowledge.Knowledge; +import org.gcube.informationsystem.discovery.knowledge.ModelKnowledge; import org.gcube.informationsystem.tree.Tree; import org.gcube.informationsystem.types.TypeMapper; import org.gcube.informationsystem.types.reference.Type;