From a8ce62a3bae5976982f6d1432723251a414e2878 Mon Sep 17 00:00:00 2001 From: "LaMont, William(wl2432)" Date: Fri, 12 Jun 2020 13:35:23 -0400 Subject: v20 support in schema-service without javafx Issue-ID: AAI-2930 Change-Id: I68ba45069f465988e21602521e8e665cb27318d1 Signed-off-by: LaMont, William(wl2432) --- .../src/main/resources/schema/onap/query/stored-queries.json | 12 ++---------- .../src/test/java/org/onap/aai/queries/OnapQueryTest.java | 3 ++- .../src/test/resources/application-onap-test.properties | 4 ++-- aai-queries/src/test/resources/application-test.properties | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-) (limited to 'aai-queries/src') diff --git a/aai-queries/src/main/resources/schema/onap/query/stored-queries.json b/aai-queries/src/main/resources/schema/onap/query/stored-queries.json index eb59b14..c60f264 100644 --- a/aai-queries/src/main/resources/schema/onap/query/stored-queries.json +++ b/aai-queries/src/main/resources/schema/onap/query/stored-queries.json @@ -421,17 +421,9 @@ { "pserver-fromHostnameFirstToken": { "query":{ - "required-properties":["hostnameFirstToken","sourcesOfTruth"] + "required-properties":["hostnameFirstToken"] }, - "stored-query": "builder.getVerticesStartsWithProperty('hostname', hostnameFirstToken).getVerticesByProperty('source-of-truth', new ArrayList<>(Arrays.asList(sourcesOfTruth)))" - } - }, - { - "pserver-fromFqdnFirstToken": { - "query":{ - "required-properties":["fqdnFirstToken","sourcesOfTruth"] - }, - "stored-query": "builder.getVerticesStartsWithProperty('fqdn', fqdnFirstToken).getVerticesByProperty('source-of-truth', new ArrayList<>(Arrays.asList(sourcesOfTruth)))" + "stored-query": "builder.getVerticesStartsWithProperty('hostname', hostnameFirstToken)" } }, { diff --git a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java index d25aff6..8e890a1 100644 --- a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java +++ b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java @@ -141,7 +141,8 @@ public abstract class OnapQueryTest { {new SchemaVersion("v16")}, {new SchemaVersion("v17")}, {new SchemaVersion("v18")}, - {new SchemaVersion("v19")} + {new SchemaVersion("v19")}, + {new SchemaVersion("v20")} }); } diff --git a/aai-queries/src/test/resources/application-onap-test.properties b/aai-queries/src/test/resources/application-onap-test.properties index 697c4a8..8d429a0 100644 --- a/aai-queries/src/test/resources/application-onap-test.properties +++ b/aai-queries/src/test/resources/application-onap-test.properties @@ -16,7 +16,7 @@ schema.ingest.file=${server.local.startpath}/application-test.properties # Schema Version Related Attributes schema.uri.base.path=/aai # Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17 +schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20 # Specifies from which version should the depth parameter to default to zero schema.version.depth.start=v10 # Specifies from which version should the related link be displayed in response payload @@ -29,5 +29,5 @@ schema.version.namespace.change.start=v12 # Specifies from which version should the client start seeing the edge label in payload schema.version.edge.label.start=v12 # Specifies the version that the application should default to -schema.version.api.default=v17 +schema.version.api.default=v20 schema.translator.list=config \ No newline at end of file diff --git a/aai-queries/src/test/resources/application-test.properties b/aai-queries/src/test/resources/application-test.properties index b6aafc7..04d6f79 100644 --- a/aai-queries/src/test/resources/application-test.properties +++ b/aai-queries/src/test/resources/application-test.properties @@ -16,7 +16,7 @@ schema.ingest.file=${server.local.startpath}/application-test.properties # Schema Version Related Attributes schema.uri.base.path=/aai # Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19 +schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20 # Specifies from which version should the depth parameter to default to zero schema.version.depth.start=v10 # Specifies from which version should the related link be displayed in response payload @@ -29,6 +29,6 @@ schema.version.namespace.change.start=v12 # Specifies from which version should the client start seeing the edge label in payload schema.version.edge.label.start=v12 # Specifies the version that the application should default to -schema.version.api.default=v19 +schema.version.api.default=v20 schema.translator.list=config -- cgit 1.2.3-korg