From eeb3fe096221b8ac6c79816b6c03c946acc6afb8 Mon Sep 17 00:00:00 2001
From: szumielxd <43210079+szumielxd@users.noreply.github.com>
Date: Thu, 30 Jan 2025 06:25:25 +0100
Subject: [PATCH] Some java 17 code cleanup

---
 .../skriptdb/skript/EffExecuteStatement.java  | 20 +++++++++----------
 .../btk5h/skriptdb/skript/ExprSQLQuery.java   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java b/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java
index 4df340e..7de2771 100644
--- a/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java
+++ b/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java
@@ -175,7 +175,7 @@ public class EffExecuteStatement extends Effect {
             		.map(arg -> SkriptValueWrapper.getBySkriptType(arg.getClass()).asSql(arg))
             		.toList();
             return new Pair<>(query.getSingle(e), argsList);
-        } else if (query instanceof VariableString && !((VariableString) query).isSimple()) {
+        } else if (query instanceof VariableString queryString && !queryString.isSimple()) {
             return parseVariableQuery(e, (VariableString) query);
         }
         return new Pair<>(query.getSingle(e), null);
@@ -205,11 +205,11 @@ public class EffExecuteStatement extends Effect {
     }
     
     private Pair<String, Object> parseExpressionQuery(Expression<?> expr, Object expressionValue, boolean standaloneString) {
-        if (expr instanceof ExprUnsafe) {
+        if (expr instanceof ExprUnsafe unsafe) {
             if (standaloneString && expressionValue instanceof String) {
                 Skript.warning(
                         String.format("Unsafe may have been used unnecessarily. Try replacing 'unsafe %1$s' with %1$s",
-                                ((ExprUnsafe) expr).getRawExpression()));
+                        		unsafe.getRawExpression()));
             }
             return new Pair<>((String) expressionValue, null);
         } else {
@@ -308,8 +308,8 @@ public class EffExecuteStatement extends Effect {
     }
 
     private String getString(Object[] objects, int index) {
-        if (index >= 0 && index < objects.length && objects[index] instanceof String) {
-            return (String) objects[index];
+        if (index >= 0 && index < objects.length && objects[index] instanceof String str) {
+            return str;
         }
         return null;
     }
@@ -318,13 +318,13 @@ public class EffExecuteStatement extends Effect {
 
         //fix mediumblob and similar column types, so they return a String correctly
         if (obj != null) {
-            if (obj instanceof byte[]) {
-                obj = new String((byte[]) obj);
+            if (obj instanceof byte[] bytes) {
+                obj = new String(bytes);
 
                 //in some servers instead of being byte array, it appears as SerialBlob (depends on mc version, 1.12.2 is bvte array, 1.16.5 SerialBlob)
-            } else if (obj instanceof SerialBlob) {
+            } else if (obj instanceof SerialBlob blob) {
                 try {
-                    obj = new String(((SerialBlob) obj).getBinaryStream().readAllBytes());
+                    obj = new String(blob.getBinaryStream().readAllBytes());
                 } catch (IOException | SerialException ex) {
                     ex.printStackTrace();
                 }
@@ -360,7 +360,7 @@ public class EffExecuteStatement extends Effect {
         }
         dataSource = (Expression<HikariDataSource>) exprs[1];
         if (exprs[2] != null) {
-            if (query instanceof VariableString && !((VariableString) query).isSimple()) {
+            if (query instanceof VariableString queryString && !queryString.isSimple()) {
                 Skript.warning("Your query string contains expresions, but you've also provided query arguments. Consider using `unsafe` keyword before your query.");
             }
             queryArguments = (Expression<Object>) exprs[2];
diff --git a/src/main/java/com/btk5h/skriptdb/skript/ExprSQLQuery.java b/src/main/java/com/btk5h/skriptdb/skript/ExprSQLQuery.java
index 96be03d..1ba0831 100644
--- a/src/main/java/com/btk5h/skriptdb/skript/ExprSQLQuery.java
+++ b/src/main/java/com/btk5h/skriptdb/skript/ExprSQLQuery.java
@@ -30,8 +30,8 @@ public class ExprSQLQuery extends SimpleExpression<String> {
 
     @Override
     protected String[] get(Event e) {
-        if (e instanceof SQLQueryCompleteEvent) {
-            return new String[]{((SQLQueryCompleteEvent) e).getQuery()};
+        if (e instanceof SQLQueryCompleteEvent sqlEvent) {
+            return new String[]{ sqlEvent.getQuery() };
         }
         return null;
     }