[misc] pattern matching in instanceof correction for java 8 support

mariadb-corporation · Oct 18, 2023 · 7b197fe · 7b197fe
1 parent 04f99d5
commit 7b197fe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/BasePreparedStatement.java b/src/main/java/org/mariadb/jdbc/BasePreparedStatement.java
@@ -1192,7 +1192,8 @@ private void setInternalObject(
                   "HY000",
                   e);
         }
-      } else if (obj instanceof Number bd) {
+      } else if (obj instanceof Number) {
+        Number bd = (Number) obj;
         switch (targetSqlType) {
           case Types.TINYINT:
             setByte(parameterIndex, bd.byteValue());

diff --git a/src/main/java/org/mariadb/jdbc/MariaDbPoolConnection.java b/src/main/java/org/mariadb/jdbc/MariaDbPoolConnection.java
@@ -232,7 +232,8 @@ public Configuration getConf() {
 
     @Override
     public boolean isSameRM(XAResource xaResource) {
-      if (xaResource instanceof MariaDbXAResource other) {
+      if (xaResource instanceof MariaDbXAResource) {
+        MariaDbXAResource other = (MariaDbXAResource) xaResource;
         return other.getConf().equals(this.getConf());
       }
       return false;

diff --git a/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/Curve.java b/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/Curve.java
@@ -77,7 +77,8 @@ public int hashCode() {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (!(o instanceof Curve c)) return false;
+    if (!(o instanceof Curve)) return false;
+    Curve c = (Curve) o;
     return f.equals(c.getField()) && d.equals(c.getD()) && I.equals(c.getI());
   }
 }
diff --git a/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/GroupElement.java b/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/GroupElement.java
@@ -885,7 +885,8 @@ public int hashCode() {
   @Override
   public boolean equals(Object obj) {
     if (obj == this) return true;
-    if (!(obj instanceof GroupElement ge)) return false;
+    if (!(obj instanceof GroupElement)) return false;
+    GroupElement ge = (GroupElement) obj;
     if (!this.repr.equals(ge.repr)) {
       try {
         ge = ge.toRep(this.repr);

diff --git a/...mariadb/jdbc/plugin/authentication/standard/ed25519/math/ed25519/Ed25519FieldElement.java b/...mariadb/jdbc/plugin/authentication/standard/ed25519/math/ed25519/Ed25519FieldElement.java
@@ -1052,7 +1052,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof Ed25519FieldElement fe)) return false;
+    if (!(obj instanceof Ed25519FieldElement)) return false;
+    Ed25519FieldElement fe = (Ed25519FieldElement) obj;
     return 1 == Utils.equal(toByteArray(), fe.toByteArray());
   }