Removed String instantiation

K0zka · chipchilders · commit ce8ada030d31 · 2013-06-17T19:15:37.000+01:00
String instantiation and redundant method call replaced with a constant.

Signed-off-by: Laszlo Hornyak &lt;laszlo.hornyak@gmail.com&gt;
diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java
@@ -33,14 +33,14 @@
 import com.cloud.agent.api.to.PortForwardingRuleTO;
 import com.cloud.agent.api.to.LoadBalancerTO.DestinationTO;
 import com.cloud.agent.api.to.LoadBalancerTO.StickinessPolicyTO;
-import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource;
 import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType;
 import com.cloud.utils.net.NetUtils;
 
 
 public class HAProxyConfigurator implements LoadBalancerConfigurator {
 
     private static final Logger s_logger = Logger.getLogger(HAProxyConfigurator.class);
+    private static final String blankLine = "\t ";
     private static String[] globalSection = { "global",
             "\tlog 127.0.0.1:3914   local0 warning", 
             "\tmaxconn 4096",
@@ -86,17 +86,17 @@ public String[] generateConfiguration(List<PortForwardingRuleTO> fwRules) {
         List<String> result = new ArrayList<String>();
 
         result.addAll(Arrays.asList(globalSection));
-        result.add(getBlankLine());
+        result.add(blankLine);
         result.addAll(Arrays.asList(defaultsSection));
-        result.add(getBlankLine());
+        result.add(blankLine);
 
         if (pools.isEmpty()) {
             // haproxy cannot handle empty listen / frontend or backend, so add
             // a dummy listener
             // on port 9
             result.addAll(Arrays.asList(defaultListen));
         }
-        result.add(getBlankLine());
+        result.add(blankLine);
 
         for (Map.Entry<String, List<PortForwardingRuleTO>> e : pools.entrySet()) {
             List<String> poolRules = getRulesForPool(e.getKey(), e.getValue());
@@ -143,7 +143,7 @@ private List<String> getRulesForPool(String poolName,
                     .append(rule.getDstPortRange()[0]).append(" check");
             result.add(sb.toString());
         }
-        result.add(getBlankLine());
+        result.add(blankLine);
         return result;
     }
  
@@ -507,14 +507,10 @@ private List<String> getRulesForPool(LoadBalancerTO lbTO)  {
             result.add(sb.toString());
         }
         
-        result.add(getBlankLine());
+        result.add(blankLine);
         return result;
     }
 
-    private String getBlankLine() {
-        return new String("\t ");
-    }
-
     private String generateStatsRule(LoadBalancerConfigCommand lbCmd,
             String ruleName, String statsIp) {
         StringBuilder rule = new StringBuilder("\nlisten ").append(ruleName)
@@ -534,7 +530,7 @@ public String[] generateConfiguration(LoadBalancerConfigCommand lbCmd)   {
         List<String> result = new ArrayList<String>();
 
         result.addAll(Arrays.asList(globalSection));
-        result.add(getBlankLine());
+        result.add(blankLine);
         result.addAll(Arrays.asList(defaultsSection));
         if (!lbCmd.lbStatsVisibility.equals("disabled")) {
             /* new rule : listen admin_page guestip/link-local:8081 */
@@ -568,7 +564,7 @@ public String[] generateConfiguration(LoadBalancerConfigCommand lbCmd)   {
             }
 
         }
-        result.add(getBlankLine());
+        result.add(blankLine);
         boolean has_listener = false;
         for (LoadBalancerTO lbTO : lbCmd.getLoadBalancers()) {
             if ( lbTO.isRevoked() ) {
@@ -578,7 +574,7 @@ public String[] generateConfiguration(LoadBalancerConfigCommand lbCmd)   {
             result.addAll(poolRules);
             has_listener = true;
         }
-        result.add(getBlankLine());
+        result.add(blankLine);
         if ( !has_listener) {
             // haproxy cannot handle empty listen / frontend or backend, so add
             // a dummy listener
