summaryrefslogtreecommitdiffstats
path: root/common-parameters
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-06-14 10:58:51 -0400
committerJim Hahn <jrh3@att.com>2019-06-14 10:58:51 -0400
commitaecbc1cba6e862c3d842012ce54d121764f78cb0 (patch)
tree3e96270fcc43b0c2198e8468f8c644204bd42dc8 /common-parameters
parentfe5d78724f723a451ddc0d7cc41d6fc60092b314 (diff)
Change getCanonicalName() to getName() in common
Per javadocs, getName() should generally be used instead of Class.getCanonicalName(). This change only applies to classes; it does not apply to File objects. Change-Id: Iea0995d1167f4837607f194d35f0193eeedeacd7 Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'common-parameters')
-rw-r--r--common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java2
-rw-r--r--common-parameters/src/main/java/org/onap/policy/common/parameters/ParameterValidationResult.java2
-rw-r--r--common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java4
-rw-r--r--common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java4
-rw-r--r--common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersLGeneric.java4
5 files changed, 8 insertions, 8 deletions
diff --git a/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java b/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
index 3dc01299..ad2eb695 100644
--- a/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
+++ b/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
@@ -339,7 +339,7 @@ public class GroupValidationResult extends CommonGroupValidationResult {
if (parameterGroup != null) {
result.append(parameterGroup.getName());
result.append("\" type \"");
- result.append(parameterGroup.getClass().getCanonicalName());
+ result.append(parameterGroup.getClass().getName());
} else {
result.append("UNDEFINED");
}
diff --git a/common-parameters/src/main/java/org/onap/policy/common/parameters/ParameterValidationResult.java b/common-parameters/src/main/java/org/onap/policy/common/parameters/ParameterValidationResult.java
index 2c367a30..35837376 100644
--- a/common-parameters/src/main/java/org/onap/policy/common/parameters/ParameterValidationResult.java
+++ b/common-parameters/src/main/java/org/onap/policy/common/parameters/ParameterValidationResult.java
@@ -163,7 +163,7 @@ public class ParameterValidationResult implements ValidationResult {
validationResultBuilder.append("field \"");
validationResultBuilder.append(getName());
validationResultBuilder.append("\" type \"");
- validationResultBuilder.append(field.getType().getCanonicalName());
+ validationResultBuilder.append(field.getType().getName());
validationResultBuilder.append("\" value \"");
validationResultBuilder.append(parameterValue);
validationResultBuilder.append("\" ");
diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java
index 2b41d0fb..51440546 100644
--- a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java
+++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java
@@ -37,7 +37,7 @@ public class TestParametersL00 extends ParameterGroupImpl {
private static final String A_CONSTANT = "A Constant";
private int l00IntField = 0;
- private String l00StringField = "Legal " + this.getClass().getCanonicalName();
+ private String l00StringField = "Legal " + this.getClass().getName();
private TestParametersL10 l00L10Nested = new TestParametersL10("l00L10Nested");
private TestParametersLGeneric l00LGenericNested = new TestParametersLGeneric("l00LGenericNested");
private Map<String, TestParametersLGeneric> l00LGenericNestedMap = new LinkedHashMap<>();
@@ -132,7 +132,7 @@ public class TestParametersL00 extends ParameterGroupImpl {
switch (triggerStatus) {
case CLEAN:
- l00StringField = "Legal " + this.getClass().getCanonicalName();
+ l00StringField = "Legal " + this.getClass().getName();
l00IntField = 0;
break;
case OBSERVATION:
diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java
index e1642beb..7276b504 100644
--- a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java
+++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java
@@ -35,7 +35,7 @@ public class TestParametersL10 extends ParameterGroupImpl {
private static final String L10_STRING_FIELD = "l10StringField";
private int l10IntField = 0;
- private String l10StringField = "Legal " + this.getClass().getCanonicalName();
+ private String l10StringField = "Legal " + this.getClass().getName();
private TestParametersLGeneric l10LGenericNested0 = new TestParametersLGeneric("l10LGenericNested0");
private TestParametersLGeneric l10LGenericNested1 = new TestParametersLGeneric("l10LGenericNested1");
private Map<String, TestParametersLGeneric> l10LGenericNestedMap = new LinkedHashMap<>();
@@ -116,7 +116,7 @@ public class TestParametersL10 extends ParameterGroupImpl {
switch (triggerStatus) {
case CLEAN:
- l10StringField = "Legal " + this.getClass().getCanonicalName();
+ l10StringField = "Legal " + this.getClass().getName();
l10IntField = 0;
break;
case OBSERVATION:
diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersLGeneric.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersLGeneric.java
index 44ec7139..f9d6cdc4 100644
--- a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersLGeneric.java
+++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersLGeneric.java
@@ -34,7 +34,7 @@ public class TestParametersLGeneric extends ParameterGroupImpl {
private int lgenericIntField = 0;
@NotNull @NotBlank
- private String lgenericStringField = "Legal " + this.getClass().getCanonicalName();
+ private String lgenericStringField = "Legal " + this.getClass().getName();
/**
* Default constructor.
@@ -80,7 +80,7 @@ public class TestParametersLGeneric extends ParameterGroupImpl {
switch (triggerStatus) {
case CLEAN:
- lgenericStringField = "Legal " + this.getClass().getCanonicalName();
+ lgenericStringField = "Legal " + this.getClass().getName();
lgenericIntField = 0;
break;
case OBSERVATION: