From 60a86a72cf7a0a16728fda9aef024432a31e254f Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Tue, 9 Oct 2018 16:29:41 +0200 Subject: [PATCH] Cleanup redundant ModelNode allocations in ProxyOperation --- .../mod_cluster/LegacyProxyOperation.java | 6 ++++-- .../extension/mod_cluster/ProxyOperation.java | 17 ++++++++--------- .../mod_cluster/ProxyOperationExecutor.java | 3 --- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/LegacyProxyOperation.java b/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/LegacyProxyOperation.java index 8e9ff652647f..d44ec5e5f507 100644 --- a/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/LegacyProxyOperation.java +++ b/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/LegacyProxyOperation.java @@ -469,7 +469,7 @@ public void execute(OperationContext context, ModelNode operation) throws Operat int waitTime = WAIT_TIME.resolveModelAttribute(context, operation).asInt(); boolean success = service.stop(waitTime, TimeUnit.SECONDS); - context.getResult().get(ProxyOperationExecutor.SESSION_DRAINING_COMPLETE).set(success); + context.getResult().get(SESSION_DRAINING_COMPLETE).set(success); context.completeStep(new OperationContext.RollbackHandler() { @Override @@ -510,7 +510,7 @@ public void execute(OperationContext context, ModelNode operation) throws Operat try { boolean success = service.stopContext(webHost, webContext, waitTime, TimeUnit.SECONDS); - context.getResult().get(ProxyOperationExecutor.SESSION_DRAINING_COMPLETE).set(success); + context.getResult().get(SESSION_DRAINING_COMPLETE).set(success); } catch (IllegalArgumentException e) { throw new OperationFailedException(ModClusterLogger.ROOT_LOGGER.contextOrHostNotFound(webHost, webContext)); } @@ -529,6 +529,8 @@ public void handleRollback(OperationContext context, ModelNode operation) { }, ; + static final String SESSION_DRAINING_COMPLETE = "session-draining-complete"; + private static ServiceController getService(OperationContext context) throws OperationFailedException { PathAddress proxyAddress = LegacyMetricOperationsRegistration.translateProxyPath(context); ServiceName serviceName = ProxyConfigurationResourceDefinition.Capability.SERVICE.getServiceName(proxyAddress); diff --git a/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperation.java b/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperation.java index a6f7e4308467..4a49ea100ce4 100644 --- a/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperation.java +++ b/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperation.java @@ -38,7 +38,6 @@ import org.jboss.as.controller.OperationDefinition; import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.SimpleOperationDefinitionBuilder; -import org.jboss.as.controller.descriptions.ModelDescriptionConstants; import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; import org.jboss.modcluster.ModClusterServiceMBean; @@ -99,7 +98,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat result.add(entry.getValue()); } } - return new ModelNode().set(result); + return result; } return null; @@ -121,7 +120,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat for (InetSocketAddress address : addresses) { result.add(address.getHostName() + ":" + address.getPort()); } - return new ModelNode().set(result); + return result; } return null; @@ -147,7 +146,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat result.add(entry.getValue()); } } - return new ModelNode().set(result); + return result; } return null; @@ -172,7 +171,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operation, ModClusterServiceMBean service) { boolean enabled = service.enable(); - return new ModelNode().get(ModelDescriptionConstants.RESULT).set(enabled); + return new ModelNode(enabled); } }, DISABLE("disable") { @@ -180,7 +179,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operation, ModClusterServiceMBean service) { boolean disabled = service.disable(); - return new ModelNode().get(ModelDescriptionConstants.RESULT).set(disabled); + return new ModelNode(disabled); } }, STOP("stop") { @@ -194,7 +193,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat int waitTime = WAIT_TIME.resolveModelAttribute(expressionResolver, operation).asInt(); boolean success = service.stop(waitTime, TimeUnit.SECONDS); - return new ModelNode().get(ProxyOperationExecutor.SESSION_DRAINING_COMPLETE).set(success); + return new ModelNode(success); } }, @@ -232,7 +231,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat try { boolean disabled = service.disableContext(virtualHost, webContext); - return new ModelNode().get(ModelDescriptionConstants.RESULT).set(disabled); + return new ModelNode(disabled); } catch (IllegalArgumentException e) { throw new OperationFailedException(ModClusterLogger.ROOT_LOGGER.contextOrHostNotFound(virtualHost, webContext)); } @@ -252,7 +251,7 @@ public ModelNode execute(ExpressionResolver expressionResolver, ModelNode operat try { boolean success = service.stopContext(virtualHost, webContext, waitTime, TimeUnit.SECONDS); - return new ModelNode().get(ProxyOperationExecutor.SESSION_DRAINING_COMPLETE).set(success); + return new ModelNode(success); } catch (IllegalArgumentException e) { throw new OperationFailedException(ModClusterLogger.ROOT_LOGGER.contextOrHostNotFound(virtualHost, webContext)); } diff --git a/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperationExecutor.java b/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperationExecutor.java index d4022e50ec2a..4546551419ff 100644 --- a/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperationExecutor.java +++ b/mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ProxyOperationExecutor.java @@ -69,9 +69,6 @@ public class ProxyOperationExecutor implements OperationExecutor executable) throws OperationFailedException { ServiceName serviceName = ProxyConfigurationResourceDefinition.Capability.SERVICE.getDefinition().getCapabilityServiceName(context.getCurrentAddress());