BUG-731: do not throw Exceptions

[bgpcep.git] / pcep / impl-config / src / main / java / org / opendaylight / controller / config / yang / pcep / impl / PCEPSessionProposalFactoryImplModule.java

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 6cec6243ebcd238a10573406fe28fa043e42ba56..a29bb8ac6522251cbd71815345e334f435465ec4 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
@@ -20,7 +20,7 @@ import java.net.InetSocketAddress;
 
 import org.opendaylight.controller.config.api.JmxAttributeValidationException;
 import org.opendaylight.protocol.pcep.PCEPSessionProposalFactory;
-import org.opendaylight.protocol.pcep.ietf.initiated00.Stateful07SessionProposalFactory;
+import org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  *
  */
 public final class PCEPSessionProposalFactoryImplModule extends
-               org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPSessionProposalFactoryImplModule {
+org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPSessionProposalFactoryImplModule {
 
        private static final Logger LOG = LoggerFactory.getLogger(PCEPSessionProposalFactoryImplModule.class);
 
@@ -45,41 +45,35 @@ public final class PCEPSessionProposalFactoryImplModule extends
        }
 
        @Override
-       public void validate() {
-               super.validate();
-               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);
+       public void customValidation() {
+               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");
                        }
                }
-               if (getActive() && !getStateful()) {
-                       setStateful(true);
-               }
-               JmxAttributeValidationException.checkNotNull(getStateful(), "value is not set.", this.statefulJmxAttribute);
        }
 
        @Override
        public java.lang.AutoCloseable createInstance() {
-               final Stateful07SessionProposalFactory inner = new Stateful07SessionProposalFactory(getDeadTimerValue(), getKeepAliveTimerValue(), getStateful(), getActive(), getInitiated());
+               final BasePCEPSessionProposalFactory inner = new BasePCEPSessionProposalFactory(getDeadTimerValue(), getKeepAliveTimerValue());
                return new PCEPSessionProposalFactoryCloseable(inner);
        }
 
        private static final class PCEPSessionProposalFactoryCloseable implements PCEPSessionProposalFactory, AutoCloseable {
 
-               private final Stateful07SessionProposalFactory inner;
+               private final BasePCEPSessionProposalFactory inner;
 
-               public PCEPSessionProposalFactoryCloseable(final Stateful07SessionProposalFactory inner) {
+               public PCEPSessionProposalFactoryCloseable(final BasePCEPSessionProposalFactory inner) {
                        this.inner = inner;
                }
 
                @Override
-               public void close() throws Exception {
+               public void close() {
+                       // Nothing to do
                }
 
                @Override