summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2020-09-03 13:32:01 +0100
committerliamfallon <liam.fallon@est.tech>2020-09-03 15:40:06 +0100
commit386d8b15efd66cbd176e9911806c55a437cc6376 (patch)
tree0ea6603a5cfd1ee24721a63e494ef48ffedb6b23 /model
parent6f154bcd5c86bf9027d297df8cbdb8310eb88754 (diff)
Clean up warnings and SONAR issues
Issue-ID: POLICY-2654 Change-Id: Ifd391ea9141d37cfd3ca4110d66c667962230ae1 Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'model')
-rw-r--r--model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java71
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java10
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java9
3 files changed, 42 insertions, 48 deletions
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java
index 2680a6e71..786df5258 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java
@@ -24,7 +24,6 @@ package org.onap.policy.apex.model.basicmodel.handling;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileInputStream;
@@ -44,47 +43,47 @@ public class SupportConceptGetterTester {
assertNotNull(basicModel);
AxKeyInfo intKI01 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey01", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey01 description");
+ "IntegerKIKey01 description");
AxKeyInfo intKI11 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey11", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey11 description");
+ "IntegerKIKey11 description");
AxKeyInfo intKI21 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey21", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey21 description");
+ "IntegerKIKey21 description");
AxKeyInfo intKI22 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey22", "0.0.2"), UUID.randomUUID(),
- "IntegerKIKey22 description");
+ "IntegerKIKey22 description");
AxKeyInfo intKI23 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey23", "0.0.3"), UUID.randomUUID(),
- "IntegerKIKey23 description");
+ "IntegerKIKey23 description");
AxKeyInfo intKI24 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey24", "0.0.4"), UUID.randomUUID(),
- "IntegerKIKey24 description");
+ "IntegerKIKey24 description");
AxKeyInfo intKI25 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey25", "0.0.5"), UUID.randomUUID(),
- "IntegerKIKey25 description");
+ "IntegerKIKey25 description");
AxKeyInfo intKI26 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey26", "0.0.6"), UUID.randomUUID(),
- "IntegerKIKey26 description");
+ "IntegerKIKey26 description");
AxKeyInfo intKI31 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey31", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey31 description");
+ "IntegerKIKey31 description");
AxKeyInfo intKI41 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey41", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey41 description");
+ "IntegerKIKey41 description");
AxKeyInfo intKI51 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey51", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey51 description");
+ "IntegerKIKey51 description");
AxKeyInfo intKI52 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey52", "0.0.2"), UUID.randomUUID(),
- "IntegerKIKey52 description");
+ "IntegerKIKey52 description");
AxKeyInfo intKI53 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey53", "0.0.3"), UUID.randomUUID(),
- "IntegerKIKey53 description");
+ "IntegerKIKey53 description");
AxKeyInfo intKI54 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey54", "0.0.4"), UUID.randomUUID(),
- "IntegerKIKey54 description");
+ "IntegerKIKey54 description");
AxKeyInfo intKI61 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey61", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey61 description");
+ "IntegerKIKey61 description");
AxKeyInfo intKI62 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey62", "0.0.2"), UUID.randomUUID(),
- "IntegerKIKey62 description");
+ "IntegerKIKey62 description");
AxKeyInfo intKI63 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey63", "0.0.3"), UUID.randomUUID(),
- "IntegerKIKey63 description");
+ "IntegerKIKey63 description");
AxKeyInfo intKI64 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey64", "0.0.4"), UUID.randomUUID(),
- "IntegerKIKey64 description");
+ "IntegerKIKey64 description");
AxKeyInfo intKI71 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey71", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey71 description");
+ "IntegerKIKey71 description");
AxKeyInfo intKI81 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey81", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey81 description");
+ "IntegerKIKey81 description");
AxKeyInfo intKI91 = new AxKeyInfo(new AxArtifactKey("IntegerKIKey91", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey91 description");
+ "IntegerKIKey91 description");
basicModel.getKeyInformation().getKeyInfoMap().put(intKI31.getKey(), intKI31);
basicModel.getKeyInformation().getKeyInfoMap().put(intKI24.getKey(), intKI24);
basicModel.getKeyInformation().getKeyInfoMap().put(intKI11.getKey(), intKI11);
@@ -108,33 +107,33 @@ public class SupportConceptGetterTester {
basicModel.getKeyInformation().getKeyInfoMap().put(intKI63.getKey(), intKI63);
AxKeyInfo floatKI01 = new AxKeyInfo(new AxArtifactKey("FloatKIKey01", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey01 description");
+ "IntegerKIKey01 description");
AxKeyInfo floatKI11 = new AxKeyInfo(new AxArtifactKey("FloatKIKey11", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey11 description");
+ "IntegerKIKey11 description");
AxKeyInfo floatKI21 = new AxKeyInfo(new AxArtifactKey("FloatKIKey21", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey21 description");
+ "IntegerKIKey21 description");
AxKeyInfo floatKI31 = new AxKeyInfo(new AxArtifactKey("FloatKIKey31", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey31 description");
+ "IntegerKIKey31 description");
AxKeyInfo floatKI41 = new AxKeyInfo(new AxArtifactKey("FloatKIKey41", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey41 description");
+ "IntegerKIKey41 description");
AxKeyInfo floatKI51 = new AxKeyInfo(new AxArtifactKey("FloatKIKey51", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey51 description");
+ "IntegerKIKey51 description");
AxKeyInfo floatKI61 = new AxKeyInfo(new AxArtifactKey("FloatKIKey61", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey61 description");
+ "IntegerKIKey61 description");
AxKeyInfo floatKI71 = new AxKeyInfo(new AxArtifactKey("FloatKIKey71", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey71 description");
+ "IntegerKIKey71 description");
AxKeyInfo floatKI81 = new AxKeyInfo(new AxArtifactKey("FloatKIKey81", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey81 description");
+ "IntegerKIKey81 description");
AxKeyInfo floatKI82 = new AxKeyInfo(new AxArtifactKey("FloatKIKey82", "0.0.2"), UUID.randomUUID(),
- "IntegerKIKey82 description");
+ "IntegerKIKey82 description");
AxKeyInfo floatKI83 = new AxKeyInfo(new AxArtifactKey("FloatKIKey83", "0.0.3"), UUID.randomUUID(),
- "IntegerKIKey83 description");
+ "IntegerKIKey83 description");
AxKeyInfo floatKI91 = new AxKeyInfo(new AxArtifactKey("FloatKIKey91", "0.0.1"), UUID.randomUUID(),
- "IntegerKIKey91 description");
+ "IntegerKIKey91 description");
AxKeyInfo floatKI92 = new AxKeyInfo(new AxArtifactKey("FloatKIKey92", "0.0.2"), UUID.randomUUID(),
- "IntegerKIKey92 description");
+ "IntegerKIKey92 description");
AxKeyInfo floatKI93 = new AxKeyInfo(new AxArtifactKey("FloatKIKey93", "0.0.3"), UUID.randomUUID(),
- "IntegerKIKey93 description");
+ "IntegerKIKey93 description");
basicModel.getKeyInformation().getKeyInfoMap().put(floatKI11.getKey(), floatKI11);
basicModel.getKeyInformation().getKeyInfoMap().put(floatKI83.getKey(), floatKI83);
basicModel.getKeyInformation().getKeyInfoMap().put(floatKI51.getKey(), floatKI51);
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
index 02195e4db..4071803a0 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
@@ -144,11 +144,9 @@ public class ApexModelApiTest {
@Test
public void testApexModelUrl() throws IOException {
final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
- //ApexApiResult result = null;
- assertThatThrownBy(() -> apexModel.readFromUrl(null))
- .isInstanceOf(IllegalArgumentException.class);
- assertThatThrownBy(() -> apexModel.writeToUrl(null, true))
- .isInstanceOf(IllegalArgumentException.class);
+
+ assertThatThrownBy(() -> apexModel.readFromUrl(null)).isInstanceOf(IllegalArgumentException.class);
+ assertThatThrownBy(() -> apexModel.writeToUrl(null, true)).isInstanceOf(IllegalArgumentException.class);
ApexApiResult result = null;
result = apexModel.readFromUrl("zooby/looby");
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
@@ -162,8 +160,6 @@ public class ApexModelApiTest {
result = apexModel.writeToUrl("zooby://zooby/looby", false);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
- final ApexModel apexModelJSon = new ApexModelFactory().createApexModel(null, false);
-
final File tempJsonModelFile = File.createTempFile("ApexModelTest", ".json");
result = apexModel.saveToFile(tempJsonModelFile.getCanonicalPath(), false);
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java
index 42f2fc754..007288343 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java
@@ -1,27 +1,26 @@
/*-
* ============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=========================================================
*/
package org.onap.policy.apex.model.policymodel.concepts;
-import org.onap.policy.apex.model.policymodel.concepts.AxLogicReader;
-
public class DummyLogicReader implements AxLogicReader {
/**