From 08e734e49bb815ebbfc66110913509d02d08b0a9 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 2 Oct 2018 07:20:49 +0000 Subject: [PATCH] Merged changes made in branch caused by is-model and gcube-model repackaging git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-context-client@171805 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../context/ResourceRegistryContextClient.java | 2 +- .../context/ResourceRegistryContextClientImpl.java | 8 ++++---- .../context/ResourceRegistryContextClientTest.java | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java index 09dbc63..fa8034a 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java @@ -3,7 +3,7 @@ package org.gcube.informationsystem.resourceregistry.context; import java.util.List; import java.util.UUID; -import org.gcube.informationsystem.model.entity.Context; +import org.gcube.informationsystem.model.reference.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java index b306eb1..057e3de 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java @@ -5,10 +5,10 @@ import java.net.MalformedURLException; import java.util.List; import java.util.UUID; -import org.gcube.informationsystem.impl.embedded.HeaderImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.embedded.Header; -import org.gcube.informationsystem.model.entity.Context; +import org.gcube.informationsystem.model.impl.embedded.HeaderImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java index 2c7a861..8d7b5fd 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java @@ -10,10 +10,10 @@ import org.gcube.common.authorization.client.Constants; import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.provider.ClientInfo; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.informationsystem.impl.entity.ContextImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.ER; -import org.gcube.informationsystem.model.entity.Context; +import org.gcube.informationsystem.model.impl.entity.ContextImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.ER; +import org.gcube.informationsystem.model.reference.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; @@ -40,7 +40,7 @@ public class ResourceRegistryContextClientTest extends ScopedTest { public static final String CTX_NAME_C = "C"; public static String getUser() { - String user = org.gcube.informationsystem.model.embedded.Header.UNKNOWN_USER; + String user = org.gcube.informationsystem.model.reference.embedded.Header.UNKNOWN_USER; try { String token = SecurityTokenProvider.instance.get(); if(token != null) {