diff options
author | 2018-02-06 15:19:01 -0500 | |
---|---|---|
committer | 2018-02-06 15:23:57 -0500 | |
commit | 5db1e77ef9e2c43fd723dc629346baf3660fdf1b (patch) | |
tree | 179f5e4a88c8cb2e45fb67307bf5038b84fdc626 /src/main/java/org/onap/crud/service | |
parent | 4ff47ab5934ce146e194db88f3c0096f42b7d1d7 (diff) |
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 <daniel.silverthorn@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/crud/service')
-rw-r--r-- | src/main/java/org/onap/crud/service/AbstractGraphDataService.java | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/crud/service/CrudRestService.java | 9 |
2 files changed, 5 insertions, 6 deletions
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<String, String> filter, HashSet<String> properties) throws CrudException { type = OxmModelValidator.resolveCollectionType(version, type); - List<Vertex> items = daoForGet.getVertices(type, OxmModelValidator.resolveCollectionfilter(version, type, filter), properties); + List<Vertex> 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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========================================================= - * <p> + * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - package org.onap.crud.service; import com.google.gson.JsonElement; |