From 0eef1b686645270765c22eeb7a24544e3db6829f Mon Sep 17 00:00:00 2001 From: JvD_Ericsson Date: Fri, 24 Jul 2020 10:07:18 +0100 Subject: Fix replaceAll SONAR issues in apex-pdp Change replaceAll() with repalce() in apex-pdp Issue-ID: POLICY-2722 Signed-off-by: JvD_Ericsson Change-Id: I8a15b99f02399addfc8f0e25349e3022d8b8c9f1 --- .../apex/model/basicmodel/handling/ApexSchemaGenerator.java | 13 +++++++------ .../apex/model/contextmodel/concepts/AxContextSchema.java | 10 +++++----- .../org/onap/policy/apex/model/modelapi/ApexApiResult.java | 3 ++- .../policy/apex/model/policymodel/concepts/AxLogic.java | 6 +++--- .../apex/model/policymodel/handling/PolicyLogicReader.java | 9 +++++---- 5 files changed, 22 insertions(+), 19 deletions(-) (limited to 'model') diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java index 230a8abbb..8617f2c81 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * 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 - * + * * 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. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -117,16 +118,16 @@ public class ApexSchemaGenerator { */ private String fixForUnqualifiedBug(final String schemaString) { // Fix the "entry" element - String newSchemaString = schemaString.replaceAll( + String newSchemaString = schemaString.replace( "", ""); // Fix the "key" element - newSchemaString = newSchemaString.replaceAll("