iluwatar
diff --git a/Collapse file
‎immutable/src/main/java/com/iluwatar/immutable/ImmutableObject.java‎
Copy file name to clipboardExpand all lines: immutable/src/main/java/com/iluwatar/immutable/ImmutableObject.java
+18-2Lines changed: 18 additions & 2 deletions b/Collapse file
‎immutable/src/main/java/com/iluwatar/immutable/ImmutableObject.java‎
Copy file name to clipboardExpand all lines: immutable/src/main/java/com/iluwatar/immutable/ImmutableObject.java
+18-2Lines changed: 18 additions & 2 deletions
diff --git a/Collapse file
‎immutable/src/test/java/com/iluwatar/immutable/ImmutableObjectTest.java‎
Copy file name to clipboardExpand all lines: immutable/src/test/java/com/iluwatar/immutable/ImmutableObjectTest.java
+17Lines changed: 17 additions & 0 deletions b/Collapse file
‎immutable/src/test/java/com/iluwatar/immutable/ImmutableObjectTest.java‎
Copy file name to clipboardExpand all lines: immutable/src/test/java/com/iluwatar/immutable/ImmutableObjectTest.java
+17Lines changed: 17 additions & 0 deletions
@@ -1,4 +1,5 @@
 package com.iluwatar.immutable;
+import java.util.Objects;
 
 /**
  * Immutable Object pattern.
@@ -14,9 +15,9 @@ public ImmutableObject(
             final String name,
             final int age,
             final String email) {
-        this.name = name;
+    	this.name = Objects.requireNonNull(name, "name cannot be null");
         this.age = age;
-        this.email = email;
+        this.email = Objects.requireNonNull(email, "email cannot be null");
     }
 
     public String getName() { return name; }
@@ -31,4 +32,19 @@ public String toString() {
             + ", email='" + email + '\''
             + '}';
     }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof ImmutableObject)) return false;
+        ImmutableObject that = (ImmutableObject) o;
+        return age == that.age
+            && Objects.equals(name, that.name)
+            && Objects.equals(email, that.email);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, age, email);
+    }
 }
@@ -32,4 +32,21 @@ void testImmutability() {
 
         assertNotSame(obj1, obj2);
     }
+    
+    @Test
+    void testEquality() {
+        ImmutableObject obj1 = 
+            new ImmutableObject("A", 1, "a@gmail.com");
+        ImmutableObject obj2 = 
+            new ImmutableObject("A", 1, "a@gmail.com");
+        
+        assertEquals(obj1, obj2);
+    }
+
+    @Test
+    void testNullName() {
+        assertThrows(NullPointerException.class, () -> {
+            new ImmutableObject(null, 1, "a@gmail.com");
+        });
+    }
 }