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-api@171803 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2018-10-02 07:18:55 +00:00
parent 88700aa535
commit 9355476ba9
5 changed files with 11 additions and 11 deletions

View File

@ -7,7 +7,7 @@ import java.io.Reader;
import java.io.Writer;
import java.util.List;
import org.gcube.informationsystem.impl.utils.discovery.ReflectionUtility;
import org.gcube.informationsystem.model.impl.utils.discovery.ReflectionUtility;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -3,7 +3,7 @@
*/
package org.gcube.informationsystem.resourceregistry.api.exceptions;
import org.gcube.informationsystem.model.ISManageable;
import org.gcube.informationsystem.model.reference.ISManageable;
import com.fasterxml.jackson.annotation.JsonTypeInfo;

View File

@ -15,11 +15,11 @@ import java.util.Map;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.informationsystem.impl.utils.ISMapper;
import org.gcube.informationsystem.model.ISManageable;
import org.gcube.informationsystem.model.entity.Facet;
import org.gcube.informationsystem.model.entity.Resource;
import org.gcube.informationsystem.model.relation.Relation;
import org.gcube.informationsystem.model.impl.utils.ISMapper;
import org.gcube.informationsystem.model.reference.ISManageable;
import org.gcube.informationsystem.model.reference.entity.Facet;
import org.gcube.informationsystem.model.reference.entity.Resource;
import org.gcube.informationsystem.model.reference.relation.Relation;
import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ExceptionMapper;

View File

@ -3,9 +3,9 @@ package org.gcube.informationsystem.resourceregistry.api.utils;
import java.io.IOException;
import java.util.UUID;
import org.gcube.informationsystem.impl.utils.ISMapper;
import org.gcube.informationsystem.model.ER;
import org.gcube.informationsystem.model.ISManageable;
import org.gcube.informationsystem.model.impl.utils.ISMapper;
import org.gcube.informationsystem.model.reference.ER;
import org.gcube.informationsystem.model.reference.ISManageable;
import org.gcube.informationsystem.types.TypeBinder;
import com.fasterxml.jackson.annotation.JsonTypeName;

View File

@ -3,7 +3,7 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions;
import java.lang.reflect.Constructor;
import java.util.List;
import org.gcube.informationsystem.impl.utils.discovery.ReflectionUtility;
import org.gcube.informationsystem.model.impl.utils.discovery.ReflectionUtility;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;