From 167c936cb2cf9b76e92eb109dfdd6c61bd5f2338 Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Wed, 20 Dec 2017 16:31:28 +0000 Subject: [PATCH] Merged from branch after release 4.9.0. refs #10189 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-api@160739 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../resourceregistry/api/rest/AccessPath.java | 1 + .../resourceregistry/api/rest/SchemaPath.java | 14 ++------------ 2 files changed, 3 insertions(+), 12 deletions(-) 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 0220f2d..5bc0281 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 @@ -26,6 +26,7 @@ public class AccessPath { public static final String IS_RELATED_TO_PATH_PART = ERPath.IS_RELATED_TO_PATH_PART; public static final String CONTEXT_PATH_PART = ContextPath.CONTEXT_PATH_PART; + public static final String ALL_PATH_PART = ContextPath.ALL_PATH_PART; public static final String SCHEMA_PATH_PART = SchemaPath.SCHEMA_PATH_PART; public static final String INSTANCE_PATH_PART = "instance"; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SchemaPath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SchemaPath.java index 28c9798..381801b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SchemaPath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/SchemaPath.java @@ -1,6 +1,3 @@ -/** - * - */ package org.gcube.informationsystem.resourceregistry.api.rest; /** @@ -9,13 +6,6 @@ package org.gcube.informationsystem.resourceregistry.api.rest; public class SchemaPath { public static final String SCHEMA_PATH_PART = "schema"; + public static final String POLYMORPHIC_PARAM = AccessPath.POLYMORPHIC_PARAM; - public static final String FACET_PATH_PART = ERPath.FACET_PATH_PART; - public static final String RESOURCE_PATH_PART = ERPath.RESOURCE_PATH_PART; - - public static final String EMBEDDED_PATH_PART = ERPath.EMBEDDED_PATH_PART; - - public static final String CONSISTS_OF_PATH_PART = ERPath.CONSISTS_OF_PATH_PART; - public static final String IS_RELATED_TO_PATH_PART = ERPath.IS_RELATED_TO_PATH_PART; - -} +} \ No newline at end of file