From b32b58e90db92ad1d73882d4407a156011a4b68a Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 29 Jun 2022 11:48:09 +0200 Subject: [PATCH] removed unused dependencies --- .settings/org.eclipse.wst.common.component | 30 ++++++++++++++----- pom.xml | 27 +++++++++-------- .../server/GeoportalDataEntryServiceImpl.java | 14 ++++----- .../user/geoportaldataentry/UCD_Tests.java | 2 +- 4 files changed, 44 insertions(+), 29 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 9bb3ef8..d05e26d 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -42,7 +43,8 @@ - + + @@ -85,7 +87,8 @@ - + + @@ -128,7 +131,8 @@ - + + @@ -171,10 +175,17 @@ + + uses + + + uses + uses - + + @@ -217,7 +228,8 @@ - + + @@ -260,7 +272,8 @@ - + + @@ -303,7 +316,8 @@ - + + diff --git a/pom.xml b/pom.xml index 914645d..2c125dc 100644 --- a/pom.xml +++ b/pom.xml @@ -61,12 +61,20 @@ - - javax.servlet - javax.servlet-api - 3.1.0 - provided - + + + + + + + + + + + + + + @@ -76,13 +84,6 @@ 7.1 - - - xml-apis - xml-apis - 1.4.01 - provided - com.google.gwt gwt-user diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index d16958e..ca13f50 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -1,5 +1,6 @@ package org.gcube.portlets.user.geoportaldataentry.server; +import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -7,6 +8,7 @@ import java.util.List; import java.util.Map; import org.gcube.application.geoportal.common.model.document.Project; +import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; import org.gcube.application.geoportal.common.model.rest.TempFile; @@ -30,6 +32,7 @@ import org.gcube.application.geoportalcommon.shared.config.RoleRights; import org.gcube.application.geoportalcommon.shared.config.RoleRights.OPERATION_TYPE; import org.gcube.application.geoportalcommon.shared.exception.GNAConfigException; import org.gcube.application.geoportalcommon.shared.geoportal.GEOPORTAL_DATA_HANDLER; +import org.gcube.application.geoportalcommon.shared.geoportal.LifecycleInformationDV; import org.gcube.application.geoportalcommon.shared.geoportal.ProjectDV; import org.gcube.application.geoportalcommon.shared.geoportal.UseCaseDescriptorDV; import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV; @@ -123,7 +126,6 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen "Error occurred on converting data, try again or contact the support. Error: " + e.getMessage()); } - /* Project theProject = null; try { @@ -144,13 +146,14 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen for (GeoNaFormDataObject geoNaFormDataObject : listGeonaFormObjects) { List listGDB = geoNaFormDataObject.getListGDB(); GcubeProfileDV profile = geoNaFormDataObject.getGcubeProfileDV(); - + + String parentPath = String.format("%s%s", profile.getParentName(), profile.getSectionName()); + LOG.info("The profile is: " + profile); for (GenericDatasetBean gdb : listGDB) { List files = gdb.getFilesUploaded(); if (files.size() > 0) { - String parentPath = profile.getParentName(); LOG.info("Uploading file/s in the parentPath: " + parentPath); for (int i = 0; i < files.size(); i++) { FileUploaded file = files.get(i); @@ -178,15 +181,12 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen LifecycleInformation lifecycleInfo = theProject.getLifecycleInformation(); LifecycleInformationDV liDV = ConvertToDataValueObjectModel.toLifecycleInformationDV(lifecycleInfo); return new CommitReport(theProject.getId(), liDV); - + } catch (Exception e) { LOG.error("Error on uploading files: ", e); throw new Exception( "Error occurred on uploading files, try again or contact the support. Error: " + e.getMessage()); } - */ - - return null; } public static FilePathDV retrieveFilePathForGcubeProfileFieldName(String fieldName, GcubeProfileDV profile) { diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataentry/UCD_Tests.java b/src/test/java/org/gcube/portlets/user/geoportaldataentry/UCD_Tests.java index d2dbe22..c3f1507 100644 --- a/src/test/java/org/gcube/portlets/user/geoportaldataentry/UCD_Tests.java +++ b/src/test/java/org/gcube/portlets/user/geoportaldataentry/UCD_Tests.java @@ -69,7 +69,7 @@ public class UCD_Tests { } } - @Test + //@Test public void getUCDForHandlerIds() throws Exception { ScopeProvider.instance.set(CONTEXT); SecurityTokenProvider.instance.set(TOKEN);