http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java ---------------------------------------------------------------------- diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java index 7ae3da5..6df808e 100755 --- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java @@ -38,6 +38,7 @@ public abstract class UnaryExpression implements Expression { public static Expression createNegate(Expression left) { return new UnaryExpression(left) { + @Override public Object evaluate(Filterable message) throws FilterException { Object rvalue = right.evaluate(message); if (rvalue == null) { @@ -49,6 +50,7 @@ public abstract class UnaryExpression implements Expression { return null; } + @Override public String getExpressionSymbol() { return "-"; } @@ -73,6 +75,7 @@ public abstract class UnaryExpression implements Expression { final Collection<Object> inList = t; return new BooleanUnaryExpression(right) { + @Override public Object evaluate(Filterable message) throws FilterException { Object rvalue = right.evaluate(message); @@ -92,6 +95,7 @@ public abstract class UnaryExpression implements Expression { } + @Override public String toString() { StringBuffer answer = new StringBuffer(); answer.append(right); @@ -113,6 +117,7 @@ public abstract class UnaryExpression implements Expression { return answer.toString(); } + @Override public String getExpressionSymbol() { if (not) { return "NOT IN"; @@ -130,6 +135,7 @@ public abstract class UnaryExpression implements Expression { super(left); } + @Override public boolean matches(Filterable message) throws FilterException { Object object = evaluate(message); return object != null && object == Boolean.TRUE; @@ -138,6 +144,7 @@ public abstract class UnaryExpression implements Expression { public static BooleanExpression createNOT(BooleanExpression left) { return new BooleanUnaryExpression(left) { + @Override public Object evaluate(Filterable message) throws FilterException { Boolean lvalue = (Boolean) right.evaluate(message); if (lvalue == null) { @@ -146,6 +153,7 @@ public abstract class UnaryExpression implements Expression { return lvalue.booleanValue() ? Boolean.FALSE : Boolean.TRUE; } + @Override public String getExpressionSymbol() { return "NOT"; } @@ -162,6 +170,7 @@ public abstract class UnaryExpression implements Expression { public static BooleanExpression createBooleanCast(Expression left) { return new BooleanUnaryExpression(left) { + @Override public Object evaluate(Filterable message) throws FilterException { Object rvalue = right.evaluate(message); if (rvalue == null) { @@ -173,10 +182,12 @@ public abstract class UnaryExpression implements Expression { return ((Boolean) rvalue).booleanValue() ? Boolean.TRUE : Boolean.FALSE; } + @Override public String toString() { return right.toString(); } + @Override public String getExpressionSymbol() { return ""; } @@ -229,6 +240,7 @@ public abstract class UnaryExpression implements Expression { /** * @see java.lang.Object#toString() */ + @Override public String toString() { return "(" + getExpressionSymbol() + " " + right.toString() + ")"; } @@ -236,6 +248,7 @@ public abstract class UnaryExpression implements Expression { /** * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { int result = right.hashCode(); result = 31 * result + getExpressionSymbol().hashCode(); @@ -245,6 +258,7 @@ public abstract class UnaryExpression implements Expression { /** * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object o) { if (this == o) { return true;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java ---------------------------------------------------------------------- diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java index 978e9bf..1748167 100755 --- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java @@ -28,6 +28,7 @@ public final class XPathExpression implements BooleanExpression { new XalanXPathEvaluator("//root").evaluate("<root></root>"); try { XPATH_EVALUATOR_FACTORY = new XPathExpression.XPathEvaluatorFactory() { + @Override public XPathExpression.XPathEvaluator create(String xpath) { return new XalanXPathEvaluator(xpath); } @@ -58,10 +59,12 @@ public final class XPathExpression implements BooleanExpression { this.evaluator = XPATH_EVALUATOR_FACTORY.create(xpath); } + @Override public Object evaluate(Filterable message) throws FilterException { return evaluator.evaluate(message) ? Boolean.TRUE : Boolean.FALSE; } + @Override public String toString() { return "XPATH " + ConstantExpression.encodeString(xpath); } @@ -71,6 +74,7 @@ public final class XPathExpression implements BooleanExpression { * @return true if the expression evaluates to Boolean.TRUE. * @throws FilterException */ + @Override public boolean matches(Filterable message) throws FilterException { Object object = evaluate(message); return object != null && object == Boolean.TRUE; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java ---------------------------------------------------------------------- diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java index 404bf06..bfea39e 100755 --- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java @@ -28,10 +28,12 @@ public final class XQueryExpression implements BooleanExpression { this.xpath = xpath; } + @Override public Object evaluate(Filterable message) throws FilterException { return Boolean.FALSE; } + @Override public String toString() { return "XQUERY " + ConstantExpression.encodeString(xpath); } @@ -41,6 +43,7 @@ public final class XQueryExpression implements BooleanExpression { * @return true if the expression evaluates to Boolean.TRUE. * @throws FilterException */ + @Override public boolean matches(Filterable message) throws FilterException { Object object = evaluate(message); return object != null && object == Boolean.TRUE; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java ---------------------------------------------------------------------- diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java index 798c214..906074e 100644 --- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java @@ -35,6 +35,7 @@ public class XalanXPathEvaluator implements XPathExpression.XPathEvaluator { this.xpath = xpath; } + @Override public boolean evaluate(Filterable m) throws FilterException { String stringBody = m.getBodyAs(String.class); if (stringBody != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java ---------------------------------------------------------------------- diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java index bbd6ace..efe3fcd 100644 --- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java @@ -79,6 +79,7 @@ public class LRUCache<K, V> extends LinkedHashMap<K, V> { this.maxCacheSize = maxCacheSize; } + @Override protected boolean removeEldestEntry(Map.Entry<K, V> eldest) { if (size() > maxCacheSize) { onCacheEviction(eldest); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java ---------------------------------------------------------------------- diff --git a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java index abd1a85..6808bdd 100755 --- a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java +++ b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java @@ -91,6 +91,7 @@ public class SelectorTest { properties.put(key, value); } + @Override public <T> T getBodyAs(Class<T> type) throws FilterException { if (type == String.class) { return type.cast(text); @@ -98,6 +99,7 @@ public class SelectorTest { return null; } + @Override public Object getProperty(String name) { if ("JMSType".equals(name)) { return type; @@ -112,6 +114,7 @@ public class SelectorTest { return destination; } + @Override public Object getLocalConnectionId() { return localConnectionId; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java index ae38248..2f74afa 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java @@ -231,23 +231,28 @@ public class ConfigurationImpl implements Configuration, Serializable { // Public ------------------------------------------------------------------------- + @Override public boolean isClustered() { return !getClusterConfigurations().isEmpty(); } + @Override public boolean isPersistenceEnabled() { return persistenceEnabled; } + @Override public ConfigurationImpl setPersistenceEnabled(final boolean enable) { persistenceEnabled = enable; return this; } + @Override public long getFileDeployerScanPeriod() { return fileDeploymentScanPeriod; } + @Override public ConfigurationImpl setFileDeployerScanPeriod(final long period) { fileDeploymentScanPeriod = period; return this; @@ -256,92 +261,112 @@ public class ConfigurationImpl implements Configuration, Serializable { /** * @return the persistDeliveryCountBeforeDelivery */ + @Override public boolean isPersistDeliveryCountBeforeDelivery() { return persistDeliveryCountBeforeDelivery; } + @Override public ConfigurationImpl setPersistDeliveryCountBeforeDelivery(final boolean persistDeliveryCountBeforeDelivery) { this.persistDeliveryCountBeforeDelivery = persistDeliveryCountBeforeDelivery; return this; } + @Override public int getScheduledThreadPoolMaxSize() { return scheduledThreadPoolMaxSize; } + @Override public ConfigurationImpl setScheduledThreadPoolMaxSize(final int maxSize) { scheduledThreadPoolMaxSize = maxSize; return this; } + @Override public int getThreadPoolMaxSize() { return threadPoolMaxSize; } + @Override public ConfigurationImpl setThreadPoolMaxSize(final int maxSize) { threadPoolMaxSize = maxSize; return this; } + @Override public long getSecurityInvalidationInterval() { return securityInvalidationInterval; } + @Override public ConfigurationImpl setSecurityInvalidationInterval(final long interval) { securityInvalidationInterval = interval; return this; } + @Override public long getConnectionTTLOverride() { return connectionTTLOverride; } + @Override public ConfigurationImpl setConnectionTTLOverride(final long ttl) { connectionTTLOverride = ttl; return this; } + @Override public boolean isAsyncConnectionExecutionEnabled() { return asyncConnectionExecutionEnabled; } + @Override public ConfigurationImpl setEnabledAsyncConnectionExecution(final boolean enabled) { asyncConnectionExecutionEnabled = enabled; return this; } + @Override public List<String> getIncomingInterceptorClassNames() { return incomingInterceptorClassNames; } + @Override public ConfigurationImpl setIncomingInterceptorClassNames(final List<String> interceptors) { incomingInterceptorClassNames = interceptors; return this; } + @Override public List<String> getOutgoingInterceptorClassNames() { return outgoingInterceptorClassNames; } + @Override public ConfigurationImpl setOutgoingInterceptorClassNames(final List<String> interceptors) { outgoingInterceptorClassNames = interceptors; return this; } + @Override public Set<TransportConfiguration> getAcceptorConfigurations() { return acceptorConfigs; } + @Override public ConfigurationImpl setAcceptorConfigurations(final Set<TransportConfiguration> infos) { acceptorConfigs = infos; return this; } + @Override public ConfigurationImpl addAcceptorConfiguration(final TransportConfiguration infos) { acceptorConfigs.add(infos); return this; } + @Override public ConfigurationImpl addAcceptorConfiguration(final String name, final String uri) throws Exception { AcceptorTransportConfigurationParser parser = new AcceptorTransportConfigurationParser(); @@ -355,26 +380,31 @@ public class ConfigurationImpl implements Configuration, Serializable { return this; } + @Override public ConfigurationImpl clearAcceptorConfigurations() { acceptorConfigs.clear(); return this; } + @Override public Map<String, TransportConfiguration> getConnectorConfigurations() { return connectorConfigs; } + @Override public ConfigurationImpl setConnectorConfigurations(final Map<String, TransportConfiguration> infos) { connectorConfigs = infos; return this; } + @Override public ConfigurationImpl addConnectorConfiguration(final String key, final TransportConfiguration info) { connectorConfigs.put(key, info); return this; } + @Override public ConfigurationImpl addConnectorConfiguration(final String name, final String uri) throws Exception { ConnectorTransportConfigurationParser parser = new ConnectorTransportConfigurationParser(); @@ -389,24 +419,29 @@ public class ConfigurationImpl implements Configuration, Serializable { } + @Override public ConfigurationImpl clearConnectorConfigurations() { connectorConfigs.clear(); return this; } + @Override public GroupingHandlerConfiguration getGroupingHandlerConfiguration() { return groupingHandlerConfiguration; } + @Override public ConfigurationImpl setGroupingHandlerConfiguration(final GroupingHandlerConfiguration groupingHandlerConfiguration) { this.groupingHandlerConfiguration = groupingHandlerConfiguration; return this; } + @Override public List<BridgeConfiguration> getBridgeConfigurations() { return bridgeConfigurations; } + @Override public ConfigurationImpl setBridgeConfigurations(final List<BridgeConfiguration> configs) { bridgeConfigurations = configs; return this; @@ -417,108 +452,131 @@ public class ConfigurationImpl implements Configuration, Serializable { return this; } + @Override public List<BroadcastGroupConfiguration> getBroadcastGroupConfigurations() { return broadcastGroupConfigurations; } + @Override public ConfigurationImpl setBroadcastGroupConfigurations(final List<BroadcastGroupConfiguration> configs) { broadcastGroupConfigurations = configs; return this; } + @Override public ConfigurationImpl addBroadcastGroupConfiguration(final BroadcastGroupConfiguration config) { broadcastGroupConfigurations.add(config); return this; } + @Override public List<ClusterConnectionConfiguration> getClusterConfigurations() { return clusterConfigurations; } + @Override public ConfigurationImpl setClusterConfigurations(final List<ClusterConnectionConfiguration> configs) { clusterConfigurations = configs; return this; } + @Override public ConfigurationImpl addClusterConfiguration(final ClusterConnectionConfiguration config) { clusterConfigurations.add(config); return this; } + @Override public ConfigurationImpl clearClusterConfigurations() { clusterConfigurations.clear(); return this; } + @Override public List<DivertConfiguration> getDivertConfigurations() { return divertConfigurations; } + @Override public ConfigurationImpl setDivertConfigurations(final List<DivertConfiguration> configs) { divertConfigurations = configs; return this; } + @Override public ConfigurationImpl addDivertConfiguration(final DivertConfiguration config) { divertConfigurations.add(config); return this; } + @Override public List<CoreQueueConfiguration> getQueueConfigurations() { return queueConfigurations; } + @Override public ConfigurationImpl setQueueConfigurations(final List<CoreQueueConfiguration> configs) { queueConfigurations = configs; return this; } + @Override public ConfigurationImpl addQueueConfiguration(final CoreQueueConfiguration config) { queueConfigurations.add(config); return this; } + @Override public Map<String, DiscoveryGroupConfiguration> getDiscoveryGroupConfigurations() { return discoveryGroupConfigurations; } + @Override public ConfigurationImpl setDiscoveryGroupConfigurations(final Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations) { this.discoveryGroupConfigurations = discoveryGroupConfigurations; return this; } + @Override public ConfigurationImpl addDiscoveryGroupConfiguration(final String key, DiscoveryGroupConfiguration discoveryGroupConfiguration) { this.discoveryGroupConfigurations.put(key, discoveryGroupConfiguration); return this; } + @Override public int getIDCacheSize() { return idCacheSize; } + @Override public ConfigurationImpl setIDCacheSize(final int idCacheSize) { this.idCacheSize = idCacheSize; return this; } + @Override public boolean isPersistIDCache() { return persistIDCache; } + @Override public ConfigurationImpl setPersistIDCache(final boolean persist) { persistIDCache = persist; return this; } + @Override public File getBindingsLocation() { return subFolder(getBindingsDirectory()); } + @Override public String getBindingsDirectory() { return bindingsDirectory; } + @Override public ConfigurationImpl setBindingsDirectory(final String dir) { bindingsDirectory = dir; return this; @@ -535,279 +593,341 @@ public class ConfigurationImpl implements Configuration, Serializable { return this; } + @Override public File getJournalLocation() { return subFolder(getJournalDirectory()); } + @Override public String getJournalDirectory() { return journalDirectory; } + @Override public ConfigurationImpl setJournalDirectory(final String dir) { journalDirectory = dir; return this; } + @Override public JournalType getJournalType() { return journalType; } + @Override public ConfigurationImpl setPagingDirectory(final String dir) { pagingDirectory = dir; return this; } + @Override public File getPagingLocation() { return subFolder(getPagingDirectory()); } + @Override public String getPagingDirectory() { return pagingDirectory; } + @Override public ConfigurationImpl setJournalType(final JournalType type) { journalType = type; return this; } + @Override public boolean isJournalSyncTransactional() { return journalSyncTransactional; } + @Override public ConfigurationImpl setJournalSyncTransactional(final boolean sync) { journalSyncTransactional = sync; return this; } + @Override public boolean isJournalSyncNonTransactional() { return journalSyncNonTransactional; } + @Override public ConfigurationImpl setJournalSyncNonTransactional(final boolean sync) { journalSyncNonTransactional = sync; return this; } + @Override public int getJournalFileSize() { return journalFileSize; } + @Override public ConfigurationImpl setJournalFileSize(final int size) { journalFileSize = size; return this; } + @Override public int getJournalMinFiles() { return journalMinFiles; } + @Override public ConfigurationImpl setJournalMinFiles(final int files) { journalMinFiles = files; return this; } + @Override public boolean isLogJournalWriteRate() { return logJournalWriteRate; } + @Override public ConfigurationImpl setLogJournalWriteRate(final boolean logJournalWriteRate) { this.logJournalWriteRate = logJournalWriteRate; return this; } + @Override public int getJournalPerfBlastPages() { return journalPerfBlastPages; } + @Override public ConfigurationImpl setJournalPerfBlastPages(final int journalPerfBlastPages) { this.journalPerfBlastPages = journalPerfBlastPages; return this; } + @Override public boolean isRunSyncSpeedTest() { return runSyncSpeedTest; } + @Override public ConfigurationImpl setRunSyncSpeedTest(final boolean run) { runSyncSpeedTest = run; return this; } + @Override public boolean isCreateBindingsDir() { return createBindingsDir; } + @Override public ConfigurationImpl setCreateBindingsDir(final boolean create) { createBindingsDir = create; return this; } + @Override public boolean isCreateJournalDir() { return createJournalDir; } + @Override public ConfigurationImpl setCreateJournalDir(final boolean create) { createJournalDir = create; return this; } + @Override public boolean isWildcardRoutingEnabled() { return wildcardRoutingEnabled; } + @Override public ConfigurationImpl setWildcardRoutingEnabled(final boolean enabled) { wildcardRoutingEnabled = enabled; return this; } + @Override public long getTransactionTimeout() { return transactionTimeout; } + @Override public ConfigurationImpl setTransactionTimeout(final long timeout) { transactionTimeout = timeout; return this; } + @Override public long getTransactionTimeoutScanPeriod() { return transactionTimeoutScanPeriod; } + @Override public ConfigurationImpl setTransactionTimeoutScanPeriod(final long period) { transactionTimeoutScanPeriod = period; return this; } + @Override public long getMessageExpiryScanPeriod() { return messageExpiryScanPeriod; } + @Override public ConfigurationImpl setMessageExpiryScanPeriod(final long messageExpiryScanPeriod) { this.messageExpiryScanPeriod = messageExpiryScanPeriod; return this; } + @Override public int getMessageExpiryThreadPriority() { return messageExpiryThreadPriority; } + @Override public ConfigurationImpl setMessageExpiryThreadPriority(final int messageExpiryThreadPriority) { this.messageExpiryThreadPriority = messageExpiryThreadPriority; return this; } + @Override public boolean isSecurityEnabled() { return securityEnabled; } + @Override public ConfigurationImpl setSecurityEnabled(final boolean enabled) { securityEnabled = enabled; return this; } + @Override public boolean isGracefulShutdownEnabled() { return gracefulShutdownEnabled; } + @Override public ConfigurationImpl setGracefulShutdownEnabled(final boolean enabled) { gracefulShutdownEnabled = enabled; return this; } + @Override public long getGracefulShutdownTimeout() { return gracefulShutdownTimeout; } + @Override public ConfigurationImpl setGracefulShutdownTimeout(final long timeout) { gracefulShutdownTimeout = timeout; return this; } + @Override public boolean isJMXManagementEnabled() { return jmxManagementEnabled; } + @Override public ConfigurationImpl setJMXManagementEnabled(final boolean enabled) { jmxManagementEnabled = enabled; return this; } + @Override public String getJMXDomain() { return jmxDomain; } + @Override public ConfigurationImpl setJMXDomain(final String domain) { jmxDomain = domain; return this; } + @Override public String getLargeMessagesDirectory() { return largeMessagesDirectory; } + @Override public File getLargeMessagesLocation() { return subFolder(getLargeMessagesDirectory()); } + @Override public ConfigurationImpl setLargeMessagesDirectory(final String directory) { largeMessagesDirectory = directory; return this; } + @Override public boolean isMessageCounterEnabled() { return messageCounterEnabled; } + @Override public ConfigurationImpl setMessageCounterEnabled(final boolean enabled) { messageCounterEnabled = enabled; return this; } + @Override public long getMessageCounterSamplePeriod() { return messageCounterSamplePeriod; } + @Override public ConfigurationImpl setMessageCounterSamplePeriod(final long period) { messageCounterSamplePeriod = period; return this; } + @Override public int getMessageCounterMaxDayHistory() { return messageCounterMaxDayHistory; } + @Override public ConfigurationImpl setMessageCounterMaxDayHistory(final int maxDayHistory) { messageCounterMaxDayHistory = maxDayHistory; return this; } + @Override public SimpleString getManagementAddress() { return managementAddress; } + @Override public ConfigurationImpl setManagementAddress(final SimpleString address) { managementAddress = address; return this; } + @Override public SimpleString getManagementNotificationAddress() { return managementNotificationAddress; } + @Override public ConfigurationImpl setManagementNotificationAddress(final SimpleString address) { managementNotificationAddress = address; return this; } + @Override public String getClusterUser() { return clusterUser; } + @Override public ConfigurationImpl setClusterUser(final String user) { clusterUser = user; return this; } + @Override public String getClusterPassword() { return clusterPassword; } @@ -821,105 +941,128 @@ public class ConfigurationImpl implements Configuration, Serializable { return this; } + @Override public ConfigurationImpl setClusterPassword(final String theclusterPassword) { clusterPassword = theclusterPassword; return this; } + @Override public int getJournalCompactMinFiles() { return journalCompactMinFiles; } + @Override public int getJournalCompactPercentage() { return journalCompactPercentage; } + @Override public ConfigurationImpl setJournalCompactMinFiles(final int minFiles) { journalCompactMinFiles = minFiles; return this; } + @Override public ConfigurationImpl setJournalCompactPercentage(final int percentage) { journalCompactPercentage = percentage; return this; } + @Override public long getServerDumpInterval() { return serverDumpInterval; } + @Override public ConfigurationImpl setServerDumpInterval(final long intervalInMilliseconds) { serverDumpInterval = intervalInMilliseconds; return this; } + @Override public int getMemoryWarningThreshold() { return memoryWarningThreshold; } + @Override public ConfigurationImpl setMemoryWarningThreshold(final int memoryWarningThreshold) { this.memoryWarningThreshold = memoryWarningThreshold; return this; } + @Override public long getMemoryMeasureInterval() { return memoryMeasureInterval; } + @Override public ConfigurationImpl setMemoryMeasureInterval(final long memoryMeasureInterval) { this.memoryMeasureInterval = memoryMeasureInterval; return this; } + @Override public int getJournalMaxIO_AIO() { return journalMaxIO_AIO; } + @Override public ConfigurationImpl setJournalMaxIO_AIO(final int journalMaxIO) { journalMaxIO_AIO = journalMaxIO; return this; } + @Override public int getJournalBufferTimeout_AIO() { return journalBufferTimeout_AIO; } + @Override public ConfigurationImpl setJournalBufferTimeout_AIO(final int journalBufferTimeout) { journalBufferTimeout_AIO = journalBufferTimeout; return this; } + @Override public int getJournalBufferSize_AIO() { return journalBufferSize_AIO; } + @Override public ConfigurationImpl setJournalBufferSize_AIO(final int journalBufferSize) { journalBufferSize_AIO = journalBufferSize; return this; } + @Override public int getJournalMaxIO_NIO() { return journalMaxIO_NIO; } + @Override public ConfigurationImpl setJournalMaxIO_NIO(final int journalMaxIO) { journalMaxIO_NIO = journalMaxIO; return this; } + @Override public int getJournalBufferTimeout_NIO() { return journalBufferTimeout_NIO; } + @Override public ConfigurationImpl setJournalBufferTimeout_NIO(final int journalBufferTimeout) { journalBufferTimeout_NIO = journalBufferTimeout; return this; } + @Override public int getJournalBufferSize_NIO() { return journalBufferSize_NIO; } + @Override public ConfigurationImpl setJournalBufferSize_NIO(final int journalBufferSize) { journalBufferSize_NIO = journalBufferSize; return this; @@ -979,14 +1122,17 @@ public class ConfigurationImpl implements Configuration, Serializable { return this; } + @Override public List<ConnectorServiceConfiguration> getConnectorServiceConfigurations() { return this.connectorServiceConfigurations; } + @Override public List<SecuritySettingPlugin> getSecuritySettingPlugins() { return this.securitySettingPlugins; } + @Override public File getBrokerInstance() { if (artemisInstance != null) { return artemisInstance; @@ -1003,6 +1149,7 @@ public class ConfigurationImpl implements Configuration, Serializable { return artemisInstance; } + @Override public void setBrokerInstance(File directory) { this.artemisInstance = directory; } @@ -1036,40 +1183,48 @@ public class ConfigurationImpl implements Configuration, Serializable { return sb.toString(); } + @Override public ConfigurationImpl setConnectorServiceConfigurations(final List<ConnectorServiceConfiguration> configs) { this.connectorServiceConfigurations = configs; return this; } + @Override public ConfigurationImpl addConnectorServiceConfiguration(final ConnectorServiceConfiguration config) { this.connectorServiceConfigurations.add(config); return this; } + @Override public ConfigurationImpl setSecuritySettingPlugins(final List<SecuritySettingPlugin> plugins) { this.securitySettingPlugins = plugins; return this; } + @Override public ConfigurationImpl addSecuritySettingPlugin(final SecuritySettingPlugin plugin) { this.securitySettingPlugins.add(plugin); return this; } + @Override public boolean isMaskPassword() { return maskPassword; } + @Override public ConfigurationImpl setMaskPassword(boolean maskPassword) { this.maskPassword = maskPassword; return this; } + @Override public ConfigurationImpl setPasswordCodec(String codec) { passwordCodec = codec; return this; } + @Override public String getPasswordCodec() { return passwordCodec; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java index 72085c3..ae8c5f3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java @@ -33,12 +33,14 @@ public final class Validators { } public static final Validator NO_CHECK = new Validator() { + @Override public void validate(final String name, final Object value) { return; } }; public static final Validator NOT_NULL_OR_EMPTY = new Validator() { + @Override public void validate(final String name, final Object value) { String str = (String) value; if (str == null || str.length() == 0) { @@ -48,6 +50,7 @@ public final class Validators { }; public static final Validator GT_ZERO = new Validator() { + @Override public void validate(final String name, final Object value) { Number val = (Number) value; if (val.doubleValue() > 0) { @@ -60,6 +63,7 @@ public final class Validators { }; public static final Validator PERCENTAGE = new Validator() { + @Override public void validate(final String name, final Object value) { Number val = (Number) value; if (val == null || (val.intValue() < 0 || val.intValue() > 100)) { @@ -69,6 +73,7 @@ public final class Validators { }; public static final Validator GE_ZERO = new Validator() { + @Override public void validate(final String name, final Object value) { Number val = (Number) value; if (val.doubleValue() >= 0) { @@ -81,6 +86,7 @@ public final class Validators { }; public static final Validator MINUS_ONE_OR_GT_ZERO = new Validator() { + @Override public void validate(final String name, final Object value) { Number val = (Number) value; if (val.doubleValue() == -1 || val.doubleValue() > 0) { @@ -93,6 +99,7 @@ public final class Validators { }; public static final Validator MINUS_ONE_OR_GE_ZERO = new Validator() { + @Override public void validate(final String name, final Object value) { Number val = (Number) value; if (val.doubleValue() == -1 || val.doubleValue() >= 0) { @@ -105,6 +112,7 @@ public final class Validators { }; public static final Validator THREAD_PRIORITY_RANGE = new Validator() { + @Override public void validate(final String name, final Object value) { Number val = (Number) value; if (val.intValue() >= Thread.MIN_PRIORITY && val.intValue() <= Thread.MAX_PRIORITY) { @@ -117,6 +125,7 @@ public final class Validators { }; public static final Validator JOURNAL_TYPE = new Validator() { + @Override public void validate(final String name, final Object value) { String val = (String) value; if (val == null || !val.equals(JournalType.NIO.toString()) && !val.equals(JournalType.ASYNCIO.toString())) { @@ -126,6 +135,7 @@ public final class Validators { }; public static final Validator ADDRESS_FULL_MESSAGE_POLICY_TYPE = new Validator() { + @Override public void validate(final String name, final Object value) { String val = (String) value; if (val == null || !val.equals(AddressFullMessagePolicy.PAGE.toString()) && @@ -138,6 +148,7 @@ public final class Validators { }; public static final Validator SLOW_CONSUMER_POLICY_TYPE = new Validator() { + @Override public void validate(final String name, final Object value) { String val = (String) value; if (val == null || !val.equals(SlowConsumerPolicy.KILL.toString()) && !val.equals(SlowConsumerPolicy.NOTIFY.toString())) { @@ -147,6 +158,7 @@ public final class Validators { }; public static final Validator MESSAGE_LOAD_BALANCING_TYPE = new Validator() { + @Override public void validate(final String name, final Object value) { String val = (String) value; if (val == null || !val.equals(MessageLoadBalancingType.OFF.toString()) && http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java index 76c3916..3459bf5 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java @@ -675,6 +675,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil { } SecuritySettingPlugin securitySettingPlugin = AccessController.doPrivileged(new PrivilegedAction<SecuritySettingPlugin>() { + @Override public SecuritySettingPlugin run() { return (SecuritySettingPlugin) ClassloadingUtil.newInstanceFromClassLoader(clazz); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java index 63534f6..dd9f7dd 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java @@ -93,10 +93,12 @@ public class FilterImpl implements Filter { // Filter implementation --------------------------------------------------------------------- + @Override public SimpleString getFilterString() { return sfilterString; } + @Override public synchronized boolean match(final ServerMessage message) { try { boolean result = booleanExpression.matches(new FilterableServerMessage(message)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java index 9097cd7..0e9359d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java @@ -49,6 +49,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont // AcceptorControlMBean implementation --------------------------- + @Override public String getFactoryClassName() { clearIO(); try { @@ -59,6 +60,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont } } + @Override public String getName() { clearIO(); try { @@ -69,6 +71,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont } } + @Override public Map<String, Object> getParameters() { clearIO(); try { @@ -79,6 +82,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont } } + @Override public boolean isStarted() { clearIO(); try { @@ -89,6 +93,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont } } + @Override public void start() throws Exception { clearIO(); try { @@ -99,6 +104,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont } } + @Override public void stop() throws Exception { clearIO(); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java index 239c948..753aa24 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java @@ -135,6 +135,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active // ActiveMQServerControlMBean implementation -------------------- + @Override public boolean isStarted() { clearIO(); try { @@ -145,6 +146,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getVersion() { checkStarted(); @@ -157,6 +159,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isBackup() { checkStarted(); @@ -169,6 +172,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isSharedStore() { checkStarted(); @@ -181,6 +185,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getBindingsDirectory() { checkStarted(); @@ -205,6 +210,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] getIncomingInterceptorClassNames() { checkStarted(); @@ -217,6 +223,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] getOutgoingInterceptorClassNames() { checkStarted(); @@ -229,6 +236,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getJournalBufferSize() { checkStarted(); @@ -241,6 +249,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getJournalBufferTimeout() { checkStarted(); @@ -253,6 +262,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void setFailoverOnServerShutdown(boolean failoverOnServerShutdown) { checkStarted(); @@ -268,6 +278,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isFailoverOnServerShutdown() { checkStarted(); @@ -286,6 +297,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getJournalMaxIO() { checkStarted(); @@ -298,6 +310,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getJournalDirectory() { checkStarted(); @@ -310,6 +323,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getJournalFileSize() { checkStarted(); @@ -322,6 +336,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getJournalMinFiles() { checkStarted(); @@ -334,6 +349,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getJournalCompactMinFiles() { checkStarted(); @@ -346,6 +362,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getJournalCompactPercentage() { checkStarted(); @@ -358,6 +375,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isPersistenceEnabled() { checkStarted(); @@ -370,6 +388,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getJournalType() { checkStarted(); @@ -382,6 +401,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getPagingDirectory() { checkStarted(); @@ -394,6 +414,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getScheduledThreadPoolMaxSize() { checkStarted(); @@ -406,6 +427,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getThreadPoolMaxSize() { checkStarted(); @@ -418,6 +440,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public long getSecurityInvalidationInterval() { checkStarted(); @@ -430,6 +453,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isClustered() { checkStarted(); @@ -442,6 +466,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isCreateBindingsDir() { checkStarted(); @@ -454,6 +479,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isCreateJournalDir() { checkStarted(); @@ -466,6 +492,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isJournalSyncNonTransactional() { checkStarted(); @@ -478,6 +505,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isJournalSyncTransactional() { checkStarted(); @@ -490,6 +518,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isSecurityEnabled() { checkStarted(); @@ -502,6 +531,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isAsyncConnectionExecutionEnabled() { checkStarted(); @@ -514,6 +544,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void deployQueue(final String address, final String name, final String filterString) throws Exception { checkStarted(); @@ -526,6 +557,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void deployQueue(final String address, final String name, final String filterStr, @@ -543,6 +575,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void createQueue(final String address, final String name) throws Exception { checkStarted(); @@ -555,6 +588,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void createQueue(final String address, final String name, final boolean durable) throws Exception { checkStarted(); @@ -567,6 +601,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void createQueue(final String address, final String name, final String filterStr, @@ -587,6 +622,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] getQueueNames() { checkStarted(); @@ -606,6 +642,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] getAddressNames() { checkStarted(); @@ -625,6 +662,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void destroyQueue(final String name) throws Exception { checkStarted(); @@ -639,6 +677,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getConnectionCount() { checkStarted(); @@ -651,6 +690,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void enableMessageCounters() { checkStarted(); @@ -663,6 +703,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void disableMessageCounters() { checkStarted(); @@ -675,6 +716,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void resetAllMessageCounters() { checkStarted(); @@ -687,6 +729,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void resetAllMessageCounterHistories() { checkStarted(); @@ -699,6 +742,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public boolean isMessageCounterEnabled() { checkStarted(); @@ -711,6 +755,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public synchronized long getMessageCounterSamplePeriod() { checkStarted(); @@ -723,6 +768,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public synchronized void setMessageCounterSamplePeriod(final long newPeriod) { checkStarted(); @@ -743,6 +789,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public int getMessageCounterMaxDayCount() { checkStarted(); @@ -755,6 +802,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void setMessageCounterMaxDayCount(final int count) { checkStarted(); @@ -770,6 +818,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] listPreparedTransactions() { checkStarted(); @@ -780,6 +829,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active Map<Xid, Long> xids = resourceManager.getPreparedTransactionsWithCreationTime(); ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<Map.Entry<Xid, Long>>(xids.entrySet()); Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>() { + @Override public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2) { // sort by creation time, oldest first return (int) (entry1.getValue() - entry2.getValue()); @@ -799,6 +849,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String listPreparedTransactionDetailsAsJSON() throws Exception { checkStarted(); @@ -811,6 +862,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<Map.Entry<Xid, Long>>(xids.entrySet()); Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>() { + @Override public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2) { // sort by creation time, oldest first return (int) (entry1.getValue() - entry2.getValue()); @@ -831,6 +883,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String listPreparedTransactionDetailsAsHTML() throws Exception { checkStarted(); @@ -843,6 +896,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<Map.Entry<Xid, Long>>(xids.entrySet()); Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>() { + @Override public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2) { // sort by creation time, oldest first return (int) (entry1.getValue() - entry2.getValue()); @@ -907,6 +961,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] listHeuristicCommittedTransactions() { checkStarted(); @@ -925,6 +980,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] listHeuristicRolledBackTransactions() { checkStarted(); @@ -943,6 +999,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public synchronized boolean commitPreparedTransaction(final String transactionAsBase64) throws Exception { checkStarted(); @@ -967,6 +1024,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public synchronized boolean rollbackPreparedTransaction(final String transactionAsBase64) throws Exception { checkStarted(); @@ -992,6 +1050,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] listRemoteAddresses() { checkStarted(); @@ -1012,6 +1071,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } + @Override public String[] listRemoteAddresses(final String ipAddress) { checkStarted(); @@ -1033,6 +1093,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } + @Override public synchronized boolean closeConnectionsForAddress(final String ipAddress) { checkStarted(); @@ -1057,6 +1118,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } + @Override public synchronized boolean closeConsumerConnectionsForAddress(final String address) { boolean closed = false; checkStarted(); @@ -1096,6 +1158,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active return closed; } + @Override public synchronized boolean closeConnectionsForUser(final String userName) { boolean closed = false; checkStarted(); @@ -1126,6 +1189,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active return closed; } + @Override public String[] listConnectionIDs() { checkStarted(); @@ -1144,6 +1208,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] listSessions(final String connectionID) { checkStarted(); @@ -1165,6 +1230,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active /* (non-Javadoc) * @see org.apache.activemq.artemis.api.core.management.ActiveMQServerControl#listProducersInfoAsJSON() */ + @Override public String listProducersInfoAsJSON() throws Exception { JSONArray producers = new JSONArray(); @@ -1175,6 +1241,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active return producers.toString(); } + @Override public Object[] getConnectors() throws Exception { checkStarted(); @@ -1202,6 +1269,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getConnectorsAsJSON() throws Exception { checkStarted(); @@ -1220,6 +1288,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void addSecuritySettings(final String addressMatch, final String sendRoles, final String consumeRoles, @@ -1245,6 +1314,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void removeSecuritySettings(final String addressMatch) throws Exception { checkStarted(); @@ -1258,6 +1328,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public Object[] getRoles(final String addressMatch) throws Exception { checkStarted(); @@ -1280,6 +1351,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getRolesAsJSON(final String addressMatch) throws Exception { checkStarted(); @@ -1298,6 +1370,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String getAddressSettingsAsJSON(final String address) throws Exception { checkStarted(); @@ -1333,6 +1406,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active return jsonObject.toString(); } + @Override public void addAddressSettings(final String address, final String DLA, final String expiryAddress, @@ -1411,6 +1485,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active storageManager.storeAddressSetting(new PersistedAddressSetting(new SimpleString(address), addressSettings)); } + @Override public void removeAddressSettings(final String addressMatch) throws Exception { checkStarted(); @@ -1418,6 +1493,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active storageManager.deleteAddressSetting(new SimpleString(addressMatch)); } + @Override public void sendQueueInfoToQueue(final String queueName, final String address) throws Exception { checkStarted(); @@ -1437,6 +1513,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] getDivertNames() { checkStarted(); @@ -1456,6 +1533,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void createDivert(final String name, final String routingName, final String address, @@ -1475,6 +1553,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void destroyDivert(final String name) throws Exception { checkStarted(); @@ -1487,6 +1566,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public String[] getBridgeNames() { checkStarted(); @@ -1506,6 +1586,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void createBridge(final String name, final String queueName, final String forwardingAddress, @@ -1544,6 +1625,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void destroyBridge(final String name) throws Exception { checkStarted(); @@ -1556,6 +1638,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void forceFailover() throws Exception { checkStarted(); @@ -1604,6 +1687,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active // NotificationEmitter implementation ---------------------------- + @Override public void removeNotificationListener(final NotificationListener listener, final NotificationFilter filter, final Object handback) throws ListenerNotFoundException { @@ -1616,6 +1700,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void removeNotificationListener(final NotificationListener listener) throws ListenerNotFoundException { clearIO(); try { @@ -1626,6 +1711,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public void addNotificationListener(final NotificationListener listener, final NotificationFilter filter, final Object handback) throws IllegalArgumentException { @@ -1638,6 +1724,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } + @Override public MBeanNotificationInfo[] getNotificationInfo() { CoreNotificationType[] values = CoreNotificationType.values(); String[] names = new String[values.length]; @@ -1677,50 +1764,62 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active messageCounterManager.resetAllCounterHistories(); } + @Override public long getConnectionTTLOverride() { return configuration.getConnectionTTLOverride(); } + @Override public int getIDCacheSize() { return configuration.getIDCacheSize(); } + @Override public String getLargeMessagesDirectory() { return configuration.getLargeMessagesDirectory(); } + @Override public String getManagementAddress() { return configuration.getManagementAddress().toString(); } + @Override public String getManagementNotificationAddress() { return configuration.getManagementNotificationAddress().toString(); } + @Override public long getMessageExpiryScanPeriod() { return configuration.getMessageExpiryScanPeriod(); } + @Override public long getMessageExpiryThreadPriority() { return configuration.getMessageExpiryThreadPriority(); } + @Override public long getTransactionTimeout() { return configuration.getTransactionTimeout(); } + @Override public long getTransactionTimeoutScanPeriod() { return configuration.getTransactionTimeoutScanPeriod(); } + @Override public boolean isPersistDeliveryCountBeforeDelivery() { return configuration.isPersistDeliveryCountBeforeDelivery(); } + @Override public boolean isPersistIDCache() { return configuration.isPersistIDCache(); } + @Override public boolean isWildcardRoutingEnabled() { return configuration.isWildcardRoutingEnabled(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java index 382adc3..2eb02d6 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java @@ -70,10 +70,12 @@ public class AddressControlImpl extends AbstractControl implements AddressContro // AddressControlMBean implementation ---------------------------- + @Override public String getAddress() { return address.toString(); } + @Override public String[] getQueueNames() throws Exception { clearIO(); try { @@ -94,6 +96,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public String[] getBindingNames() throws Exception { clearIO(); try { @@ -113,6 +116,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public Object[] getRoles() throws Exception { clearIO(); try { @@ -131,6 +135,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public String getRolesAsJSON() throws Exception { clearIO(); try { @@ -147,6 +152,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public long getNumberOfBytesPerPage() throws Exception { clearIO(); try { @@ -157,6 +163,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public long getAddressSize() throws Exception { clearIO(); try { @@ -167,6 +174,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public long getNumberOfMessages() throws Exception { clearIO(); long totalMsgs = 0; @@ -188,6 +196,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public boolean isPaging() throws Exception { clearIO(); try { @@ -198,6 +207,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } + @Override public int getNumberOfPages() throws Exception { clearIO(); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java index 01c37ce..053c19b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java @@ -47,6 +47,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl // BridgeControlMBean implementation --------------------------- + @Override public String[] getStaticConnectors() throws Exception { clearIO(); try { @@ -57,6 +58,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public String getForwardingAddress() { clearIO(); try { @@ -67,6 +69,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public String getQueueName() { clearIO(); try { @@ -77,6 +80,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public String getDiscoveryGroupName() { clearIO(); try { @@ -87,6 +91,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public String getFilterString() { clearIO(); try { @@ -97,6 +102,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public int getReconnectAttempts() { clearIO(); try { @@ -107,6 +113,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public String getName() { clearIO(); try { @@ -117,6 +124,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public long getRetryInterval() { clearIO(); try { @@ -127,6 +135,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public double getRetryIntervalMultiplier() { clearIO(); try { @@ -137,6 +146,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public String getTransformerClassName() { clearIO(); try { @@ -147,6 +157,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public boolean isStarted() { clearIO(); try { @@ -157,6 +168,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public boolean isUseDuplicateDetection() { clearIO(); try { @@ -167,6 +179,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public boolean isHA() { clearIO(); try { @@ -177,6 +190,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public void start() throws Exception { clearIO(); try { @@ -187,6 +201,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl } } + @Override public void stop() throws Exception { clearIO(); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java index 5e42771..64cf0c7 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java @@ -49,6 +49,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc // BroadcastGroupControlMBean implementation --------------------- + @Override public String getName() { clearIO(); try { @@ -59,6 +60,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } } + @Override public long getBroadcastPeriod() { clearIO(); try { @@ -69,6 +71,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } } + @Override public Object[] getConnectorPairs() { clearIO(); try { @@ -86,6 +89,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } } + @Override public String getConnectorPairsAsJSON() throws Exception { clearIO(); try { @@ -102,6 +106,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } //todo ghoward we should deal with this properly + @Override public String getGroupAddress() throws Exception { clearIO(); try { @@ -115,6 +120,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } } + @Override public int getGroupPort() throws Exception { clearIO(); try { @@ -128,6 +134,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } } + @Override public int getLocalBindPort() throws Exception { clearIO(); try { @@ -143,6 +150,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc // MessagingComponentControlMBean implementation ----------------- + @Override public boolean isStarted() { clearIO(); try { @@ -153,6 +161,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } } + @Override public void start() throws Exception { clearIO(); try { @@ -163,6 +172,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } } + @Override public void stop() throws Exception { clearIO(); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java index a89f0df..9d726f9 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java @@ -50,6 +50,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu // ClusterConnectionControlMBean implementation --------------------------- + @Override public String getAddress() { clearIO(); try { @@ -61,6 +62,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } + @Override public String getDiscoveryGroupName() { clearIO(); try { @@ -72,6 +74,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } + @Override public int getMaxHops() { clearIO(); try { @@ -83,6 +86,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } + @Override public String getName() { clearIO(); try { @@ -94,6 +98,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } + @Override public long getRetryInterval() { clearIO(); try { @@ -105,6 +110,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } + @Override public String getNodeID() { clearIO(); try { @@ -115,6 +121,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public String[] getStaticConnectors() { clearIO(); try { @@ -130,6 +137,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public String getStaticConnectorsAsJSON() throws Exception { clearIO(); try { @@ -151,6 +159,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public boolean isDuplicateDetection() { clearIO(); try { @@ -161,6 +170,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public String getMessageLoadBalancingType() { clearIO(); try { @@ -171,6 +181,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public String getTopology() { clearIO(); try { @@ -181,6 +192,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public Map<String, String> getNodes() throws Exception { clearIO(); try { @@ -191,6 +203,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public boolean isStarted() { clearIO(); try { @@ -201,6 +214,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public void start() throws Exception { clearIO(); try { @@ -212,6 +226,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu } } + @Override public void stop() throws Exception { clearIO(); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java index d776783..9f55481 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java @@ -47,6 +47,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl this.configuration = configuration; } + @Override public String getAddress() { clearIO(); try { @@ -57,6 +58,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl } } + @Override public String getFilter() { clearIO(); try { @@ -67,6 +69,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl } } + @Override public String getForwardingAddress() { clearIO(); try { @@ -77,6 +80,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl } } + @Override public String getRoutingName() { clearIO(); try { @@ -87,6 +91,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl } } + @Override public String getTransformerClassName() { clearIO(); try { @@ -97,6 +102,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl } } + @Override public String getUniqueName() { clearIO(); try { @@ -107,6 +113,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl } } + @Override public boolean isExclusive() { clearIO(); try {
