Skip to content

Commit 7aaae1d

Browse files
nboseckerpivovarit
nbosecker
authored and
pivovarit
committed
Moved project to core-java from eclipse folder (eugenp#703)
1 parent 302ac3a commit 7aaae1d

File tree

9 files changed

+71
-74
lines changed

9 files changed

+71
-74
lines changed

‎core-java/src/main/java/org/baeldung/equalshashcode/entities/ComplexClass.java‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package org.baeldung.equalshashcode.entities;
2+
3+
import java.util.ArrayList;
4+
import java.util.HashSet;
5+
import java.util.List;
6+
import java.util.Set;
7+
8+
public class ComplexClass {
9+
10+
private List<?> genericList;
11+
private Set<Integer> integerSet;
12+
13+
public ComplexClass(ArrayList<?> genericArrayList, HashSet<Integer> integerHashSet) {
14+
super();
15+
this.genericList = genericArrayList;
16+
this.integerSet = integerHashSet;
17+
}
18+
19+
@Override
20+
public int hashCode() {
21+
final int prime = 31;
22+
int result = 1;
23+
result = prime * result + ((genericList == null) ? 0 : genericList.hashCode());
24+
result = prime * result + ((integerSet == null) ? 0 : integerSet.hashCode());
25+
return result;
26+
}
27+
28+
@Override
29+
public boolean equals(Object obj) {
30+
if (this == obj)
31+
return true;
32+
if (obj == null)
33+
return false;
34+
if (!(obj instanceof ComplexClass))
35+
return false;
36+
ComplexClass other = (ComplexClass) obj;
37+
if (genericList == null) {
38+
if (other.genericList != null)
39+
return false;
40+
} else if (!genericList.equals(other.genericList))
41+
return false;
42+
if (integerSet == null) {
43+
if (other.integerSet != null)
44+
return false;
45+
} else if (!integerSet.equals(other.integerSet))
46+
return false;
47+
return true;
48+
}
49+
50+
protected List<?> getGenericList() {
51+
return genericList;
52+
}
53+
54+
protected void setGenericArrayList(List<?> genericList) {
55+
this.genericList = genericList;
56+
}
57+
58+
protected Set<Integer> getIntegerSet() {
59+
return integerSet;
60+
}
61+
62+
protected void setIntegerSet(Set<Integer> integerSet) {
63+
this.integerSet = integerSet;
64+
}
65+
}

eclipse/src/main/java/org/baeldung/equalshashcode/entities/PrimitiveClass.java renamed to core-java/src/main/java/org/baeldung/equalshashcode/entities/PrimitiveClass.java

File renamed without changes.

eclipse/src/main/java/org/baeldung/equalshashcode/entities/Rectangle.java renamed to core-java/src/main/java/org/baeldung/equalshashcode/entities/Rectangle.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ public Rectangle(double width, double length) {
1111

1212
@Override
1313
public double area() {
14-
// A = w * l
1514
return width * length;
1615
}
1716

1817
@Override
1918
public double perimeter() {
20-
// P = 2(w + l)
2119
return 2 * (width + length);
2220
}
2321

eclipse/src/main/java/org/baeldung/equalshashcode/entities/Shape.java renamed to core-java/src/main/java/org/baeldung/equalshashcode/entities/Shape.java

File renamed without changes.

eclipse/src/main/java/org/baeldung/equalshashcode/entities/Square.java renamed to core-java/src/main/java/org/baeldung/equalshashcode/entities/Square.java

File renamed without changes.

eclipse/src/test/java/org/baeldung/equalshashcode/entities/ComplexClassTest.java renamed to core-java/src/test/java/org/baeldung/equalshashcode/entities/ComplexClassTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ public void testEqualsAndHashcodes() {
2222
strArrayListD.add("pqr");
2323
ComplexClass dObject = new ComplexClass(strArrayListD, new HashSet<Integer>(45, 67));
2424

25-
// equals()
2625
Assert.assertTrue(aObject.equals(bObject) && bObject.equals(aObject));
27-
// hashCode()
26+
2827
Assert.assertTrue(aObject.hashCode() == bObject.hashCode());
29-
// non-equal objects are not equals() and have different hashCode()
28+
3029
Assert.assertFalse(aObject.equals(dObject));
3130
Assert.assertFalse(aObject.hashCode() == dObject.hashCode());
3231
}

eclipse/src/test/java/org/baeldung/equalshashcode/entities/PrimitiveClassTest.java renamed to core-java/src/test/java/org/baeldung/equalshashcode/entities/PrimitiveClassTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ public void testTwoEqualsObjects() {
1212
PrimitiveClass bObject = new PrimitiveClass(false, 2);
1313
PrimitiveClass dObject = new PrimitiveClass(true, 2);
1414

15-
// equals()
1615
Assert.assertTrue(aObject.equals(bObject) && bObject.equals(aObject));
17-
// hashCode()
16+
1817
Assert.assertTrue(aObject.hashCode() == bObject.hashCode());
19-
// non-equal objects are not equals() and have different hashCode()
18+
2019
Assert.assertFalse(aObject.equals(dObject));
2120
Assert.assertFalse(aObject.hashCode() == dObject.hashCode());
2221
}

eclipse/src/test/java/org/baeldung/equalshashcode/entities/SquareClassTest.java renamed to core-java/src/test/java/org/baeldung/equalshashcode/entities/SquareClassTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ public void testEqualsAndHashcodes() {
1515

1616
Square dObject = new Square(20, Color.BLUE);
1717

18-
// equals()
1918
Assert.assertTrue(aObject.equals(bObject) && bObject.equals(aObject));
20-
// hashCode()
19+
2120
Assert.assertTrue(aObject.hashCode() == bObject.hashCode());
22-
// non-equal objects are not equals() and have different hashCode()
21+
2322
Assert.assertFalse(aObject.equals(dObject));
2423
Assert.assertFalse(aObject.hashCode() == dObject.hashCode());
2524
}

‎eclipse/src/main/java/org/baeldung/equalshashcode/entities/ComplexClass.java‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)