http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/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 58b21c3..48f4374 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 @@ -141,8 +141,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.isStarted(); - } - finally { + } finally { blockOnIO(); } } @@ -154,8 +153,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getVersion().getFullVersion(); - } - finally { + } finally { blockOnIO(); } } @@ -167,8 +165,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getHAPolicy().isBackup(); - } - finally { + } finally { blockOnIO(); } } @@ -180,8 +177,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getHAPolicy().isSharedStore(); - } - finally { + } finally { blockOnIO(); } } @@ -193,8 +189,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getBindingsDirectory(); - } - finally { + } finally { blockOnIO(); } } @@ -205,8 +200,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getIncomingInterceptorClassNames().toArray(new String[configuration.getIncomingInterceptorClassNames().size()]); - } - finally { + } finally { blockOnIO(); } } @@ -218,8 +212,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getIncomingInterceptorClassNames().toArray(new String[configuration.getIncomingInterceptorClassNames().size()]); - } - finally { + } finally { blockOnIO(); } } @@ -231,8 +224,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getOutgoingInterceptorClassNames().toArray(new String[configuration.getOutgoingInterceptorClassNames().size()]); - } - finally { + } finally { blockOnIO(); } } @@ -244,8 +236,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalType() == JournalType.ASYNCIO ? configuration.getJournalBufferSize_AIO() : configuration.getJournalBufferSize_NIO(); - } - finally { + } finally { blockOnIO(); } } @@ -257,8 +248,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalType() == JournalType.ASYNCIO ? configuration.getJournalBufferTimeout_AIO() : configuration.getJournalBufferTimeout_NIO(); - } - finally { + } finally { blockOnIO(); } } @@ -273,8 +263,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active if (haPolicy instanceof SharedStoreSlavePolicy) { ((SharedStoreSlavePolicy) haPolicy).setFailoverOnServerShutdown(failoverOnServerShutdown); } - } - finally { + } finally { blockOnIO(); } } @@ -288,12 +277,10 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active HAPolicy haPolicy = server.getHAPolicy(); if (haPolicy instanceof SharedStoreSlavePolicy) { return ((SharedStoreSlavePolicy) haPolicy).isFailoverOnServerShutdown(); - } - else { + } else { return false; } - } - finally { + } finally { blockOnIO(); } } @@ -305,8 +292,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalType() == JournalType.ASYNCIO ? configuration.getJournalMaxIO_AIO() : configuration.getJournalMaxIO_NIO(); - } - finally { + } finally { blockOnIO(); } } @@ -318,8 +304,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalDirectory(); - } - finally { + } finally { blockOnIO(); } } @@ -331,8 +316,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalFileSize(); - } - finally { + } finally { blockOnIO(); } } @@ -344,8 +328,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalMinFiles(); - } - finally { + } finally { blockOnIO(); } } @@ -357,8 +340,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalCompactMinFiles(); - } - finally { + } finally { blockOnIO(); } } @@ -370,8 +352,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalCompactPercentage(); - } - finally { + } finally { blockOnIO(); } } @@ -383,8 +364,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isPersistenceEnabled(); - } - finally { + } finally { blockOnIO(); } } @@ -396,8 +376,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getJournalType().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -409,8 +388,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getPagingDirectory(); - } - finally { + } finally { blockOnIO(); } } @@ -422,8 +400,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getScheduledThreadPoolMaxSize(); - } - finally { + } finally { blockOnIO(); } } @@ -435,8 +412,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getThreadPoolMaxSize(); - } - finally { + } finally { blockOnIO(); } } @@ -448,8 +424,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getSecurityInvalidationInterval(); - } - finally { + } finally { blockOnIO(); } } @@ -461,8 +436,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isClustered(); - } - finally { + } finally { blockOnIO(); } } @@ -474,8 +448,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isCreateBindingsDir(); - } - finally { + } finally { blockOnIO(); } } @@ -487,8 +460,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isCreateJournalDir(); - } - finally { + } finally { blockOnIO(); } } @@ -500,8 +472,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isJournalSyncNonTransactional(); - } - finally { + } finally { blockOnIO(); } } @@ -513,8 +484,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isJournalSyncTransactional(); - } - finally { + } finally { blockOnIO(); } } @@ -526,8 +496,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isSecurityEnabled(); - } - finally { + } finally { blockOnIO(); } } @@ -539,8 +508,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isAsyncConnectionExecutionEnabled(); - } - finally { + } finally { blockOnIO(); } } @@ -552,8 +520,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getDiskScanPeriod(); - } - finally { + } finally { blockOnIO(); } } @@ -565,8 +532,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getMaxDiskUsage(); - } - finally { + } finally { blockOnIO(); } } @@ -578,8 +544,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.getGlobalMaxSize(); - } - finally { + } finally { blockOnIO(); } } @@ -591,8 +556,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { server.deployQueue(SimpleString.toSimpleString(address), new SimpleString(name), new SimpleString(filterString), true, false); - } - finally { + } finally { blockOnIO(); } } @@ -609,8 +573,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active try { server.deployQueue(SimpleString.toSimpleString(address), new SimpleString(name), filter, durable, false); - } - finally { + } finally { blockOnIO(); } } @@ -622,8 +585,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { server.createQueue(SimpleString.toSimpleString(address), new SimpleString(name), null, true, false); - } - finally { + } finally { blockOnIO(); } } @@ -635,8 +597,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { server.createQueue(SimpleString.toSimpleString(address), new SimpleString(name), null, durable, false); - } - finally { + } finally { blockOnIO(); } } @@ -656,8 +617,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } server.createQueue(SimpleString.toSimpleString(address), new SimpleString(name), filter, durable, false); - } - finally { + } finally { blockOnIO(); } } @@ -676,8 +636,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return names; - } - finally { + } finally { blockOnIO(); } } @@ -689,8 +648,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getUptime(); - } - finally { + } finally { blockOnIO(); } } @@ -702,8 +660,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getUptimeMillis(); - } - finally { + } finally { blockOnIO(); } } @@ -715,8 +672,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.isReplicaSync(); - } - finally { + } finally { blockOnIO(); } } @@ -735,8 +691,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return names; - } - finally { + } finally { blockOnIO(); } } @@ -750,8 +705,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active SimpleString queueName = new SimpleString(name); server.destroyQueue(queueName, null, true); - } - finally { + } finally { blockOnIO(); } } @@ -763,8 +717,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getConnectionCount(); - } - finally { + } finally { blockOnIO(); } } @@ -776,8 +729,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getTotalConnectionCount(); - } - finally { + } finally { blockOnIO(); } } @@ -789,8 +741,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getTotalMessageCount(); - } - finally { + } finally { blockOnIO(); } } @@ -802,8 +753,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getTotalMessagesAdded(); - } - finally { + } finally { blockOnIO(); } } @@ -815,8 +765,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getTotalMessagesAcknowledged(); - } - finally { + } finally { blockOnIO(); } } @@ -828,8 +777,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return server.getTotalConsumerCount(); - } - finally { + } finally { blockOnIO(); } } @@ -841,8 +789,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { setMessageCounterEnabled(true); - } - finally { + } finally { blockOnIO(); } } @@ -854,8 +801,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { setMessageCounterEnabled(false); - } - finally { + } finally { blockOnIO(); } } @@ -867,8 +813,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { messageCounterManager.resetAllCounters(); - } - finally { + } finally { blockOnIO(); } } @@ -880,8 +825,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { messageCounterManager.resetAllCounterHistories(); - } - finally { + } finally { blockOnIO(); } } @@ -893,8 +837,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return configuration.isMessageCounterEnabled(); - } - finally { + } finally { blockOnIO(); } } @@ -906,8 +849,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return messageCounterManager.getSamplePeriod(); - } - finally { + } finally { blockOnIO(); } } @@ -927,8 +869,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active if (messageCounterManager != null && newPeriod != messageCounterManager.getSamplePeriod()) { messageCounterManager.reschedule(newPeriod); } - } - finally { + } finally { blockOnIO(); } } @@ -940,8 +881,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { return messageCounterManager.getMaxDayCount(); - } - finally { + } finally { blockOnIO(); } } @@ -956,8 +896,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active throw ActiveMQMessageBundle.BUNDLE.greaterThanZero(count); } messageCounterManager.setMaxDayCount(count); - } - finally { + } finally { blockOnIO(); } } @@ -987,8 +926,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active s[i++] = dateFormat.format(creation) + " base64: " + XidImpl.toBase64String(xid) + " " + xid.toString(); } return s; - } - finally { + } finally { blockOnIO(); } } @@ -1028,8 +966,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active txDetailListJson.add(detail.toJSON()); } return txDetailListJson.build().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -1111,8 +1048,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return html.toString(); - } - finally { + } finally { blockOnIO(); } } @@ -1130,8 +1066,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active s[i++] = XidImpl.toBase64String(xid); } return s; - } - finally { + } finally { blockOnIO(); } } @@ -1149,8 +1084,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active s[i++] = XidImpl.toBase64String(xid); } return s; - } - finally { + } finally { blockOnIO(); } } @@ -1174,8 +1108,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } return false; - } - finally { + } finally { blockOnIO(); } } @@ -1200,8 +1133,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } return false; - } - finally { + } finally { blockOnIO(); } } @@ -1220,8 +1152,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active remoteAddresses[i++] = connection.getRemoteAddress(); } return remoteAddresses; - } - finally { + } finally { blockOnIO(); } @@ -1242,8 +1173,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } return remoteConnections.toArray(new String[remoteConnections.size()]); - } - finally { + } finally { blockOnIO(); } @@ -1267,8 +1197,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return closed; - } - finally { + } finally { blockOnIO(); } @@ -1304,11 +1233,9 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } } - } - catch (Exception e) { + } catch (Exception e) { ActiveMQServerLogger.LOGGER.failedToCloseConsumerConnectionsForAddress(address, e); - } - finally { + } finally { blockOnIO(); } return closed; @@ -1338,8 +1265,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } } - } - finally { + } finally { blockOnIO(); } return closed; @@ -1358,8 +1284,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active connectionIDs[i++] = connection.getID().toString(); } return connectionIDs; - } - finally { + } finally { blockOnIO(); } } @@ -1377,8 +1302,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active sessionIDs[i++] = serverSession.getName(); } return sessionIDs; - } - finally { + } finally { blockOnIO(); } } @@ -1409,17 +1333,11 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active Set<RemotingConnection> connections = server.getRemotingService().getConnections(); for (RemotingConnection connection : connections) { - JsonObjectBuilder obj = JsonLoader.createObjectBuilder() - .add("connectionID", connection.getID().toString()) - .add("clientAddress", connection.getRemoteAddress()) - .add("creationTime", connection.getCreationTime()) - .add("implementation", connection.getClass().getSimpleName()) - .add("sessionCount", server.getSessions(connection.getID().toString()).size()); + JsonObjectBuilder obj = JsonLoader.createObjectBuilder().add("connectionID", connection.getID().toString()).add("clientAddress", connection.getRemoteAddress()).add("creationTime", connection.getCreationTime()).add("implementation", connection.getClass().getSimpleName()).add("sessionCount", server.getSessions(connection.getID().toString()).size()); array.add(obj); } return array.build().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -1434,10 +1352,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active try { List<ServerSession> sessions = server.getSessions(connectionID); for (ServerSession sess : sessions) { - JsonObjectBuilder obj = JsonLoader.createObjectBuilder() - .add("sessionID", sess.getName()) - .add("creationTime", sess.getCreationTime()) - .add("consumerCount", sess.getServerConsumers().size()); + JsonObjectBuilder obj = JsonLoader.createObjectBuilder().add("sessionID", sess.getName()).add("creationTime", sess.getCreationTime()).add("consumerCount", sess.getServerConsumers().size()); if (sess.getValidatedUser() != null) { obj.add("principal", sess.getValidatedUser()); @@ -1445,8 +1360,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active array.add(obj); } - } - finally { + } finally { blockOnIO(); } return array.build().toString(); @@ -1477,8 +1391,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } return array.build().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -1503,21 +1416,13 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } } return array.build().toString(); - } - finally { + } finally { blockOnIO(); } } private JsonObject toJSONObject(ServerConsumer consumer) throws Exception { - JsonObjectBuilder obj = JsonLoader.createObjectBuilder() - .add("consumerID", consumer.getID()) - .add("connectionID", consumer.getConnectionID().toString()) - .add("sessionID", consumer.getSessionID()) - .add("queueName", consumer.getQueue().getName().toString()) - .add("browseOnly", consumer.isBrowseOnly()) - .add("creationTime", consumer.getCreationTime()) - .add("deliveringCount", consumer.getDeliveringMessages().size()); + JsonObjectBuilder obj = JsonLoader.createObjectBuilder().add("consumerID", consumer.getID()).add("connectionID", consumer.getConnectionID().toString()).add("sessionID", consumer.getSessionID()).add("queueName", consumer.getQueue().getName().toString()).add("browseOnly", consumer.isBrowseOnly()).add("creationTime", consumer.getCreationTime()).add("deliveringCount", consumer.getDeliveringMessages().size()); if (consumer.getFilter() != null) { obj.add("filter", consumer.getFilter().getFilterString().toString()); } @@ -1547,8 +1452,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return ret; - } - finally { + } finally { blockOnIO(); } } @@ -1566,8 +1470,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return array.build().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -1605,8 +1508,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active PersistedRoles persistedRoles = new PersistedRoles(addressMatch, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createNonDurableQueueRoles, deleteNonDurableQueueRoles, manageRoles, browseRoles); storageManager.storeSecurityRoles(persistedRoles); - } - finally { + } finally { blockOnIO(); } } @@ -1619,8 +1521,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active try { server.getSecurityRepository().removeMatch(addressMatch); storageManager.deleteSecurityRoles(new SimpleString(addressMatch)); - } - finally { + } finally { blockOnIO(); } } @@ -1642,8 +1543,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active objRoles[i++] = new Object[]{role.getName(), CheckType.SEND.hasRole(role), CheckType.CONSUME.hasRole(role), CheckType.CREATE_DURABLE_QUEUE.hasRole(role), CheckType.DELETE_DURABLE_QUEUE.hasRole(role), CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), CheckType.MANAGE.hasRole(role)}; } return objRoles; - } - finally { + } finally { blockOnIO(); } } @@ -1661,8 +1561,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active json.add(role.toJson()); } return json.build().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -1681,27 +1580,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active if (addressSettings.getExpiryAddress() != null) { settings.add("expiryAddress", addressSettings.getExpiryAddress().toString()); } - return settings - .add("expiryDelay", addressSettings.getExpiryDelay()) - .add("maxDeliveryAttempts", addressSettings.getMaxDeliveryAttempts()) - .add("pageCacheMaxSize", addressSettings.getPageCacheMaxSize()) - .add("maxSizeBytes", addressSettings.getMaxSizeBytes()) - .add("pageSizeBytes", addressSettings.getPageSizeBytes()) - .add("redeliveryDelay", addressSettings.getRedeliveryDelay()) - .add("redeliveryMultiplier", addressSettings.getRedeliveryMultiplier()) - .add("maxRedeliveryDelay", addressSettings.getMaxRedeliveryDelay()) - .add("redistributionDelay", addressSettings.getRedistributionDelay()) - .add("lastValueQueue", addressSettings.isLastValueQueue()) - .add("sendToDLAOnNoRoute", addressSettings.isSendToDLAOnNoRoute()) - .add("addressFullMessagePolicy", policy) - .add("slowConsumerThreshold", addressSettings.getSlowConsumerThreshold()) - .add("slowConsumerCheckPeriod", addressSettings.getSlowConsumerCheckPeriod()) - .add("slowConsumerPolicy", consumerPolicy) - .add("autoCreateJmsQueues", addressSettings.isAutoCreateJmsQueues()) - .add("autoDeleteJmsQueues", addressSettings.isAutoDeleteJmsQueues()) - .add("autoCreateJmsTopics", addressSettings.isAutoCreateJmsTopics()) - .add("autoDeleteJmsTopics", addressSettings.isAutoDeleteJmsTopics()) - .build().toString(); + return settings.add("expiryDelay", addressSettings.getExpiryDelay()).add("maxDeliveryAttempts", addressSettings.getMaxDeliveryAttempts()).add("pageCacheMaxSize", addressSettings.getPageCacheMaxSize()).add("maxSizeBytes", addressSettings.getMaxSizeBytes()).add("pageSizeBytes", addressSettings.getPageSizeBytes()).add("redeliveryDelay", addressSettings.getRedeliveryDelay()).add("redeliveryMultiplier", addressSettings.getRedeliveryMultiplier()).add("maxRedeliveryDelay", addressSettings.getMaxRedeliveryDelay()).add("redistributionDelay", addressSettings.getRedistributionDelay()).add("lastValueQueue", addressSettings.isLastValueQueue()).add("sendToDLAOnNoRoute", addressSettings.isSendToDLAOnNoRoute()).add("addressFullMessagePolicy", policy).add("slowConsumerThreshold", addressSettings.getSlowConsumerThreshold()).add("slowConsumerCheckPeriod", addressSettings.getSlowConsumerCheckPeriod()).add("slowConsumerPolicy", consumerPolicy).add("autoCreateJmsQueues", addressSettings.isAutoCreat eJmsQueues()).add("autoDeleteJmsQueues", addressSettings.isAutoDeleteJmsQueues()).add("autoCreateJmsTopics", addressSettings.isAutoCreateJmsTopics()).add("autoDeleteJmsTopics", addressSettings.isAutoDeleteJmsTopics()).build().toString(); } @Override @@ -1754,28 +1633,22 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active addressSettings.setSendToDLAOnNoRoute(sendToDLAOnNoRoute); if (addressFullMessagePolicy == null) { addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); - } - else if (addressFullMessagePolicy.equalsIgnoreCase("PAGE")) { + } else if (addressFullMessagePolicy.equalsIgnoreCase("PAGE")) { addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); - } - else if (addressFullMessagePolicy.equalsIgnoreCase("DROP")) { + } else if (addressFullMessagePolicy.equalsIgnoreCase("DROP")) { addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.DROP); - } - else if (addressFullMessagePolicy.equalsIgnoreCase("BLOCK")) { + } else if (addressFullMessagePolicy.equalsIgnoreCase("BLOCK")) { addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK); - } - else if (addressFullMessagePolicy.equalsIgnoreCase("FAIL")) { + } else if (addressFullMessagePolicy.equalsIgnoreCase("FAIL")) { addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL); } addressSettings.setSlowConsumerThreshold(slowConsumerThreshold); addressSettings.setSlowConsumerCheckPeriod(slowConsumerCheckPeriod); if (slowConsumerPolicy == null) { addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.NOTIFY); - } - else if (slowConsumerPolicy.equalsIgnoreCase("NOTIFY")) { + } else if (slowConsumerPolicy.equalsIgnoreCase("NOTIFY")) { addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.NOTIFY); - } - else if (slowConsumerPolicy.equalsIgnoreCase("KILL")) { + } else if (slowConsumerPolicy.equalsIgnoreCase("KILL")) { addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.KILL); } addressSettings.setAutoCreateJmsQueues(autoCreateJmsQueues); @@ -1809,8 +1682,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active // on that case we ask the groupinghandler to replay its send in case it's waiting for the information handler.resendPending(); } - } - finally { + } finally { blockOnIO(); } } @@ -1829,8 +1701,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return names; - } - finally { + } finally { blockOnIO(); } } @@ -1849,8 +1720,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active try { DivertConfiguration config = new DivertConfiguration().setName(name).setRoutingName(routingName).setAddress(address).setForwardingAddress(forwardingAddress).setExclusive(exclusive).setFilterString(filterString).setTransformerClassName(transformerClassName); server.deployDivert(config); - } - finally { + } finally { blockOnIO(); } } @@ -1862,8 +1732,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { server.destroyDivert(SimpleString.toSimpleString(name)); - } - finally { + } finally { blockOnIO(); } } @@ -1882,8 +1751,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } return names; - } - finally { + } finally { blockOnIO(); } } @@ -1912,39 +1780,20 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { - BridgeConfiguration config = new BridgeConfiguration() - .setName(name) - .setQueueName(queueName) - .setForwardingAddress(forwardingAddress) - .setFilterString(filterString) - .setTransformerClassName(transformerClassName) - .setClientFailureCheckPeriod(clientFailureCheckPeriod) - .setRetryInterval(retryInterval) - .setRetryIntervalMultiplier(retryIntervalMultiplier) - .setInitialConnectAttempts(initialConnectAttempts) - .setReconnectAttempts(reconnectAttempts) - .setUseDuplicateDetection(useDuplicateDetection) - .setConfirmationWindowSize(confirmationWindowSize) - .setProducerWindowSize(producerWindowSize) - .setHA(ha) - .setUser(user) - .setPassword(password); + BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerClassName(transformerClassName).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateDetection).setConfirmationWindowSize(confirmationWindowSize).setProducerWindowSize(producerWindowSize).setHA(ha).setUser(user).setPassword(password); if (useDiscoveryGroup) { config.setDiscoveryGroupName(staticConnectorsOrDiscoveryGroup); - } - else { + } else { config.setStaticConnectors(toList(staticConnectorsOrDiscoveryGroup)); } server.deployBridge(config); - } - finally { + } finally { blockOnIO(); } } - @Override public void createBridge(final String name, final String queueName, @@ -1968,33 +1817,16 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { - BridgeConfiguration config = new BridgeConfiguration() - .setName(name) - .setQueueName(queueName) - .setForwardingAddress(forwardingAddress) - .setFilterString(filterString) - .setTransformerClassName(transformerClassName) - .setClientFailureCheckPeriod(clientFailureCheckPeriod) - .setRetryInterval(retryInterval) - .setRetryIntervalMultiplier(retryIntervalMultiplier) - .setInitialConnectAttempts(initialConnectAttempts) - .setReconnectAttempts(reconnectAttempts) - .setUseDuplicateDetection(useDuplicateDetection) - .setConfirmationWindowSize(confirmationWindowSize) - .setHA(ha) - .setUser(user) - .setPassword(password); + BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerClassName(transformerClassName).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateDetection).setConfirmationWindowSize(confirmationWindowSize).setHA(ha).setUser(user).setPassword(password); if (useDiscoveryGroup) { config.setDiscoveryGroupName(staticConnectorsOrDiscoveryGroup); - } - else { + } else { config.setStaticConnectors(toList(staticConnectorsOrDiscoveryGroup)); } server.deployBridge(config); - } - finally { + } finally { blockOnIO(); } } @@ -2006,8 +1838,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { server.destroyBridge(name); - } - finally { + } finally { blockOnIO(); } } @@ -2029,8 +1860,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active for (Object id : ids) { duplicateIDCache.addToCache(((String) id).getBytes(), null); } - } - finally { + } finally { blockOnIO(); } } @@ -2068,8 +1898,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { broadcaster.removeNotificationListener(listener, filter, handback); - } - finally { + } finally { blockOnIO(); } } @@ -2079,8 +1908,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { broadcaster.removeNotificationListener(listener); - } - finally { + } finally { blockOnIO(); } } @@ -2092,8 +1920,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active clearIO(); try { broadcaster.addNotificationListener(listener, filter, handback); - } - finally { + } finally { blockOnIO(); } } @@ -2118,8 +1945,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active if (isStarted()) { if (configuration.isMessageCounterEnabled() && !enable) { stopMessageCounters(); - } - else if (!configuration.isMessageCounterEnabled() && enable) { + } else if (!configuration.isMessageCounterEnabled() && enable) { startMessageCounters(); } }
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/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 af8abc3..bc07973 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 @@ -88,11 +88,9 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } return queueNames.toArray(new String[queueNames.size()]); - } - catch (Throwable t) { + } catch (Throwable t) { throw new IllegalStateException(t.getMessage()); - } - finally { + } finally { blockOnIO(); } } @@ -108,11 +106,9 @@ public class AddressControlImpl extends AbstractControl implements AddressContro bindingNames[i++] = binding.getUniqueName().toString(); } return bindingNames; - } - catch (Throwable t) { + } catch (Throwable t) { throw new IllegalStateException(t.getMessage()); - } - finally { + } finally { blockOnIO(); } } @@ -130,8 +126,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro objRoles[i++] = new Object[]{role.getName(), CheckType.SEND.hasRole(role), CheckType.CONSUME.hasRole(role), CheckType.CREATE_DURABLE_QUEUE.hasRole(role), CheckType.DELETE_DURABLE_QUEUE.hasRole(role), CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), CheckType.MANAGE.hasRole(role)}; } return objRoles; - } - finally { + } finally { blockOnIO(); } } @@ -147,8 +142,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro json.add(role.toJson()); } return json.build().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -158,8 +152,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro clearIO(); try { return pagingManager.getPageStore(address).getPageSizeBytes(); - } - finally { + } finally { blockOnIO(); } } @@ -169,8 +162,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro clearIO(); try { return pagingManager.getPageStore(address).getAddressSize(); - } - finally { + } finally { blockOnIO(); } } @@ -187,11 +179,9 @@ public class AddressControlImpl extends AbstractControl implements AddressContro } } return totalMsgs; - } - catch (Throwable t) { + } catch (Throwable t) { throw new IllegalStateException(t.getMessage()); - } - finally { + } finally { blockOnIO(); } } @@ -201,8 +191,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro clearIO(); try { return pagingManager.getPageStore(address).isPaging(); - } - finally { + } finally { blockOnIO(); } } @@ -215,12 +204,10 @@ public class AddressControlImpl extends AbstractControl implements AddressContro if (!pageStore.isPaging()) { return 0; - } - else { + } else { return pagingManager.getPageStore(address).getNumberOfPages(); } - } - finally { + } finally { blockOnIO(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/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 3130c86..c0ef418 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 @@ -18,14 +18,13 @@ package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanAttributeInfo; import javax.management.MBeanOperationInfo; +import java.util.List; import org.apache.activemq.artemis.api.core.management.BridgeControl; import org.apache.activemq.artemis.core.config.BridgeConfiguration; import org.apache.activemq.artemis.core.persistence.StorageManager; import org.apache.activemq.artemis.core.server.cluster.Bridge; -import java.util.List; - public class BridgeControlImpl extends AbstractControl implements BridgeControl { // Constants ----------------------------------------------------- @@ -56,8 +55,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl try { List<String> staticConnectors = configuration.getStaticConnectors(); return staticConnectors.toArray(new String[staticConnectors.size()]); - } - finally { + } finally { blockOnIO(); } } @@ -67,8 +65,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getForwardingAddress(); - } - finally { + } finally { blockOnIO(); } } @@ -78,8 +75,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getQueueName(); - } - finally { + } finally { blockOnIO(); } } @@ -89,8 +85,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getDiscoveryGroupName(); - } - finally { + } finally { blockOnIO(); } } @@ -100,8 +95,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getFilterString(); - } - finally { + } finally { blockOnIO(); } } @@ -111,8 +105,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getReconnectAttempts(); - } - finally { + } finally { blockOnIO(); } } @@ -122,8 +115,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getName(); - } - finally { + } finally { blockOnIO(); } } @@ -133,8 +125,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getRetryInterval(); - } - finally { + } finally { blockOnIO(); } } @@ -144,8 +135,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getRetryIntervalMultiplier(); - } - finally { + } finally { blockOnIO(); } } @@ -155,8 +145,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.getTransformerClassName(); - } - finally { + } finally { blockOnIO(); } } @@ -166,8 +155,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return bridge.isStarted(); - } - finally { + } finally { blockOnIO(); } } @@ -177,8 +165,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.isUseDuplicateDetection(); - } - finally { + } finally { blockOnIO(); } } @@ -188,8 +175,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { return configuration.isHA(); - } - finally { + } finally { blockOnIO(); } } @@ -199,8 +185,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl clearIO(); try { bridge.start(); - } - finally { + } finally { blockOnIO(); } } @@ -211,8 +196,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl try { bridge.stop(); bridge.flushExecutor(); - } - finally { + } finally { blockOnIO(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/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 7b206e8..ddb8f01 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 @@ -20,9 +20,9 @@ import javax.management.MBeanAttributeInfo; import javax.management.MBeanOperationInfo; import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.JsonUtil; import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; import org.apache.activemq.artemis.api.core.management.BroadcastGroupControl; -import org.apache.activemq.artemis.api.core.JsonUtil; import org.apache.activemq.artemis.core.persistence.StorageManager; import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup; @@ -55,8 +55,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc clearIO(); try { return configuration.getName(); - } - finally { + } finally { blockOnIO(); } } @@ -66,8 +65,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc clearIO(); try { return configuration.getBroadcastPeriod(); - } - finally { + } finally { blockOnIO(); } } @@ -84,8 +82,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc } return ret; - } - finally { + } finally { blockOnIO(); } } @@ -95,8 +92,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc clearIO(); try { return JsonUtil.toJsonArray(configuration.getConnectorInfos()).toString(); - } - finally { + } finally { blockOnIO(); } } @@ -110,8 +106,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc return ((UDPBroadcastEndpointFactory) configuration.getEndpointFactory()).getGroupAddress(); } throw new Exception("Invalid request because this is not a UDP Broadcast configuration."); - } - finally { + } finally { blockOnIO(); } } @@ -124,8 +119,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc return ((UDPBroadcastEndpointFactory) configuration.getEndpointFactory()).getGroupPort(); } throw new Exception("Invalid request because this is not a UDP Broadcast configuration."); - } - finally { + } finally { blockOnIO(); } } @@ -138,8 +132,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc return ((UDPBroadcastEndpointFactory) configuration.getEndpointFactory()).getLocalBindPort(); } throw new Exception("Invalid request because this is not a UDP Broadcast configuration."); - } - finally { + } finally { blockOnIO(); } } @@ -151,8 +144,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc clearIO(); try { return broadcastGroup.isStarted(); - } - finally { + } finally { blockOnIO(); } } @@ -162,8 +154,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc clearIO(); try { broadcastGroup.start(); - } - finally { + } finally { blockOnIO(); } } @@ -173,8 +164,7 @@ public class BroadcastGroupControlImpl extends AbstractControl implements Broadc clearIO(); try { broadcastGroup.stop(); - } - finally { + } finally { blockOnIO(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/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 f374c3f..9186dbb 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 @@ -21,8 +21,8 @@ import javax.management.MBeanOperationInfo; import java.util.List; import java.util.Map; -import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl; import org.apache.activemq.artemis.api.core.JsonUtil; +import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl; import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; import org.apache.activemq.artemis.core.persistence.StorageManager; import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; @@ -56,8 +56,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return configuration.getAddress(); - } - finally { + } finally { blockOnIO(); } @@ -68,8 +67,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return configuration.getDiscoveryGroupName(); - } - finally { + } finally { blockOnIO(); } @@ -80,8 +78,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return configuration.getMaxHops(); - } - finally { + } finally { blockOnIO(); } @@ -92,8 +89,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return configuration.getName(); - } - finally { + } finally { blockOnIO(); } @@ -104,8 +100,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return configuration.getRetryInterval(); - } - finally { + } finally { blockOnIO(); } @@ -116,8 +111,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return clusterConnection.getNodeID(); - } - finally { + } finally { blockOnIO(); } } @@ -129,12 +123,10 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu List<String> staticConnectors = configuration.getStaticConnectors(); if (staticConnectors == null) { return null; - } - else { + } else { return staticConnectors.toArray(new String[staticConnectors.size()]); } - } - finally { + } finally { blockOnIO(); } } @@ -144,8 +136,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return JsonUtil.toJsonArray(configuration.getStaticConnectors()).toString(); - } - finally { + } finally { blockOnIO(); } } @@ -155,8 +146,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return configuration.isDuplicateDetection(); - } - finally { + } finally { blockOnIO(); } } @@ -166,8 +156,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return configuration.getMessageLoadBalancingType().getType(); - } - finally { + } finally { blockOnIO(); } } @@ -177,8 +166,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return clusterConnection.getTopology().describe(); - } - finally { + } finally { blockOnIO(); } } @@ -188,8 +176,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return clusterConnection.getNodes(); - } - finally { + } finally { blockOnIO(); } } @@ -199,8 +186,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu clearIO(); try { return clusterConnection.isStarted(); - } - finally { + } finally { blockOnIO(); } } @@ -211,8 +197,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu try { clusterConnection.start(); clusterConnection.flushExecutor(); - } - finally { + } finally { blockOnIO(); } } @@ -223,8 +208,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu try { clusterConnection.stop(); clusterConnection.flushExecutor(); - } - finally { + } finally { blockOnIO(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/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 aacf834..6c47778 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 @@ -53,8 +53,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl clearIO(); try { return configuration.getAddress(); - } - finally { + } finally { blockOnIO(); } } @@ -64,8 +63,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl clearIO(); try { return configuration.getFilterString(); - } - finally { + } finally { blockOnIO(); } } @@ -75,8 +73,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl clearIO(); try { return configuration.getForwardingAddress(); - } - finally { + } finally { blockOnIO(); } } @@ -86,8 +83,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl clearIO(); try { return divert.getRoutingName().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -97,8 +93,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl clearIO(); try { return configuration.getTransformerClassName(); - } - finally { + } finally { blockOnIO(); } } @@ -108,8 +103,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl clearIO(); try { return divert.getUniqueName().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -119,8 +113,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl clearIO(); try { return divert.isExclusive(); - } - finally { + } finally { blockOnIO(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java index eb6194e..07fc9a8 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java @@ -69,12 +69,7 @@ public class MBeanInfoHelper { MBeanAttributeInfo infoToCopy = info1; for (MBeanAttributeInfo info2 : tempAttributes) { if (info1.getName().equals(info2.getName()) && !info1.equals(info2)) { - infoToCopy = new MBeanAttributeInfo(info1.getName(), - info1.getType().equals("void") ? info2.getType() : info1.getType(), - info1.getDescription(), - (info1.isReadable() || info2.isReadable()), - (info1.isWritable() || info2.isWritable()), - (info1.isIs() || info2.isIs())); + infoToCopy = new MBeanAttributeInfo(info1.getName(), info1.getType().equals("void") ? info2.getType() : info1.getType(), info1.getDescription(), (info1.isReadable() || info2.isReadable()), (info1.isWritable() || info2.isWritable()), (info1.isIs() || info2.isIs())); } } if (!alreadyAdded.contains(infoToCopy.getName())) { @@ -107,8 +102,7 @@ public class MBeanInfoHelper { method.getParameterTypes().length == 1 && method.getReturnType().equals(void.class)) { return true; - } - else { + } else { return false; } } @@ -118,8 +112,7 @@ public class MBeanInfoHelper { method.getParameterTypes().length == 0 && method.getReturnType().equals(boolean.class)) { return true; - } - else { + } else { return false; } } @@ -149,7 +142,7 @@ public class MBeanInfoHelper { description = operation.getAnnotation(Attribute.class).desc(); } - MBeanAttributeInfo info = new MBeanAttributeInfo(getAttributeName(operation), operation.getReturnType().getName(), description, (isGetterMethod(operation) || isIsBooleanMethod(operation)), isSetterMethod(operation), isIsBooleanMethod(operation)); + MBeanAttributeInfo info = new MBeanAttributeInfo(getAttributeName(operation), operation.getReturnType().getName(), description, (isGetterMethod(operation) || isIsBooleanMethod(operation)), isSetterMethod(operation), isIsBooleanMethod(operation)); return info; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java index e1e9628..7275ea4 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java @@ -137,8 +137,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getName().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -159,8 +158,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { Filter filter = queue.getFilter(); return filter != null ? filter.getFilterString().toString() : null; - } - finally { + } finally { blockOnIO(); } } @@ -172,8 +170,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.isDurable(); - } - finally { + } finally { blockOnIO(); } } @@ -185,8 +182,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.isTemporary(); - } - finally { + } finally { blockOnIO(); } } @@ -198,8 +194,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getMessageCount(); - } - finally { + } finally { blockOnIO(); } } @@ -211,8 +206,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getConsumerCount(); - } - finally { + } finally { blockOnIO(); } } @@ -224,8 +218,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getDeliveringCount(); - } - finally { + } finally { blockOnIO(); } } @@ -237,8 +230,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getMessagesAdded(); - } - finally { + } finally { blockOnIO(); } } @@ -250,8 +242,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getMessagesAcknowledged(); - } - finally { + } finally { blockOnIO(); } } @@ -263,8 +254,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getMessagesExpired(); - } - finally { + } finally { blockOnIO(); } } @@ -276,8 +266,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getMessagesKilled(); - } - finally { + } finally { blockOnIO(); } } @@ -289,8 +278,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getID(); - } - finally { + } finally { blockOnIO(); } } @@ -302,8 +290,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.getScheduledCount(); - } - finally { + } finally { blockOnIO(); } } @@ -320,8 +307,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { return addressSettings.getDeadLetterAddress().toString(); } return null; - } - finally { + } finally { blockOnIO(); } } @@ -336,12 +322,10 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { if (addressSettings != null && addressSettings.getExpiryAddress() != null) { return addressSettings.getExpiryAddress().toString(); - } - else { + } else { return null; } - } - finally { + } finally { blockOnIO(); } } @@ -354,8 +338,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { try { List<MessageReference> refs = queue.getScheduledMessages(); return convertMessagesToMaps(refs); - } - finally { + } finally { blockOnIO(); } } @@ -367,8 +350,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return QueueControlImpl.toJSON(listScheduledMessages()); - } - finally { + } finally { blockOnIO(); } } @@ -401,8 +383,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { msgRet.put(entry.getKey(), convertMessagesToMaps(entry.getValue())); } return msgRet; - } - finally { + } finally { blockOnIO(); } @@ -415,8 +396,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return QueueControlImpl.toJSON(listDeliveringMessages()); - } - finally { + } finally { blockOnIO(); } } @@ -440,11 +420,9 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { } return messages.toArray(new Map[messages.size()]); } - } - catch (ActiveMQException e) { + } catch (ActiveMQException e) { throw new IllegalStateException(e.getMessage()); - } - finally { + } finally { blockOnIO(); } } @@ -456,8 +434,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return QueueControlImpl.toJSON(listMessages(filter)); - } - finally { + } finally { blockOnIO(); } } @@ -478,8 +455,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { } return messages.toArray(new Map[1]); } - } - finally { + } finally { blockOnIO(); } @@ -522,8 +498,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { Filter filter = FilterImpl.createFilter(filterStr); if (filter == null) { return getMessageCount(); - } - else { + } else { try (LinkedListIterator<MessageReference> iterator = queue.totalIterator()) { int count = 0; while (iterator.hasNext()) { @@ -535,8 +510,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { return count; } } - } - finally { + } finally { blockOnIO(); } } @@ -548,11 +522,9 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.deleteReference(messageID); - } - catch (ActiveMQException e) { + } catch (ActiveMQException e) { throw new IllegalStateException(e.getMessage()); - } - finally { + } finally { blockOnIO(); } } @@ -571,8 +543,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { Filter filter = FilterImpl.createFilter(filterStr); return queue.deleteMatchingReferences(flushLimit, filter); - } - finally { + } finally { blockOnIO(); } } @@ -584,8 +555,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.expireReference(messageID); - } - finally { + } finally { blockOnIO(); } } @@ -598,11 +568,9 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { try { Filter filter = FilterImpl.createFilter(filterStr); return queue.expireReferences(filter); - } - catch (ActiveMQException e) { + } catch (ActiveMQException e) { throw new IllegalStateException(e.getMessage()); - } - finally { + } finally { blockOnIO(); } } @@ -627,8 +595,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { }; return queue.retryMessages(singleMessageFilter) > 0; - } - finally { + } finally { blockOnIO(); } } @@ -640,8 +607,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { try { return queue.retryMessages(null); - } - finally { + } finally { blockOnIO(); } } @@ -666,8 +632,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { } return queue.moveReference(messageID, binding.getAddress(), rejectDuplicates); - } - finally { + } finally { blockOnIO(); } @@ -698,8 +663,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { int retValue = queue.moveReferences(flushLimit, filter, binding.getAddress(), rejectDuplicates); return retValue; - } - finally { + } finally { blockOnIO(); } @@ -721,8 +685,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { Filter filter = FilterImpl.createFilter(filterStr); return queue.sendMessagesToDeadLetterAddress(filter); - } - finally { + } finally { blockOnIO(); } } @@ -732,7 +695,8 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { final int type, final String body, final String userID, - boolean durable, final String user, + boolean durable, + final String user, final String password) throws Exception { securityStore.check(queue.getAddress(), CheckType.SEND, new SecurityAuth() { @Override @@ -763,7 +727,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { } message.setAddress(queue.getAddress()); postOffice.route(message, null, true); - return "" + message.getMessageID(); + return "" + message.getMessageID(); } @Override @@ -773,8 +737,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.sendMessageToDeadLetterAddress(messageID); - } - finally { + } finally { blockOnIO(); } } @@ -791,8 +754,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { Filter filter = FilterImpl.createFilter(filterStr); return queue.changeReferencesPriority(filter, (byte) newPriority); - } - finally { + } finally { blockOnIO(); } } @@ -807,8 +769,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { throw ActiveMQMessageBundle.BUNDLE.invalidNewPriority(newPriority); } return queue.changeReferencePriority(messageID, (byte) newPriority); - } - finally { + } finally { blockOnIO(); } } @@ -820,11 +781,9 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return MessageCounterInfo.toJSon(counter); - } - catch (Exception e) { + } catch (Exception e) { throw new IllegalStateException(e); - } - finally { + } finally { blockOnIO(); } } @@ -836,8 +795,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { counter.resetCounter(); - } - finally { + } finally { blockOnIO(); } } @@ -849,8 +807,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return MessageCounterHelper.listMessageCounterAsHTML(new MessageCounter[]{counter}); - } - finally { + } finally { blockOnIO(); } } @@ -862,8 +819,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return MessageCounterHelper.listMessageCounterHistory(counter); - } - finally { + } finally { blockOnIO(); } } @@ -875,8 +831,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return MessageCounterHelper.listMessageCounterHistoryAsHTML(new MessageCounter[]{counter}); - } - finally { + } finally { blockOnIO(); } } @@ -888,8 +843,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { queue.pause(); - } - finally { + } finally { blockOnIO(); } } @@ -901,8 +855,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { queue.resume(); - } - finally { + } finally { blockOnIO(); } } @@ -914,8 +867,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { return queue.isPaused(); - } - finally { + } finally { blockOnIO(); } } @@ -943,11 +895,9 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { c.toArray(rc); return rc; } - } - catch (ActiveMQException e) { + } catch (ActiveMQException e) { throw new IllegalStateException(e.getMessage()); - } - finally { + } finally { blockOnIO(); } } @@ -959,8 +909,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { queue.flushExecutor(); - } - finally { + } finally { blockOnIO(); } } @@ -980,12 +929,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { if (consumer instanceof ServerConsumer) { ServerConsumer serverConsumer = (ServerConsumer) consumer; - JsonObjectBuilder obj = JsonLoader.createObjectBuilder() - .add("consumerID", serverConsumer.getID()) - .add("connectionID", serverConsumer.getConnectionID().toString()) - .add("sessionID", serverConsumer.getSessionID()) - .add("browseOnly", serverConsumer.isBrowseOnly()) - .add("creationTime", serverConsumer.getCreationTime()); + JsonObjectBuilder obj = JsonLoader.createObjectBuilder().add("consumerID", serverConsumer.getID()).add("connectionID", serverConsumer.getConnectionID().toString()).add("sessionID", serverConsumer.getSessionID()).add("browseOnly", serverConsumer.isBrowseOnly()).add("creationTime", serverConsumer.getCreationTime()); jsonArray.add(obj); } @@ -993,8 +937,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { } return jsonArray.build().toString(); - } - finally { + } finally { blockOnIO(); } } @@ -1016,8 +959,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { queue.resetMessagesAdded(); - } - finally { + } finally { blockOnIO(); } @@ -1030,8 +972,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { queue.resetMessagesAcknowledged(); - } - finally { + } finally { blockOnIO(); } @@ -1044,8 +985,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { queue.resetMessagesExpired(); - } - finally { + } finally { blockOnIO(); } @@ -1058,8 +998,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { clearIO(); try { queue.resetMessagesKilled(); - } - finally { + } finally { blockOnIO(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java index d34165e..6d85d89 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -43,7 +42,6 @@ public interface CompositeDataConstants { String BODY_DESCRIPTION = "The message body"; String PROPERTIES_DESCRIPTION = "The properties text"; - // User properties String STRING_PROPERTIES = "StringProperties"; String BOOLEAN_PROPERTIES = "BooleanProperties";
