Reduce about 1k String objects from being instantiated

rsafonseca · DaanHoogland · commit 83488e01af57 · 2015-06-22T13:01:19.000+02:00
Signed-off-by: Daan Hoogland &lt;daan.hoogland@gmail.com&gt;
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
@@ -52,16 +52,6 @@
 	<artifactId>log4j</artifactId>
 	<version>1.2.17</version>
     </dependency>
-    <dependency>
-	<groupId>org.mockito</groupId>
-	<artifactId>mockito-all</artifactId>
-	<version>1.9.5</version>
-    </dependency>
-    <dependency>
-	<groupId>junit</groupId>
-	<artifactId>junit</artifactId>
-	<version>4.12</version>
-    </dependency>
   </dependencies>
    <build>
     <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
@@ -79,16 +69,6 @@
         <directory>${basedir}/src/test/resources</directory>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-        <failOnError>false</failOnError>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
   <profiles>
     <profile>
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
@@ -93,6 +93,7 @@ public Boolean getSuccess() {
     }
 
     /* nice try but doesn't work like that .. */
+    @SafeVarargs
     public final <T> Object callWrapper(String call, T... args)
             throws Ovm3ResourceException {
         List<T> params = new ArrayList<T>();
@@ -108,6 +109,7 @@ public final <T> Object callWrapper(String call, T... args)
     }
 
     /* should check on nil ? */
+    @SafeVarargs
     public final <T> Boolean nullCallWrapper(String call, Boolean nullReturn, T... args) throws Ovm3ResourceException {
         Object x = callWrapper(call, args);
         if (x == null) {
@@ -118,9 +120,11 @@ public final <T> Boolean nullCallWrapper(String call, Boolean nullReturn, T... a
         return false;
     }
 
+    @SafeVarargs
     public final <T> Boolean nullIsFalseCallWrapper(String call, T... args) throws Ovm3ResourceException {
         return nullCallWrapper(call, false, args);
     }
+    @SafeVarargs
     public final <T> Boolean nullIsTrueCallWrapper(String call, T... args) throws Ovm3ResourceException {
         return nullCallWrapper(call, true, args);
     }
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
@@ -24,7 +24,7 @@
 
 import javax.naming.ConfigurationException;
 
-import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.log4j.Logger;
 
 import com.cloud.hypervisor.ovm3.objects.Network;
@@ -34,7 +34,7 @@
 /* holds config data for the Ovm3 Hypervisor */
 public class Ovm3Configuration {
     private static final Logger LOGGER = Logger
-          .getLogger(Ovm3Configuration.class);
+            .getLogger(Ovm3Configuration.class);
     private String agentIp;
     private Long agentZoneId;
     private Long agentPodId;
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ public Boolean getSuccess() {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/* nice try but doesn't work like that .. */`
	`96`	`+ @SafeVarargs`
`96`	`97`	`public final <T> Object callWrapper(String call, T... args)`
`97`	`98`	`throws Ovm3ResourceException {`
`98`	`99`	`List<T> params = new ArrayList<T>();`
`@@ -108,6 +109,7 @@ public final <T> Object callWrapper(String call, T... args)`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`/* should check on nil ? */`
	`112`	`+ @SafeVarargs`
`111`	`113`	`public final <T> Boolean nullCallWrapper(String call, Boolean nullReturn, T... args) throws Ovm3ResourceException {`
`112`	`114`	`Object x = callWrapper(call, args);`
`113`	`115`	`if (x == null) {`
`@@ -118,9 +120,11 @@ public final <T> Boolean nullCallWrapper(String call, Boolean nullReturn, T... a`
`118`	`120`	`return false;`
`119`	`121`	`}`
`120`	`122`
	`123`	`+ @SafeVarargs`
`121`	`124`	`public final <T> Boolean nullIsFalseCallWrapper(String call, T... args) throws Ovm3ResourceException {`
`122`	`125`	`return nullCallWrapper(call, false, args);`
`123`	`126`	`}`
	`127`	`+ @SafeVarargs`
`124`	`128`	`public final <T> Boolean nullIsTrueCallWrapper(String call, T... args) throws Ovm3ResourceException {`
`125`	`129`	`return nullCallWrapper(call, true, args);`
`126`	`130`	`}`