summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-09-04 17:24:15 +0100
committerliamfallon <liam.fallon@ericsson.com>2018-09-04 17:25:22 +0100
commit87be30582d1db37bee7c6b456c0c5c3ca9584963 (patch)
tree28806c5866fc5d07c89a06014d7c7d2705772b4f /tools
parentf32508381ce0b555fc14978cbaa458aa4e2d91c5 (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 'tools')
-rw-r--r--tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/KeyInfoGetter.java4
-rw-r--r--tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java4
-rw-r--r--tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/KeyInfoGetter.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/KeyInfoGetter.java
index a04ed49f3..f7dfe8456 100644
--- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/KeyInfoGetter.java
+++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/KeyInfoGetter.java
@@ -131,10 +131,10 @@ public class KeyInfoGetter {
*/
public String getUUID(final AxArtifactKey key) {
final AxKeyInfo ki = model.getKeyInformation().get(key);
- if (ki == null || ki.getUUID() == null) {
+ if (ki == null || ki.getUuid() == null) {
return null;
}
- return ki.getUUID().toString();
+ return ki.getUuid().toString();
}
/**
diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java
index 3a4feb049..545d15eeb 100644
--- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java
+++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java
@@ -112,7 +112,7 @@ public final class SchemaUtils {
}
} catch (final AvroRuntimeException e) {
throw new ApexEventException("failed to decode a schema for parameter " + parameter.getKey().getLocalName()
- + " of type " + parameter.getSchema().getID() + " with Java type " + schemaHelper.getSchemaClass(),
+ + " of type " + parameter.getSchema().getId() + " with Java type " + schemaHelper.getSchemaClass(),
e);
}
final String schemaname = parameterSchema.getFullName();
@@ -126,7 +126,7 @@ public final class SchemaUtils {
processSubSchemas(parameterSchema, preexistingParamSchemas);
} catch (AvroRuntimeException | ApexEventException e) {
throw new ApexEventException("failed to decode a schema for parameter " + parameter.getKey().getLocalName()
- + " of type " + parameter.getSchema().getID() + " using Schema type " + schemaname, e);
+ + " of type " + parameter.getSchema().getId() + " using Schema type " + schemaname, e);
}
if (alreadyseen != null) {
// logger.warn("parameter "+ parameter.getKey().getLocalName() + " of type " + parameter.getSchema().getID()
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 d374a6c60..2712e5d33 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
@@ -121,7 +121,7 @@ public class Model2Cli {
if (validate) {
final AxValidationResult val = new AxValidationResult();
policyModel.validate(val);
- if (!val.isOK()) {
+ if (!val.isOk()) {
System.err.println("Cannot translate the model. The model is not valid: \n" + val.toString());
return -1;
}