BUG-731: JMX attributes are static now

The JMX attribute fields are now public static so let's not use object
reference when accessing them.

Change-Id: I1613188a11d528f06ef30183f1eade1c4d60ab79
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java b/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
index 98039b3cd11709ff506a31524f4335ca65bafe14..af8f6ef4b98a661acf28f27992515ac5fdbca532 100644 (file)
--- a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
+++ b/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
@@ -90,7 +90,7 @@ public final class BGPPeerModule extends org.opendaylight.controller.config.yang
 
                                // FIXME: AbstractBGPDispatcherImplModule.md5ChannelFactoryJmxAttribute.getAttributeName()
                                final Object cf = srv.getAttribute(dispi, "Md5ChannelFactory");
-                               JmxAttributeValidationException.checkCondition(cf != null, "Underlying dispatcher does not support MD5 clients", this.passwordJmxAttribute);
+                               JmxAttributeValidationException.checkCondition(cf != null, "Underlying dispatcher does not support MD5 clients", passwordJmxAttribute);
                        } catch (AttributeNotFoundException | InstanceNotFoundException
                                        | MBeanException | ReflectionException e) {
                                JmxAttributeValidationException.wrap(e, "support could not be validated", passwordJmxAttribute);

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java b/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java
index 1deb030f4e13f981dc216e84b11e7add81706f8b..6ab9b7e7f266d5df9e985480a92a92bdb236352a 100644 (file)
--- a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java
+++ b/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java
@@ -38,13 +38,13 @@ public final class RIBImplModule extends org.opendaylight.controller.config.yang
 
        @Override
        public void customValidation() {
-               JmxAttributeValidationException.checkNotNull(getExtensions(), "is not set.", this.extensionsJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getRibId(), "is not set.", this.ribIdJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getLocalAs(), "is not set.", this.localAsJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getBgpId(), "is not set.", this.bgpIdJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getTcpReconnectStrategy(), "is not set.", this.tcpReconnectStrategyJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getSessionReconnectStrategy(), "is not set.", this.sessionReconnectStrategyJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getLocalTable(), "is not set.", this.localTableJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getExtensions(), "is not set.", extensionsJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getRibId(), "is not set.", ribIdJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getLocalAs(), "is not set.", localAsJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getBgpId(), "is not set.", bgpIdJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getTcpReconnectStrategy(), "is not set.", tcpReconnectStrategyJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getSessionReconnectStrategy(), "is not set.", sessionReconnectStrategyJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getLocalTable(), "is not set.", localTableJmxAttribute);
        }
 
        @Override

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/Stateful02PCEPSessionProposalFactoryModule.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/Stateful02PCEPSessionProposalFactoryModule.java
index 376a04b2184caba8a11e8bffb1d8a1b125bcebc4..2598c561796dfa3799ac2e3a299fcf264598aa24 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/Stateful02PCEPSessionProposalFactoryModule.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/Stateful02PCEPSessionProposalFactoryModule.java
@@ -37,14 +37,14 @@ public final class Stateful02PCEPSessionProposalFactoryModule extends org.openda
 
        @Override
        protected void customValidation(){
-               JmxAttributeValidationException.checkNotNull(getActive(), "value is not set.", this.activeJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getInitiated(), "value is not set.", this.initiatedJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getDeadTimerValue(), "value is not set.", this.deadTimerValueJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getKeepAliveTimerValue(), "value is not set.", this.keepAliveTimerValueJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getTimeout(), "value is not set.", this.timeoutJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getActive(), "value is not set.", activeJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getInitiated(), "value is not set.", initiatedJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getDeadTimerValue(), "value is not set.", deadTimerValueJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getKeepAliveTimerValue(), "value is not set.", keepAliveTimerValueJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getTimeout(), "value is not set.", timeoutJmxAttribute);
                if (getKeepAliveTimerValue() != 0) {
                        JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.",
-                                       this.keepAliveTimerValueJmxAttribute);
+                                       keepAliveTimerValueJmxAttribute);
                        if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != 4)) {
                                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
                        }
