X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2Fattribute%2FAbstractAttribute.java;h=e6b69fb17d2559dc61ac667acb55e2058266ef85;hp=ba2edc4e31d867f1304a0108400cd41e2b7b43de;hb=103bf49aecb298d1022e7958d41e5fdcb484f315;hpb=bab3649670c33b3b12a49c59fc1c5cabcbcb924e;ds=sidebyside diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java index ba2edc4e31..e6b69fb17d 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java @@ -7,12 +7,12 @@ */ package org.opendaylight.controller.config.yangjmxgenerator.attribute; -import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; +import org.opendaylight.controller.config.yangjmxgenerator.TypeProviderWrapper; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; public abstract class AbstractAttribute implements AttributeIfc { private final String attributeYangName, upperCaseCammelCase, - lowerCaseCammelCase; + lowerCaseCammelCase; protected final DataSchemaNode node; private static String getLocalName(DataSchemaNode attrNode) { @@ -22,8 +22,8 @@ public abstract class AbstractAttribute implements AttributeIfc { AbstractAttribute(DataSchemaNode attrNode) { this.attributeYangName = getLocalName(attrNode); this.node = attrNode; - this.upperCaseCammelCase = ModuleMXBeanEntry.findJavaNamePrefix(node); - this.lowerCaseCammelCase = ModuleMXBeanEntry.findJavaParameter(node); + this.upperCaseCammelCase = TypeProviderWrapper.findJavaNamePrefix(node); + this.lowerCaseCammelCase = TypeProviderWrapper.findJavaParameter(node); } @Override @@ -33,17 +33,20 @@ public abstract class AbstractAttribute implements AttributeIfc { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (!(o instanceof AbstractAttribute)) + } + if (!(o instanceof AbstractAttribute)) { return false; + } AbstractAttribute that = (AbstractAttribute) o; if (attributeYangName != null ? !attributeYangName .equals(that.attributeYangName) - : that.attributeYangName != null) + : that.attributeYangName != null) { return false; + } return true; }