Skip to content

Commit 7b197fe

Browse files
committed
[misc] pattern matching in instanceof correction for java 8 support
1 parent 04f99d5 commit 7b197fe

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

src/main/java/org/mariadb/jdbc/BasePreparedStatement.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,8 @@ private void setInternalObject(
11921192
"HY000",
11931193
e);
11941194
}
1195-
} else if (obj instanceof Number bd) {
1195+
} else if (obj instanceof Number) {
1196+
Number bd = (Number) obj;
11961197
switch (targetSqlType) {
11971198
case Types.TINYINT:
11981199
setByte(parameterIndex, bd.byteValue());

src/main/java/org/mariadb/jdbc/MariaDbPoolConnection.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ public Configuration getConf() {
232232

233233
@Override
234234
public boolean isSameRM(XAResource xaResource) {
235-
if (xaResource instanceof MariaDbXAResource other) {
235+
if (xaResource instanceof MariaDbXAResource) {
236+
MariaDbXAResource other = (MariaDbXAResource) xaResource;
236237
return other.getConf().equals(this.getConf());
237238
}
238239
return false;

src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/Curve.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public int hashCode() {
7777
@Override
7878
public boolean equals(Object o) {
7979
if (o == this) return true;
80-
if (!(o instanceof Curve c)) return false;
80+
if (!(o instanceof Curve)) return false;
81+
Curve c = (Curve) o;
8182
return f.equals(c.getField()) && d.equals(c.getD()) && I.equals(c.getI());
8283
}
8384
}

src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/GroupElement.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,8 @@ public int hashCode() {
885885
@Override
886886
public boolean equals(Object obj) {
887887
if (obj == this) return true;
888-
if (!(obj instanceof GroupElement ge)) return false;
888+
if (!(obj instanceof GroupElement)) return false;
889+
GroupElement ge = (GroupElement) obj;
889890
if (!this.repr.equals(ge.repr)) {
890891
try {
891892
ge = ge.toRep(this.repr);

src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/ed25519/Ed25519FieldElement.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,8 @@ public int hashCode() {
10521052

10531053
@Override
10541054
public boolean equals(Object obj) {
1055-
if (!(obj instanceof Ed25519FieldElement fe)) return false;
1055+
if (!(obj instanceof Ed25519FieldElement)) return false;
1056+
Ed25519FieldElement fe = (Ed25519FieldElement) obj;
10561057
return 1 == Utils.equal(toByteArray(), fe.toByteArray());
10571058
}
10581059

0 commit comments

Comments
 (0)