From 5db1e77ef9e2c43fd723dc629346baf3660fdf1b Mon Sep 17 00:00:00 2001 From: Daniel Silverthorn Date: Tue, 6 Feb 2018 15:19:01 -0500 Subject: Allow filtering by reserved properties Allow filtering by reserved properties and return them in group and single gets Change-Id: I897a6e807d93f6fe9f6875519dd433e52c2a1705 Issue-ID: AAI-702 Signed-off-by: Daniel Silverthorn --- .../java/org/onap/crud/service/AbstractGraphDataService.java | 2 +- src/main/java/org/onap/crud/service/CrudRestService.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/onap/crud/service') diff --git a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java index 5ad4b7d..5154308 100644 --- a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java +++ b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java @@ -74,7 +74,7 @@ public abstract class AbstractGraphDataService { public String getVertices(String version, String type, Map filter, HashSet properties) throws CrudException { type = OxmModelValidator.resolveCollectionType(version, type); - List items = daoForGet.getVertices(type, OxmModelValidator.resolveCollectionfilter(version, type, filter), properties); + List items = daoForGet.getVertices(type, OxmModelValidator.resolveCollectionfilter(version, type, filter), properties, version); return CrudResponseBuilder.buildGetVerticesResponse(items, version); } diff --git a/src/main/java/org/onap/crud/service/CrudRestService.java b/src/main/java/org/onap/crud/service/CrudRestService.java index 895b459..b3c5e7a 100644 --- a/src/main/java/org/onap/crud/service/CrudRestService.java +++ b/src/main/java/org/onap/crud/service/CrudRestService.java @@ -9,19 +9,18 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= - *

+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - package org.onap.crud.service; import com.google.gson.JsonElement; -- cgit 1.2.3-korg