@@ -52,7 +52,7 @@ public final class Stateful02PCEPSessionProposalFactoryModule extends org.openda
                if (getActive() && !getStateful()) {
                        setStateful(true);
                }
-               JmxAttributeValidationException.checkNotNull(getStateful(), "value is not set.", this.statefulJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getStateful(), "value is not set.", statefulJmxAttribute);
        }
 
        @Override

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java
index 4e7fc3c4224bd639ca902ea9e9aa20941ba0026a..d86d9940593a5af03929ae8a35184a66ec2b6857 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java
@@ -37,13 +37,13 @@ public final class Stateful07PCEPSessionProposalFactoryModule extends org.openda
 
        @Override
        protected void customValidation(){
-               JmxAttributeValidationException.checkNotNull(getActive(), "value is not set.", this.activeJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getInitiated(), "value is not set.", this.initiatedJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getDeadTimerValue(), "value is not set.", this.deadTimerValueJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getKeepAliveTimerValue(), "value is not set.", this.keepAliveTimerValueJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getActive(), "value is not set.", activeJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getInitiated(), "value is not set.", initiatedJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getDeadTimerValue(), "value is not set.", deadTimerValueJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getKeepAliveTimerValue(), "value is not set.", keepAliveTimerValueJmxAttribute);
                if (getKeepAliveTimerValue() != 0) {
                        JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.",
-                                       this.keepAliveTimerValueJmxAttribute);
+                                       keepAliveTimerValueJmxAttribute);
                        if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != 4)) {
                                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
                        }
@@ -51,7 +51,7 @@ public final class Stateful07PCEPSessionProposalFactoryModule extends org.openda
                if (getActive() && !getStateful()) {
                        setStateful(true);
                }
-               JmxAttributeValidationException.checkNotNull(getStateful(), "value is not set.", this.statefulJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getStateful(), "value is not set.", statefulJmxAttribute);
        }
 
        @Override

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
index 7cb0ca707f116bb6a753d21ea75e19c263499018..7a868524481a16ce60cdbb9683203b02839c7351 100644 (file)
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
@@ -46,11 +46,11 @@ org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPDispatcherImplModu
        public void validate() {
                super.validate();
                JmxAttributeValidationException.checkNotNull(getMaxUnknownMessages(),
-                               "value is not set.", this.maxUnknownMessagesJmxAttribute);
+                               "value is not set.", maxUnknownMessagesJmxAttribute);
                JmxAttributeValidationException.checkCondition(
                                getMaxUnknownMessages() > 0, "Parameter 'maxUnknownMessages' "
                                                + "must be greater than 0",
-                                               this.maxUnknownMessagesJmxAttribute);
+                                               maxUnknownMessagesJmxAttribute);
        }
 
        @Override

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
index 657688e7db841bf6190c3948a77c37e5a5cd4032..b9abdf0e23e66feb871d156f1e26f8028f39a60e 100644 (file)
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
@@ -46,11 +46,11 @@ org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPSessionProposalFac
 
        @Override
        public void customValidation() {
-               JmxAttributeValidationException.checkNotNull(getDeadTimerValue(), "value is not set.", this.deadTimerValueJmxAttribute);
-               JmxAttributeValidationException.checkNotNull(getKeepAliveTimerValue(), "value is not set.", this.keepAliveTimerValueJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getDeadTimerValue(), "value is not set.", deadTimerValueJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getKeepAliveTimerValue(), "value is not set.", keepAliveTimerValueJmxAttribute);
                if (getKeepAliveTimerValue() != 0) {
                        JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.",
-                                       this.keepAliveTimerValueJmxAttribute);
+                                       keepAliveTimerValueJmxAttribute);
                        if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != 4)) {
                                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
                        }