svn commit: r1329533 - in /camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi: CamelCdiTestContainer.java RegistryLookupAndInjectorTest.java store/Item.java

[hadrian]

Author: hadrian
Date: Tue Apr 24 02:31:03 2012
New Revision: 1329533

URL: http://svn.apache.org/viewvc?rev=1329533&view=rev
Log:
CAMEL-5145. Checkstyle and minor fix for equals() and missing hashCode().

Modified:
    
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelCdiTestContainer.java
    
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
    
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Item.java

Modified: 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelCdiTestContainer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelCdiTestContainer.java?rev=1329533&r1=1329532&r2=1329533&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelCdiTestContainer.java
 (original)
+++ 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelCdiTestContainer.java
 Tue Apr 24 02:31:03 2012
@@ -49,6 +49,6 @@ public abstract class CamelCdiTestContai
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
-       return new CdiCamelContext();
+        return new CdiCamelContext();
     }
-}
\ No newline at end of file
+}

Modified: 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java?rev=1329533&r1=1329532&r2=1329533&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
 (original)
+++ 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
 Tue Apr 24 02:31:03 2012
@@ -32,7 +32,7 @@ public class RegistryLookupAndInjectorTe
 
     @Override
     public void setUp() throws Exception {
-       super.setUp();
+        super.setUp();
 
         resultEndpoint = getMockEndpoint("mock:result");
     }

Modified: 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Item.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Item.java?rev=1329533&r1=1329532&r2=1329533&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Item.java
 (original)
+++ 
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Item.java
 Tue Apr 24 02:31:03 2012
@@ -22,11 +22,9 @@ public class Item implements Serializabl
     private static final long serialVersionUID = 1L;
 
     private String name;
-
     private long price;
 
     public Item() {
-
     }
 
     public Item(String name, long price) {
@@ -65,21 +63,23 @@ public class Item implements Serializabl
     // Simple equals implementation
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        Item other = (Item) obj;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
+        }
+        if (obj == null) {
             return false;
-        if (price != other.price)
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        return true;
+        }
+
+        Item other = (Item)obj;
+        boolean nameMatch = name == null ? other.name == null : 
name.equals(other.name);
+        return nameMatch && price == other.price;
     }
 
+    @Override
+    public int hashCode() {
+        return name.hashCode() * 997 + (int)price;
+    }
 }