summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml28
-rw-r--r--model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java13
-rw-r--r--model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java10
-rw-r--r--model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java3
-rw-r--r--model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java6
-rw-r--r--model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java9
6 files changed, 33 insertions, 36 deletions
diff --git a/INFO.yaml b/INFO.yaml
index fa99e0221..fbb1e85eb 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -28,22 +28,7 @@ meetings:
repeats: 'weekly'
time: '13:00 UTC'
repositories:
- - 'policy-apex-pdp'
- - 'policy-api'
- - 'policy-common'
- - 'policy-core'
- - 'policy-distribution'
- - 'policy-docker'
- - 'policy-drools-applications'
- - 'policy-drools-pdp'
- - 'policy-engine'
- - 'policy-gui'
- - 'policy-models'
- - 'policy-oom'
- - 'policy-pap'
- - 'policy-parent'
- - 'policy-pdp'
- - 'policy-xacml-pdp'
+ - 'policy/apex-pdp'
committers:
- <<: *onap_releng_ptl
- name: 'Jorge Hernandez'
@@ -66,11 +51,20 @@ committers:
company: 'Ericsson'
id: 'ramverma'
timezone: 'Europe/Ireland'
+ - name: 'Ajith Sreekumar'
+ email: 'ajith.sreekumar@bell.ca'
+ company: 'Ericsson'
+ id: 'a.sreekumar'
+ timezone: 'Europe/Ireland'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
changes:
- type: 'Addition'
name: 'Jim Hahn'
+ link: https://lists.onap.org/g/onap-tsc/message/4976
+ - type: 'Addition'
name: 'Ram Krishna Verma'
link: https://lists.onap.org/g/onap-tsc/message/4977
- link: https://lists.onap.org/g/onap-tsc/message/4976
+ - type: 'Addition'
+ name: 'Ajith Sreekumar'
+ link: https://lists.onap.org/g/onap-tsc/message/6869
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(
"<xs:element name=\"entry\" minOccurs=\"0\" maxOccurs=\"unbounded\">",
"<xs:element name=\"entry\" minOccurs=\"0\" maxOccurs=\"unbounded\" form=\"unqualified\">");
// Fix the "key" element
- newSchemaString = newSchemaString.replaceAll("<xs:element name=\"key\"",
+ newSchemaString = newSchemaString.replace("<xs:element name=\"key\"",
"<xs:element name=\"key\" form=\"unqualified\"");
// Fix the "value" element
- newSchemaString = newSchemaString.replaceAll("<xs:element name=\"value\"",
+ newSchemaString = newSchemaString.replace("<xs:element name=\"value\"",
"<xs:element name=\"value\" form=\"unqualified\"");
return newSchemaString;
diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java
index 4ddfb7175..00baebeab 100644
--- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java
+++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-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.
@@ -324,8 +324,8 @@ public class AxContextSchema extends AxConcept {
if (!schemaFlavour.equals(other.schemaFlavour)) {
return false;
}
- final String thisSchema = CDataConditioner.clean(schemaDefinition).replaceAll("\n", "");
- final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replaceAll("\n", "");
+ final String thisSchema = CDataConditioner.clean(schemaDefinition).replace("\n", "");
+ final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replace("\n", "");
return thisSchema.equals(otherSchema);
}
@@ -351,8 +351,8 @@ public class AxContextSchema extends AxConcept {
if (!schemaFlavour.equals(other.schemaFlavour)) {
return schemaFlavour.compareTo(other.schemaFlavour);
}
- final String thisSchema = CDataConditioner.clean(schemaDefinition).replaceAll("\n", "");
- final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replaceAll("\n", "");
+ final String thisSchema = CDataConditioner.clean(schemaDefinition).replace("\n", "");
+ final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replace("\n", "");
return thisSchema.compareTo(otherSchema);
}
}
diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java
index 7d69ff551..9fdb471dc 100644
--- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java
+++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java
@@ -1,6 +1,7 @@
/*-
* ============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.
@@ -269,7 +270,7 @@ public class ApexApiResult {
} else {
builder.append(",\n\"");
}
- builder.append(message.replaceAll("\"", "\\\\\""));
+ builder.append(message.replace("\"", "\\\\\""));
builder.append("\"");
}
builder.append("]\n");
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java
index 64aeb3777..442e54b1f 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-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.
@@ -361,8 +361,8 @@ public class AxLogic extends AxConcept {
if (!logicFlavour.equals(other.logicFlavour)) {
return false;
}
- final String thislogic = CDataConditioner.clean(logic).replaceAll("\n", "");
- final String otherlogic = CDataConditioner.clean(other.logic).replaceAll("\n", "");
+ final String thislogic = CDataConditioner.clean(logic).replace("\n", "");
+ final String otherlogic = CDataConditioner.clean(other.logic).replace("\n", "");
return thislogic.equals(otherlogic);
}
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
index 0fed8d385..f70068454 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.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=========================================================
*/
@@ -105,7 +106,7 @@ public class PolicyLogicReader implements AxLogicReader {
// Now, we read in the script
// Get the package name of the current package and convert dots to slashes for the file path
- String fullLogicFilePath = logicPackage.replaceAll("\\.", "/");
+ String fullLogicFilePath = logicPackage.replace(".", "/");
// Now, the logic should be in a sub directory for the logic executor type
fullLogicFilePath += "/" + axLogic.getLogicFlavour().toLowerCase();