From bbce7d944b7ff3af2b8272746e2d8c60458ac0d7 Mon Sep 17 00:00:00 2001 From: Wilder Rodrigues Date: Mon, 14 Jul 2014 11:52:51 +0200 Subject: [PATCH] fixing checkstyles Conflicts: server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java server/src/com/cloud/network/topology/BasicNetworkTopology.java --- .../cloud/network/rules/FirewallRules.java | 8 ++--- .../com/cloud/network/rules/RuleApplier.java | 16 +++++----- .../network/rules/RuleApplierWrapper.java | 18 +++++------ .../rules/VirtualNetworkApplianceFactory.java | 30 +++++++++---------- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/server/src/com/cloud/network/rules/FirewallRules.java b/server/src/com/cloud/network/rules/FirewallRules.java index 64b36edebdf..dfb26850106 100644 --- a/server/src/com/cloud/network/rules/FirewallRules.java +++ b/server/src/com/cloud/network/rules/FirewallRules.java @@ -102,7 +102,7 @@ public class FirewallRules extends RuleApplier { public Purpose getPurpose() { return purpose; } - + public void createApplyLoadBalancingRulesCommands(final List rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) { final LoadBalancerTO[] lbs = new LoadBalancerTO[rules.size()]; @@ -159,7 +159,7 @@ public class FirewallRules extends RuleApplier { cmds.addCommand(cmd); } - + public void createApplyPortForwardingRulesCommands(final List rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) { List rulesTO = new ArrayList(); if (rules != null) { @@ -186,7 +186,7 @@ public class FirewallRules extends RuleApplier { cmds.addCommand(cmd); } - + public void createApplyStaticNatRulesCommands(final List rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) { List rulesTO = new ArrayList(); if (rules != null) { @@ -205,7 +205,7 @@ public class FirewallRules extends RuleApplier { cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString()); cmds.addCommand(cmd); } - + public void createApplyFirewallRulesCommands(final List rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) { List rulesTO = new ArrayList(); String systemRule = null; diff --git a/server/src/com/cloud/network/rules/RuleApplier.java b/server/src/com/cloud/network/rules/RuleApplier.java index 280d24660c8..70ca79360c3 100644 --- a/server/src/com/cloud/network/rules/RuleApplier.java +++ b/server/src/com/cloud/network/rules/RuleApplier.java @@ -17,8 +17,6 @@ package com.cloud.network.rules; -import javax.inject.Inject; - import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import com.cloud.dc.dao.DataCenterDao; @@ -40,8 +38,8 @@ import com.cloud.vm.dao.NicDao; public abstract class RuleApplier { - protected NEWVirtualNetworkApplianceManager applianceManager; - + protected NEWVirtualNetworkApplianceManager applianceManager; + protected NetworkModel networkModel; protected LoadBalancingRulesManager lbMgr; @@ -57,17 +55,17 @@ public abstract class RuleApplier { protected DataCenterDao dcDao; protected DomainRouterDao routerDao; - + protected NetworkDao networkDao; - + protected FirewallRulesDao rulesDao; protected VirtualMachineManager itMgr; protected Network network; - + protected VirtualRouter router; - + protected RouterControlHelper routerControlHelper; public RuleApplier(final Network network) { @@ -83,7 +81,7 @@ public abstract class RuleApplier { public VirtualRouter getRouter() { return router; } - + public void setManager(final NEWVirtualNetworkApplianceManager applianceManager) { this.applianceManager = applianceManager; } diff --git a/server/src/com/cloud/network/rules/RuleApplierWrapper.java b/server/src/com/cloud/network/rules/RuleApplierWrapper.java index 2d1a57fb578..23a5743d75c 100644 --- a/server/src/com/cloud/network/rules/RuleApplierWrapper.java +++ b/server/src/com/cloud/network/rules/RuleApplierWrapper.java @@ -20,13 +20,13 @@ package com.cloud.network.rules; public class RuleApplierWrapper { - private T ruleType; - - public RuleApplierWrapper(T ruleApplier) { - this.ruleType = ruleApplier; - } - - public T getRuleType() { - return ruleType; - } + private final T ruleType; + + public RuleApplierWrapper(final T ruleApplier) { + this.ruleType = ruleApplier; + } + + public T getRuleType() { + return ruleType; + } } \ No newline at end of file diff --git a/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java b/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java index 0108d55a7f5..88c3542426d 100644 --- a/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java +++ b/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java @@ -44,10 +44,10 @@ public class VirtualNetworkApplianceFactory { @Inject protected DomainRouterDao routerDao; - + @Inject protected NetworkDao networkDao; - + @Inject protected FirewallRulesDao rulesDao; @@ -63,7 +63,7 @@ public class VirtualNetworkApplianceFactory { return lbRules; } - + public FirewallRules createFirewallRules(final Network network, final List rules) { FirewallRules fwRules = new FirewallRules(network, rules); @@ -72,19 +72,19 @@ public class VirtualNetworkApplianceFactory { fwRules.networkDao = networkDao; fwRules.rulesDao = rulesDao; - + return fwRules; } - - private void initBeans(RuleApplier applier) { - applier.networkModel = this.networkModel; - applier.dcDao = this.dcDao; - applier.lbMgr = this.lbMgr; - applier.loadBalancerDao = this.loadBalancerDao; - applier.configDao = this.configDao; - applier.nicDao = this.nicDao; - applier.networkOfferingDao = this.networkOfferingDao; - applier.routerDao = this.routerDao; - applier.routerControlHelper = this.routerControlHelper; + + private void initBeans(final RuleApplier applier) { + applier.networkModel = networkModel; + applier.dcDao = dcDao; + applier.lbMgr = lbMgr; + applier.loadBalancerDao = loadBalancerDao; + applier.configDao = configDao; + applier.nicDao = nicDao; + applier.networkOfferingDao = networkOfferingDao; + applier.routerDao = routerDao; + applier.routerControlHelper = routerControlHelper; } }