diff options
author | 2018-09-04 17:24:15 +0100 | |
---|---|---|
committer | 2018-09-04 17:25:22 +0100 | |
commit | 87be30582d1db37bee7c6b456c0c5c3ca9584963 (patch) | |
tree | 28806c5866fc5d07c89a06014d7c7d2705772b4f /testsuites/integration/integration-common/src/main/java/org/onap | |
parent | f32508381ce0b555fc14978cbaa458aa4e2d91c5 (diff) |
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 <liam.fallon@ericsson.com>
Diffstat (limited to 'testsuites/integration/integration-common/src/main/java/org/onap')
3 files changed, 15 insertions, 15 deletions
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/EvalDomainModelFactory.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/EvalDomainModelFactory.java index 83a4ccc76..a3f626f48 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/EvalDomainModelFactory.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/EvalDomainModelFactory.java @@ -263,8 +263,8 @@ public class EvalDomainModelFactory { policyModel.getKeyInformation().generateKeyInfo(policyModel); final AxValidationResult result = policyModel.validate(new AxValidationResult()); - if (!result.isOK()) { - throw new ApexRuntimeException("model " + policyModel.getID() + " is not valid" + result); + if (!result.isOk()) { + throw new ApexRuntimeException("model " + policyModel.getId() + " is not valid" + result); } return policyModel; } @@ -434,8 +434,8 @@ public class EvalDomainModelFactory { policyModel.getKeyInformation().generateKeyInfo(policyModel); final AxValidationResult result = policyModel.validate(new AxValidationResult()); - if (!result.isOK()) { - throw new ApexRuntimeException("model " + policyModel.getID() + " is not valid" + result); + if (!result.isOk()) { + throw new ApexRuntimeException("model " + policyModel.getId() + " is not valid" + result); } return policyModel; } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelFactory.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelFactory.java index 24993674c..184529fa9 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelFactory.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelFactory.java @@ -535,7 +535,7 @@ public class SampleDomainModelFactory { AxValidationResult result = policyModel.validate(new AxValidationResult()); if (!result.getValidationResult().equals(AxValidationResult.ValidationResult.VALID)) { - throw new ApexRuntimeException("model " + policyModel.getID() + " is not valid" + result); + throw new ApexRuntimeException("model " + policyModel.getId() + " is not valid" + result); } return policyModel; } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelSaver.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelSaver.java index c346d94c0..6ca644ff4 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelSaver.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/test/common/model/SampleDomainModelSaver.java @@ -51,32 +51,32 @@ public final class SampleDomainModelSaver { // Save Java model final AxPolicyModel javaPolicyModel = new SampleDomainModelFactory().getSamplePolicyModel("JAVA"); final ApexModelSaver<AxPolicyModel> javaModelSaver = new ApexModelSaver<AxPolicyModel>(AxPolicyModel.class, javaPolicyModel, args[0]); - javaModelSaver.apexModelWriteJSON(); - javaModelSaver.apexModelWriteXML(); + javaModelSaver.apexModelWriteJson(); + javaModelSaver.apexModelWriteXml(); // Save Javascript model final AxPolicyModel javascriptPolicyModel = new SampleDomainModelFactory().getSamplePolicyModel("JAVASCRIPT"); final ApexModelSaver<AxPolicyModel> javascriptModelSaver = new ApexModelSaver<AxPolicyModel>(AxPolicyModel.class, javascriptPolicyModel, args[0]); - javascriptModelSaver.apexModelWriteJSON(); - javascriptModelSaver.apexModelWriteXML(); + javascriptModelSaver.apexModelWriteJson(); + javascriptModelSaver.apexModelWriteXml(); // Save JRuby model final AxPolicyModel jRubyPolicyModel = new SampleDomainModelFactory().getSamplePolicyModel("JRUBY"); final ApexModelSaver<AxPolicyModel> jRubyModelSaver = new ApexModelSaver<AxPolicyModel>(AxPolicyModel.class, jRubyPolicyModel, args[0]); - jRubyModelSaver.apexModelWriteJSON(); - jRubyModelSaver.apexModelWriteXML(); + jRubyModelSaver.apexModelWriteJson(); + jRubyModelSaver.apexModelWriteXml(); // Save Jython model final AxPolicyModel jythonPolicyModel = new SampleDomainModelFactory().getSamplePolicyModel("JYTHON"); final ApexModelSaver<AxPolicyModel> jythonModelSaver = new ApexModelSaver<AxPolicyModel>(AxPolicyModel.class, jythonPolicyModel, args[0]); - jythonModelSaver.apexModelWriteJSON(); - jythonModelSaver.apexModelWriteXML(); + jythonModelSaver.apexModelWriteJson(); + jythonModelSaver.apexModelWriteXml(); // Save MVEL model final AxPolicyModel mvelPolicyModel = new SampleDomainModelFactory().getSamplePolicyModel("MVEL"); final ApexModelSaver<AxPolicyModel> mvelModelSaver = new ApexModelSaver<AxPolicyModel>(AxPolicyModel.class, mvelPolicyModel, args[0]); - mvelModelSaver.apexModelWriteJSON(); - mvelModelSaver.apexModelWriteXML(); + mvelModelSaver.apexModelWriteJson(); + mvelModelSaver.apexModelWriteXml(); } } |