diff options
| author |   liamfallon <liam.fallon@ericsson.com> | 2018-09-10 17:05:36 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@ericsson.com> | 2018-09-10 17:07:47 +0100 |
| commit | d100854291559df1426ea1e64351872ae2d3867b (patch) | |
| tree | 78baab90111307cd3d2460b2cca37e93a20ac9a3 /tools/model-generator/src | |
| parent | 8f82d7adcb53b349e14d3b356bda03588a554f95 (diff) | |
Checkstyle changes for apex model
Fix checkstyle warnings in the apex mode
and knock on changes.
Issue-ID: POLICY-1034
Change-Id: I10537e4288e9cad5ef18165ed2cdc1d3ab3139c1
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'tools/model-generator/src')
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java index 2712e5d33..cc9ed5cae 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java @@ -40,7 +40,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum; import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema; import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; import org.onap.policy.apex.model.eventmodel.concepts.AxField; -import org.onap.policy.apex.model.modelapi.ApexAPIResult; +import org.onap.policy.apex.model.modelapi.ApexApiResult; import org.onap.policy.apex.model.modelapi.ApexModel; import org.onap.policy.apex.model.modelapi.ApexModelFactory; import org.onap.policy.apex.model.policymodel.concepts.AxPolicy; @@ -109,8 +109,8 @@ public class Model2Cli { final ApexModelFactory factory = new ApexModelFactory(); final ApexModel model = factory.createApexModel(new Properties(), true); - final ApexAPIResult result = model.loadFromFile(modelFile); - if (result.isNOK()) { + final ApexApiResult result = model.loadFromFile(modelFile); + if (result.isNok()) { System.err.println(appName + ": " + result.getMessage()); return -1; } diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java index b662f577c..0bc9a27f8 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java @@ -31,7 +31,7 @@ import org.onap.policy.apex.context.parameters.SchemaParameters; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; -import org.onap.policy.apex.model.modelapi.ApexAPIResult; +import org.onap.policy.apex.model.modelapi.ApexApiResult; import org.onap.policy.apex.model.modelapi.ApexModel; import org.onap.policy.apex.model.modelapi.ApexModelFactory; import org.onap.policy.apex.model.policymodel.concepts.AxPolicies; @@ -148,8 +148,8 @@ public class Model2JsonEventSchema { final ApexModelFactory factory = new ApexModelFactory(); final ApexModel model = factory.createApexModel(new Properties(), true); - final ApexAPIResult result = model.loadFromFile(modelFile); - if (result.isNOK()) { + final ApexApiResult result = model.loadFromFile(modelFile); + if (result.isNok()) { System.err.println(appName + ": " + result.getMessage()); return -1; } |