Merging changes made in branch 'feature/23630'
This commit is contained in:
parent
eef2db5eb7
commit
13370bef1e
|
@ -16,6 +16,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
|
*/
|
||||||
public class ContextCache {
|
public class ContextCache {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(ContextCache.class);
|
private static Logger logger = LoggerFactory.getLogger(ContextCache.class);
|
||||||
|
|
|
@ -5,6 +5,9 @@ import java.util.List;
|
||||||
import org.gcube.informationsystem.contexts.reference.entities.Context;
|
import org.gcube.informationsystem.contexts.reference.entities.Context;
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
|
*/
|
||||||
public interface ContextCacheRenewal {
|
public interface ContextCacheRenewal {
|
||||||
|
|
||||||
public List<Context> renew() throws ResourceRegistryException;
|
public List<Context> renew() throws ResourceRegistryException;
|
||||||
|
|
|
@ -16,6 +16,9 @@ import org.gcube.informationsystem.serialization.ElementMapper;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
|
*/
|
||||||
public class ContextUtility {
|
public class ContextUtility {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(ContextUtility.class);
|
private static Logger logger = LoggerFactory.getLogger(ContextUtility.class);
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class AlreadyPresentException extends ResourceRegistryException {
|
public class AlreadyPresentException extends ResourceRegistryException {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class AvailableInAnotherContextException extends ResourceRegistryException {
|
public class AvailableInAnotherContextException extends ResourceRegistryException {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class CreationException extends ResourceRegistryException {
|
public class CreationException extends ResourceRegistryException {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class NotFoundException extends ResourceRegistryException {
|
public class NotFoundException extends ResourceRegistryException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class ContextException extends ResourceRegistryException {
|
public class ContextException extends ResourceRegistryException {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.contexts;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class ContextMoveException extends ContextException {
|
public class ContextMoveException extends ContextException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class ContextNotFoundException extends NotFoundException {
|
public class ContextNotFoundException extends NotFoundException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresen
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class EntityAlreadyPresentException extends AlreadyPresentException {
|
public class EntityAlreadyPresentException extends AlreadyPresentException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.CreationExcep
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class EntityCreationException extends CreationException {
|
public class EntityCreationException extends CreationException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class EntityNotFoundException extends NotFoundException {
|
public class EntityNotFoundException extends NotFoundException {
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.Enti
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class FacetAlreadyPresentException extends EntityAlreadyPresentException {
|
public class FacetAlreadyPresentException extends EntityAlreadyPresentException {
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.Enti
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class FacetNotFoundException extends EntityNotFoundException {
|
public class FacetNotFoundException extends EntityNotFoundException {
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,8 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entities.res
|
||||||
|
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.EntityAlreadyPresentException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.EntityAlreadyPresentException;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class ResourceAlreadyPresentException extends EntityAlreadyPresentException {
|
public class ResourceAlreadyPresentException extends EntityAlreadyPresentException {
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,8 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entities.res
|
||||||
|
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.EntityNotFoundException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.EntityNotFoundException;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class ResourceNotFoundException extends EntityNotFoundException {
|
public class ResourceNotFoundException extends EntityNotFoundException {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.queries;
|
||||||
|
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class QueryTemplateException extends ResourceRegistryException {
|
public class QueryTemplateException extends ResourceRegistryException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class QueryTemplateNotFoundException extends NotFoundException {
|
public class QueryTemplateNotFoundException extends NotFoundException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.CreationExcep
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class RelationCreationException extends CreationException {
|
public class RelationCreationException extends CreationException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.relations.Rel
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class ConsistsOfCreationException extends RelationCreationException {
|
public class ConsistsOfCreationException extends RelationCreationException {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relations.is
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class IsParentOfCreationException extends IsParentOfException {
|
public class IsParentOfCreationException extends IsParentOfException {
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,9 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relations.is
|
||||||
|
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
|
*/
|
||||||
public class IsParentOfException extends ResourceRegistryException {
|
public class IsParentOfException extends ResourceRegistryException {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.relations.Rel
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class IsRelatedToCreationException extends RelationCreationException {
|
public class IsRelatedToCreationException extends RelationCreationException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class SchemaException extends ResourceRegistryException {
|
public class SchemaException extends ResourceRegistryException {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class SchemaNotFoundException extends NotFoundException {
|
public class SchemaNotFoundException extends NotFoundException {
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,9 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.types;
|
||||||
|
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
|
*/
|
||||||
public class SchemaViolationException extends ResourceRegistryException {
|
public class SchemaViolationException extends ResourceRegistryException {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.gcube.informationsystem.resourceregistry.api.rest;
|
package org.gcube.informationsystem.resourceregistry.api.rest;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package org.gcube.informationsystem.resourceregistry.api.rest;
|
package org.gcube.informationsystem.resourceregistry.api.rest;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
|
*/
|
||||||
public class InstancePath {
|
public class InstancePath {
|
||||||
|
|
||||||
public static final String INSTANCES_PATH_PART = "instances";
|
public static final String INSTANCES_PATH_PART = "instances";
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package org.gcube.informationsystem.resourceregistry.api.rest;
|
package org.gcube.informationsystem.resourceregistry.api.rest;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
|
*/
|
||||||
public class SharingPath {
|
public class SharingPath {
|
||||||
|
|
||||||
public static final String SHARING_PATH_PART = "sharing";
|
public static final String SHARING_PATH_PART = "sharing";
|
||||||
|
|
Loading…
Reference in New Issue