From 87be30582d1db37bee7c6b456c0c5c3ca9584963 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 4 Sep 2018 17:24:15 +0100 Subject: Fix checkstyle issues in apex model basic CHeckstyle issues in apex model basic and knock on changes in other apex modules. Issue-ID: POLICY-1034 Change-Id: I65823f5e2e344526abc74b0812877113acb056ec Signed-off-by: liamfallon --- .../apex/model/enginemodel/concepts/TestEngineModel.java | 4 ++-- .../apex/model/enginemodel/concepts/TestEngineStats.java | 4 ++-- .../model/enginemodel/handling/TestApexEngineModel.java | 14 +++++++------- .../src/test/resources/META-INF/persistence.xml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'model/engine-model/src') diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineModel.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineModel.java index 86530462c..79537cfaf 100644 --- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineModel.java +++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineModel.java @@ -70,8 +70,8 @@ public class TestEngineModel { } model.setKey(modelKey); - assertEquals("ModelName:0.0.1", model.getKey().getID()); - assertEquals("ModelName:0.0.1", model.getKeys().get(0).getID()); + assertEquals("ModelName:0.0.1", model.getKey().getId()); + assertEquals("ModelName:0.0.1", model.getKeys().get(0).getId()); final long timestamp = System.currentTimeMillis(); model.setTimestamp(timestamp); diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineStats.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineStats.java index 1cbe1930e..6346e59f7 100644 --- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineStats.java +++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineStats.java @@ -54,8 +54,8 @@ public class TestEngineStats { } stats.setKey(statsKey); - assertEquals("EngineKey:0.0.1:NULL:EngineStats", stats.getKey().getID()); - assertEquals("EngineKey:0.0.1:NULL:EngineStats", stats.getKeys().get(0).getID()); + assertEquals("EngineKey:0.0.1:NULL:EngineStats", stats.getKey().getId()); + assertEquals("EngineKey:0.0.1:NULL:EngineStats", stats.getKeys().get(0).getId()); stats.setAverageExecutionTime(123.45); assertEquals(new Double(123.45), new Double(stats.getAverageExecutionTime())); diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModel.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModel.java index c1e6f3f37..c8076aab7 100644 --- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModel.java +++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModel.java @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; -import org.onap.policy.apex.model.basicmodel.dao.DAOParameters; +import org.onap.policy.apex.model.basicmodel.dao.DaoParameters; import org.onap.policy.apex.model.basicmodel.test.TestApexModel; import org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel; @@ -72,21 +72,21 @@ public class TestApexEngineModel { @Test public void testModelWriteReadXML() throws Exception { - testApexModel.testApexModelWriteReadXML(); + testApexModel.testApexModelWriteReadXml(); } @Test public void testModelWriteReadJSON() throws Exception { - testApexModel.testApexModelWriteReadJSON(); + testApexModel.testApexModelWriteReadJson(); } @Test public void testModelWriteReadJPA() throws Exception { - final DAOParameters daoParameters = new DAOParameters(); - daoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao"); - daoParameters.setPersistenceUnit("DAOTest"); + final DaoParameters DaoParameters = new DaoParameters(); + DaoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao"); + DaoParameters.setPersistenceUnit("DAOTest"); - testApexModel.testApexModelWriteReadJPA(daoParameters); + testApexModel.testApexModelWriteReadJpa(DaoParameters); } private static final String VALID_MODEL_STRING = "***validation of model successful***"; diff --git a/model/engine-model/src/test/resources/META-INF/persistence.xml b/model/engine-model/src/test/resources/META-INF/persistence.xml index 717d1a540..a157cf34f 100644 --- a/model/engine-model/src/test/resources/META-INF/persistence.xml +++ b/model/engine-model/src/test/resources/META-INF/persistence.xml @@ -23,8 +23,8 @@ org.eclipse.persistence.jpa.PersistenceProvider - org.onap.policy.apex.model.basicmodel.dao.converters.CDATAConditioner - org.onap.policy.apex.model.basicmodel.dao.converters.UUID2String + org.onap.policy.apex.model.basicmodel.dao.converters.CDataConditioner + org.onap.policy.apex.model.basicmodel.dao.converters.Uuid2String org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey org.onap.policy.apex.model.basicmodel.concepts.AxConcept org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo -- cgit 1.2.3-korg