Skip to content

Commit cb2a0fe

Browse files
author
Evie Boland
committed
Fix build issue
1 parent 9f02a40 commit cb2a0fe

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/NamespaceOverride.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,4 @@ public NamespaceOverride(String sinkNamespace) {
3131
public String getSinkNamespace() {
3232
return sinkNamespace;
3333
}
34-
35-
@Override
36-
public boolean equals(Object o) {
37-
if (this == o) {
38-
return true;
39-
} else if (!(o instanceof NamespaceOverride)) {
40-
return false;
41-
}
42-
NamespaceOverride other = (NamespaceOverride) o;
43-
return other.getSinkNamespace().equals(getSinkNamespace());
44-
}
4534
}

hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/TableNameOverride.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,4 @@ public TableNameOverride(TableName sinkTableName) {
3232
public TableName getSinkTableName() {
3333
return sinkTableName;
3434
}
35-
36-
@Override
37-
public boolean equals(Object o) {
38-
if (this == o) {
39-
return true;
40-
} else if (!(o instanceof TableNameOverride)) {
41-
return false;
42-
}
43-
TableNameOverride other = (TableNameOverride) o;
44-
return other.getSinkTableName().equals(getSinkTableName());
45-
}
4635
}

hbase-client/src/test/java/org/apache/hadoop/hbase/replication/ReplicationPeerConfigTestUtil.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,12 @@ private static void assertNamespaceOverridesMapEquals(Map<String, NamespaceOverr
134134
assertTrue(actual == null || actual.size() == 0);
135135
return;
136136
}
137-
assertEquals(expected, actual);
137+
for (String namespace : expected.keySet()) {
138+
assertTrue(actual.containsKey(namespace));
139+
assertEquals(expected.get(namespace).getSinkNamespace(),
140+
actual.get(namespace).getSinkNamespace());
141+
}
142+
assertSetEquals(expected.keySet(), actual.keySet());
138143
}
139144

140145
private static void assertTableOverridesMapEquals(Map<TableName, TableNameOverride> expected,
@@ -143,7 +148,14 @@ private static void assertTableOverridesMapEquals(Map<TableName, TableNameOverri
143148
assertTrue(actual == null || actual.size() == 0);
144149
return;
145150
}
146-
assertEquals(expected, actual);
151+
for (TableName tableName : expected.keySet()) {
152+
assertTrue(actual.containsKey(tableName));
153+
assertEquals(expected.get(tableName).getSinkTableName(),
154+
actual.get(tableName).getSinkTableName());
155+
}
156+
for (TableName tableName : actual.keySet()) {
157+
assertTrue(expected.containsKey(tableName));
158+
}
147159
}
148160

149161
public static void assertConfigEquals(ReplicationPeerConfig expected,

0 commit comments

Comments
 (0)