diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java index 96cad7b..83787ca 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java @@ -134,7 +134,8 @@ public class DefaultDocumentsClient implements Projects { return Serialization.readCollection(jsonString,clazz); } catch (IOException e) { log.error("Unable to deserialize result as "+clazz,e); - log.debug("Query request was ",request); + log.debug("Query request was {} ",request); + log.debug("Query result was {} ",jsonString); throw new RemoteException("Invalid format for submitted query"); } } diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java index aa2c0fd..8935b4e 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java @@ -2,6 +2,7 @@ package org.gcube.application.geoportal.client.plugins; import javax.ws.rs.client.WebTarget; +import org.gcube.application.geoportal.client.DefaultDocumentsClient; import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; import org.gcube.application.geoportal.client.legacy.ConcessioniPlugin; import org.gcube.application.geoportal.client.legacy.MongoConcessioniPlugin; diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java index 9e4d2d8..ea46f82 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java @@ -28,11 +28,10 @@ public class ProjectsInterfacePlugin customClientImplementation; - //=DefaultProfiledDocuments.class; + private Class customClientImplementation= (Class) DefaultDocumentsClient.class; @Setter - private Class

profiledModel; + private Class

profiledModel= (Class

) Project.class; @Override public Exception convert(Exception fault, ProxyConfig config) { diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java index 675bd0c..556f5b8 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java @@ -6,24 +6,34 @@ import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest; +import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.rest.Projects; import org.gcube.application.geoportal.common.utils.FileSets; import org.gcube.application.geoportal.common.utils.StorageUtils; +import javax.jws.soap.SOAPBinding; import java.io.File; import java.io.FileNotFoundException; import java.rmi.RemoteException; import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.projects; -public class GenericUseCases { +public abstract class GenericUseCases extends BasicVreTests{ - public Projects getClient(String profileID){ + protected String getUCID(){ return "basic";} + + protected Projects getClient(String profileID){ return projects(profileID).build(); } + + + protected Projects getClient(){ + return getClient(getUCID()); + } + public void createNew () throws RemoteException, FileNotFoundException, JsonProcessingException { - String profileID=null; + String profileID=getUCID(); String myJSON=null; Document myDocument = Document.parse(myJSON); diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java index 9f2968c..af7caa8 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java @@ -7,6 +7,7 @@ import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.rest.Projects; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; +import sun.net.www.content.text.Generic; import java.rmi.RemoteException; import java.util.concurrent.atomic.AtomicLong; @@ -15,13 +16,13 @@ import static junit.framework.TestCase.assertTrue; import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.*; import static org.junit.Assume.assumeTrue; -public class ProfiledDocumentsTest> extends BasicVreTests{ +public class ProfiledDocumentsTest> extends GenericUseCases { - protected String getProfileID(){return "profiledConcessioni";} +// protected String getProfileID(){return "basic";} - protected C getClient(){ - return (C) customModel(getProfileID(), Project.class, DefaultDocumentsClient.class).build(); - } +// protected C getClient(){ +// return (C) customModel(getProfileID(), Project.class, DefaultDocumentsClient.class).build(); +// } @Test