From c253696868156803c2422678514cc4064082acfe Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 20 Jul 2022 12:09:07 +0200 Subject: [PATCH] Reorganized query and path parameters constants --- .../resourceregistry/api/rest/AccessPath.java | 30 ++++++------------ .../api/rest/ContextPath.java | 2 ++ .../resourceregistry/api/rest/ERPath.java | 31 ------------------- .../api/rest/InstancePath.java | 6 ++-- .../api/rest/SharingPath.java | 2 +- .../resourceregistry/api/rest/TypePath.java | 2 +- 6 files changed, 16 insertions(+), 57 deletions(-) delete mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java index 343f708..4b6b182 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java @@ -5,47 +5,35 @@ package org.gcube.informationsystem.resourceregistry.api.rest; */ public class AccessPath { - public static final String HIERARCHICAL_MODE_PARAM = InstancePath.HIERARCHICAL_MODE_PARAM; - public static final String INCLUDE_CONTEXTS_IN_HEADER_PARAM = InstancePath.INCLUDE_CONTEXTS_IN_HEADER_PARAM; - - public static final String TYPE_PATH_PARAM = "TYPE_NAME"; - public static final String UUID_PATH_PARAM = "UUID"; - public static final String CONTEXT_UUID_PATH_PARAM = "CONTEXT_UUID"; - public static final String QUERY_TEMPLATE_NAME_PATH_PARAM = "QUERY_TEMPLATE_NAME"; - public static final String ACCESS_PATH_PART = "access"; public static final String CONTEXTS_PATH_PART = ContextPath.CONTEXTS_PATH_PART; public static final String TYPES_PATH_PART = TypePath.TYPES_PATH_PART; public static final String INSTANCES_PATH_PART = InstancePath.INSTANCES_PATH_PART; public static final String QUERY_TEMPLATES_PATH_PART = QueryTemplatePath.QUERY_TEMPLATES_PATH_PART; - + public static final String QUERY_PATH_PART = "query"; - public static final String QUERY_PARAM = "q"; - public static final String RAW_PARAM = "raw"; - public static final String DEFAULT_RAW_PARAM = "false"; + public static final String Q_QUERY_PARAMETER = "q"; + public static final String RAW_QUERY_PARAMETER = "raw"; + public static final String RAW_QUERY_PARAMETER_DEFAULT_VALUE = "false"; - public static final String RESOURCE_TYPE_PATH_PART = "RESOURCE_TYPE_NAME"; - public static final String RELATION_TYPE_PATH_PART = "RELATION_TYPE_NAME"; - public static final String REFERENCE_TYPE_PATH_PART = "REFERENCE_TYPE_NAME"; + public static final String HIERARCHICAL_MODE_QUERY_PARAMETER = InstancePath.HIERARCHICAL_MODE_QUERY_PARAMETER; + public static final String INCLUDE_CONTEXTS_IN_HEADER_QUERY_PARAMETER = InstancePath.INCLUDE_CONTEXTS_IN_HEADER_QUERY_PARAMETER; /** * Used only in getRelated() function * The _ is prepended to avoid clash with field name */ - public static final String _REFERENCE_PARAM = "_reference"; + public static final String _REFERENCE_QUERY_PARAMETER = "_reference"; /** * Used only in getRelated() function * The _ is prepended to avoid clash with field name */ - public static final String _POLYMORPHIC_PARAM = "_polymorphic"; + public static final String _POLYMORPHIC_QUERY_PARAMETER = "_polymorphic"; /** * Used only in getRelated() function * The _ is prepended to avoid clash with field name */ - public static final String _DIRECTION_PARAM = "_direction"; - // public static final String _INCLUDE_RELATION_PARAM = "_includeRelation"; - - public static final String CURRENT_CONTEXT = "CURRENT_CONTEXT"; + public static final String _DIRECTION_QUERY_PARAMETER = "_direction"; } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ContextPath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ContextPath.java index c2a1f6e..79c06fb 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ContextPath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ContextPath.java @@ -10,4 +10,6 @@ public class ContextPath { public static final String CONTEXTS_PATH_PART = "contexts"; + public static final String CURRENT_CONTEXT_PATH_PART = "CURRENT_CONTEXT"; + } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java deleted file mode 100644 index 1febcb9..0000000 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * - */ -package org.gcube.informationsystem.resourceregistry.api.rest; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public class ERPath { - - public static final String ER_PATH_PART = "er"; - - protected static final String PROPERTY_PATH_PART = "property"; - - protected static final String ENTITY_PATH_PART = "entity"; - - public static final String FACET_PATH_PART = "facet"; - public static final String RESOURCE_PATH_PART = "resource"; - - protected static final String RELATION_PATH_PART = "relation"; - - public static final String CONSISTS_OF_PATH_PART = "consistsOf"; - public static final String IS_RELATED_TO_PATH_PART = "isRelatedTo"; - - public static final String SOURCE_PATH_PART = "source"; - public static final String TARGET_PATH_PART = "target"; - - public static final String ADD_PATH_PART = "add"; - public static final String REMOVE_PATH_PART = "remove"; - -} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/InstancePath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/InstancePath.java index 76f122e..fd5c06f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/InstancePath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/InstancePath.java @@ -4,10 +4,10 @@ public class InstancePath { public static final String INSTANCES_PATH_PART = "instances"; - public static final String POLYMORPHIC_PARAM = "polymorphic"; + public static final String POLYMORPHIC_QUERY_PARAMETER = "polymorphic"; - public static final String HIERARCHICAL_MODE_PARAM = "hierarchical"; + public static final String HIERARCHICAL_MODE_QUERY_PARAMETER = "hierarchical"; - public static final String INCLUDE_CONTEXTS_IN_HEADER_PARAM = "includeContextsInHeader"; + public static final String INCLUDE_CONTEXTS_IN_HEADER_QUERY_PARAMETER = "includeContextsInHeader"; } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SharingPath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SharingPath.java index a507202..096a316 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SharingPath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SharingPath.java @@ -13,7 +13,7 @@ public class SharingPath { REMOVE } - public static final String DRY_RUN_QUERY_PARAMETER = "dryRun"; + public static final String DRY_RUN_QUERY_QUERY_PARAMETER = "dryRun"; /** * Used to add a resource to a context independently from the source diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/TypePath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/TypePath.java index c777863..e3ac157 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/TypePath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/TypePath.java @@ -7,6 +7,6 @@ public class TypePath { public static final String TYPES_PATH_PART = "types"; - public static final String POLYMORPHIC_PARAM = "polymorphic"; + public static final String POLYMORPHIC_QUERY_PARAMETER = "polymorphic"; } \ No newline at end of file