From 805a3171e275fc4471f2417487b5bf37e81b888b Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 13 Oct 2022 17:36:44 +0200 Subject: [PATCH] refactoring --- .../geoportalcommon/ConvertToDataValueObjectModel.java | 10 +++++----- .../geoportal/{view => materialization}/FilesetDV.java | 2 +- .../{IndexLayer.java => IndexLayerDV.java} | 6 +++--- .../geoportal/{view => materialization}/PayloadDV.java | 2 +- .../shared/geoportal/view/SubDocumentView.java | 9 +++++---- 5 files changed, 15 insertions(+), 14 deletions(-) rename src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/{view => materialization}/FilesetDV.java (93%) rename src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/{IndexLayer.java => IndexLayerDV.java} (92%) rename src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/{view => materialization}/PayloadDV.java (93%) diff --git a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java index c2889df..0cb83b7 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java +++ b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java @@ -41,7 +41,8 @@ import org.gcube.application.geoportalcommon.shared.geoportal.config.ActionDefin import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV; import org.gcube.application.geoportalcommon.shared.geoportal.config.GcubeProfileDV; import org.gcube.application.geoportalcommon.shared.geoportal.config.ItemFieldDV; -import org.gcube.application.geoportalcommon.shared.geoportal.materialization.IndexLayer; +import org.gcube.application.geoportalcommon.shared.geoportal.materialization.IndexLayerDV; +import org.gcube.application.geoportalcommon.shared.geoportal.materialization.PayloadDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.AccessDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.AccountingInfoDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.BasicLifecycleInformationDV; @@ -55,7 +56,6 @@ import org.gcube.application.geoportalcommon.shared.geoportal.ucd.GEOPORTAL_DATA import org.gcube.application.geoportalcommon.shared.geoportal.ucd.HandlerDeclarationDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV; -import org.gcube.application.geoportalcommon.shared.geoportal.view.PayloadDV; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1185,15 +1185,15 @@ public class ConvertToDataValueObjectModel { */ - public static IndexLayer convert(Index toConvert) throws InvalidObjectException { + public static IndexLayerDV convert(Index toConvert) throws InvalidObjectException { if(toConvert==null || toConvert.getType()==null) throw new InvalidObjectException("Unable to convert Index. Unknown type: "+toConvert); - IndexLayer toReturn = null; + IndexLayerDV toReturn = null; switch(toConvert.getType()) { case "GIS-CENTROIDS" : { - toReturn = Serialization.convert(toConvert,IndexLayer.class); + toReturn = Serialization.convert(toConvert,IndexLayerDV.class); // toReturn.setLayer(Serialization.read(toConvert.get("layer"), GCubeSDILayer.class)); // toReturn.setFlag(toConvert.getString("flag")); // toReturn.setIndexName(toConvert.getString()); diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/FilesetDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/FilesetDV.java similarity index 93% rename from src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/FilesetDV.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/FilesetDV.java index 6e53023..b4e1b1f 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/FilesetDV.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/FilesetDV.java @@ -1,4 +1,4 @@ -package org.gcube.application.geoportalcommon.shared.geoportal.view; +package org.gcube.application.geoportalcommon.shared.geoportal.materialization; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/IndexLayer.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/IndexLayerDV.java similarity index 92% rename from src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/IndexLayer.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/IndexLayerDV.java index c47c770..fa55378 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/IndexLayer.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/IndexLayerDV.java @@ -4,7 +4,7 @@ import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonProperty; -public class IndexLayer implements Serializable { +public class IndexLayerDV implements Serializable { /** * @@ -18,7 +18,7 @@ public class IndexLayer implements Serializable { private int records; private String flag; - public IndexLayer() { + public IndexLayerDV() { } @@ -65,7 +65,7 @@ public class IndexLayer implements Serializable { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("IndexLayer [type="); + builder.append("IndexLayerDV [type="); builder.append(type); builder.append(", layer="); builder.append(layer); diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/PayloadDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/PayloadDV.java similarity index 93% rename from src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/PayloadDV.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/PayloadDV.java index 9053d26..69cbb6e 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/PayloadDV.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/materialization/PayloadDV.java @@ -1,4 +1,4 @@ -package org.gcube.application.geoportalcommon.shared.geoportal.view; +package org.gcube.application.geoportalcommon.shared.geoportal.materialization; import java.io.Serializable; diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SubDocumentView.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SubDocumentView.java index 6e4fcfc..2de2604 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SubDocumentView.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SubDocumentView.java @@ -3,7 +3,8 @@ package org.gcube.application.geoportalcommon.shared.geoportal.view; import java.io.Serializable; import java.util.List; -import org.gcube.application.geoportalcommon.shared.products.model.SDILayerDescriptorDV; +import org.gcube.application.geoportalcommon.shared.geoportal.materialization.FilesetDV; +import org.gcube.application.geoportalcommon.shared.geoportal.materialization.GCubeSDILayerDV; public class SubDocumentView implements Serializable { @@ -17,7 +18,7 @@ public class SubDocumentView implements Serializable { private List listFiles; private List listImages; - private List listLayers; + private List listLayers; public SubDocumentView() { @@ -35,7 +36,7 @@ public class SubDocumentView implements Serializable { return listImages; } - public List getListLayers() { + public List getListLayers() { return listLayers; } @@ -51,7 +52,7 @@ public class SubDocumentView implements Serializable { this.listImages = listImages; } - public void setListLayers(List listLayers) { + public void setListLayers(List listLayers) { this.listLayers = listLayers; }