X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Futil%2FConfigTransactionJMXClient.java;h=f13592364609c3e5a0faf0b2d32f03853adbaa0d;hp=e683d915baea604db86b891e81dc9192b203c4aa;hb=e2f5a1f1f1b917620ba4ade6c024f5ee3d202036;hpb=81282cf3711693da7dde667c6bbf18cb40e81ad0 diff --git a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java index e683d915ba..f135923646 100644 --- a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java +++ b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java @@ -9,16 +9,14 @@ package org.opendaylight.controller.config.util; import java.util.Map; import java.util.Set; - import javax.management.Attribute; import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; import javax.management.JMException; import javax.management.JMX; +import javax.management.MBeanException; import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.management.RuntimeMBeanException; - import org.opendaylight.controller.config.api.ConflictingVersionException; import org.opendaylight.controller.config.api.ValidationException; import org.opendaylight.controller.config.api.jmx.CommitStatus; @@ -33,9 +31,9 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { private final MBeanServer configMBeanServer; public ConfigTransactionJMXClient( - ConfigRegistryMXBean configRegistryMXBeanProxy, - ObjectName configTransactionControllerON, - MBeanServer configMBeanServer) { + final ConfigRegistryMXBean configRegistryMXBeanProxy, + final ObjectName configTransactionControllerON, + final MBeanServer configMBeanServer) { this.configMBeanServer = configMBeanServer; this.configRegistryMXBeanProxy = configRegistryMXBeanProxy; this.configTransactionControllerON = configTransactionControllerON; @@ -44,11 +42,24 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { ConfigTransactionControllerMXBean.class); } - public T newMXBeanProxy(ObjectName on, Class clazz) { - return JMX.newMXBeanProxy(configMBeanServer, on, clazz); - } - - public T newMBeanProxy(ObjectName on, Class clazz) { + public T newMXBeanProxy(final ObjectName on, final Class clazz) { + ObjectName onName = on; + // if on is without transaction, add it. Reason is that when using getters on MXBeans the transaction name is stripped + onName = ObjectNameUtil.withTransactionName(onName, getTransactionName()); + // if this is service reference and user requests for implementation, look it up + onName = ConfigRegistryJMXClient.translateServiceRefIfPossible(onName, clazz, configMBeanServer); + onName = ObjectNameUtil.withTransactionName(onName, getTransactionName()); + return JMX.newMXBeanProxy(configMBeanServer, onName, clazz); + } + + /** + * Usage of this method indicates error as config JMX uses solely MXBeans. + * Use {@link #newMXBeanProxy(javax.management.ObjectName, Class)} + * or {@link JMX#newMBeanProxy(javax.management.MBeanServerConnection, javax.management.ObjectName, Class)} + * This method will be removed soon. + */ + @Deprecated + public T newMBeanProxy(final ObjectName on, final Class clazz) { return JMX.newMBeanProxy(configMBeanServer, on, clazz); } @@ -60,8 +71,8 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { } @Override - public void assertVersion(int expectedParentVersion, - int expectedCurrentVersion) { + public void assertVersion(final int expectedParentVersion, + final int expectedCurrentVersion) { if (expectedParentVersion != getParentVersion()) { throw new IllegalStateException(); } @@ -72,19 +83,35 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { // proxy around ConfigManagerMXBean @Override - public ObjectName createModule(String moduleName, String instanceName) + public ObjectName createModule(final String moduleName, final String instanceName) throws InstanceAlreadyExistsException { return configTransactionControllerMXBeanProxy.createModule(moduleName, instanceName); } @Override - public void destroyModule(ObjectName objectName) + public void reCreateModule(final ObjectName objectName) throws InstanceNotFoundException { + configTransactionControllerMXBeanProxy.reCreateModule(objectName); + } + + @Override + public void destroyModule(final ObjectName objectName) throws InstanceNotFoundException { configTransactionControllerMXBeanProxy.destroyModule(objectName); } @Override - public void destroyConfigBean(String moduleName, String instanceName) + @Deprecated + /** + * {@inheritDoc} + */ + public void destroyConfigBean(final String moduleName, final String instanceName) + throws InstanceNotFoundException { + destroyModule(ObjectNameUtil.createTransactionModuleON( + getTransactionName(), moduleName, instanceName)); + } + + @Override + public void destroyModule(final String moduleName, final String instanceName) throws InstanceNotFoundException { destroyModule(ObjectNameUtil.createTransactionModuleON( getTransactionName(), moduleName, instanceName)); @@ -105,7 +132,7 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { try { return (Long) configMBeanServer.getAttribute( configTransactionControllerON, "ParentVersion"); - } catch (JMException e) { + } catch (final JMException e) { throw new RuntimeException(e); } } @@ -115,7 +142,7 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { try { return (Long) configMBeanServer.getAttribute( configTransactionControllerON, "Version"); - } catch (JMException e) { + } catch (final JMException e) { throw new RuntimeException(e); } } @@ -141,35 +168,35 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { } @Override - public Set lookupConfigBeans(String moduleName) { + public Set lookupConfigBeans(final String moduleName) { return configTransactionControllerMXBeanProxy.lookupConfigBeans(moduleName); } @Override - public ObjectName lookupConfigBean(String moduleName, String instanceName) + public ObjectName lookupConfigBean(final String moduleName, final String instanceName) throws InstanceNotFoundException { return configTransactionControllerMXBeanProxy.lookupConfigBean(moduleName, instanceName); } @Override - public Set lookupConfigBeans(String moduleName, - String instanceName) { + public Set lookupConfigBeans(final String moduleName, + final String instanceName) { return configTransactionControllerMXBeanProxy .lookupConfigBeans(moduleName, instanceName); } @Override - public void checkConfigBeanExists(ObjectName objectName) throws InstanceNotFoundException { + public void checkConfigBeanExists(final ObjectName objectName) throws InstanceNotFoundException { configTransactionControllerMXBeanProxy.checkConfigBeanExists(objectName); } @Override - public ObjectName saveServiceReference(String serviceInterfaceName, String refName, ObjectName moduleON) throws InstanceNotFoundException { + public ObjectName saveServiceReference(final String serviceInterfaceName, final String refName, final ObjectName moduleON) throws InstanceNotFoundException { return configTransactionControllerMXBeanProxy.saveServiceReference(serviceInterfaceName,refName, moduleON); } @Override - public void removeServiceReference(String serviceInterfaceName, String refName) throws InstanceNotFoundException{ + public void removeServiceReference(final String serviceInterfaceName, final String refName) throws InstanceNotFoundException{ configTransactionControllerMXBeanProxy.removeServiceReference(serviceInterfaceName, refName); } @@ -179,7 +206,7 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { } @Override - public ObjectName lookupConfigBeanByServiceInterfaceName(String serviceInterfaceQName, String refName) { + public ObjectName lookupConfigBeanByServiceInterfaceName(final String serviceInterfaceQName, final String refName) { return configTransactionControllerMXBeanProxy.lookupConfigBeanByServiceInterfaceName(serviceInterfaceQName, refName); } @@ -189,56 +216,82 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { } @Override - public Map lookupServiceReferencesByServiceInterfaceName(String serviceInterfaceQName) { + public Map lookupServiceReferencesByServiceInterfaceName(final String serviceInterfaceQName) { return configTransactionControllerMXBeanProxy.lookupServiceReferencesByServiceInterfaceName(serviceInterfaceQName); } @Override - public Set lookupServiceInterfaceNames(ObjectName objectName) throws InstanceNotFoundException { + public Set lookupServiceInterfaceNames(final ObjectName objectName) throws InstanceNotFoundException { return configTransactionControllerMXBeanProxy.lookupServiceInterfaceNames(objectName); } @Override - public String getServiceInterfaceName(String namespace, String localName) { + public String getServiceInterfaceName(final String namespace, final String localName) { return configTransactionControllerMXBeanProxy.getServiceInterfaceName(namespace, localName); } @Override - public boolean removeServiceReferences(ObjectName objectName) throws InstanceNotFoundException { + public boolean removeServiceReferences(final ObjectName objectName) throws InstanceNotFoundException { return configTransactionControllerMXBeanProxy.removeServiceReferences(objectName); } @Override - public ObjectName getServiceReference(String serviceInterfaceQName, String refName) throws InstanceNotFoundException { + public ObjectName getServiceReference(final String serviceInterfaceQName, final String refName) throws InstanceNotFoundException { return configTransactionControllerMXBeanProxy.getServiceReference(serviceInterfaceQName, refName); } @Override - public void checkServiceReferenceExists(ObjectName objectName) throws InstanceNotFoundException { + public void checkServiceReferenceExists(final ObjectName objectName) throws InstanceNotFoundException { configTransactionControllerMXBeanProxy.checkServiceReferenceExists(objectName); } @Override - public void validateBean(ObjectName configBeanON) + public Attribute getAttribute(final ObjectName on, final String attrName) { + if (ObjectNameUtil.getTransactionName(on) == null) { + throw new IllegalArgumentException("Not in transaction instance " + + on + ", no transaction name present"); + } + + try { + return new Attribute(attrName, configMBeanServer.getAttribute(on,attrName)); + } catch (final JMException e) { + throw new IllegalStateException("Unable to get attribute " + + attrName + " for " + on, e); + } + } + + @Override + public Object getAttributeCurrentValue(final ObjectName on, final String attrName) { + return getAttribute(on, attrName).getValue(); + } + + @Override + public void validateBean(final ObjectName configBeanON) throws ValidationException { try { configMBeanServer.invoke(configBeanON, "validate", null, null); - } catch (JMException e) { + } catch (final MBeanException e) { + Exception targetException = e.getTargetException(); + if (targetException instanceof ValidationException){ + throw (ValidationException) targetException; + } else { + throw new RuntimeException(e); + } + } catch (final JMException e) { throw new RuntimeException(e); - } catch (RuntimeMBeanException e) { - throw e.getTargetException(); } } @Override - public void setAttribute(ObjectName on, String attrName, Attribute attribute) { - if (ObjectNameUtil.getTransactionName(on) == null) + public void setAttribute(final ObjectName on, final String attrName, final Attribute attribute) { + if (ObjectNameUtil.getTransactionName(on) == null) { throw new IllegalArgumentException("Not in transaction instance " + on + ", no transaction name present"); + } try { configMBeanServer.setAttribute(on, attribute); - } catch (JMException e) { + } catch (final JMException e) { throw new IllegalStateException("Unable to set attribute " + attrName + " for " + on, e); } @@ -248,4 +301,14 @@ public class ConfigTransactionJMXClient implements ConfigTransactionClient { public Set getAvailableModuleFactoryQNames() { return configTransactionControllerMXBeanProxy.getAvailableModuleFactoryQNames(); } + + @Override + public Set lookupRuntimeBeans() { + return configTransactionControllerMXBeanProxy.lookupRuntimeBeans(); + } + + @Override + public Set lookupRuntimeBeans(final String moduleName, final String instanceName) { + return configTransactionControllerMXBeanProxy.lookupRuntimeBeans(moduleName, instanceName); + } }