Reformat

rainbowdashlabs · Jan 25, 2024 · 79b39e5 · 79b39e5
1 parent f892745
commit 79b39e5
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -79,8 +79,8 @@ subprojects {
 
 indra {
     javaVersions {
-        target(15)
-        testWith(15)
+        target(17)
+        testWith(17)
     }
 
     github("rainbowdashlabs", "sadu") {

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/TokenizedQuery.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/TokenizedQuery.java
@@ -21,7 +21,7 @@ public class TokenizedQuery {
 
     public TokenizedQuery(String sql, Map<Integer, Integer> indexToken, Map<String, List<Integer>> namedToken) {
         this.sql = sql;
-        this.tokenizedSql = PARAM_TOKEN.matcher(sql).replaceAll("?");
+        tokenizedSql = PARAM_TOKEN.matcher(sql).replaceAll("?");
         this.indexToken = indexToken;
         this.namedToken = namedToken;
     }

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/calls/BatchCall.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/calls/BatchCall.java
@@ -19,8 +19,9 @@ public BatchCall(Call call) {
         this();
         calls.add(call);
     }
+
     public BatchCall() {
-        this.calls = new ArrayList<>();
+        calls = new ArrayList<>();
     }
 
     public BatchCall(List<Call> calls) {
@@ -32,7 +33,7 @@ public BatchCall add(Call call) {
         return this;
     }
 
-    public BatchCall combine(BatchCall call){
+    public BatchCall combine(BatchCall call) {
         calls.addAll(call.calls());
         return this;
     }

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/calls/ResultCall.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/calls/ResultCall.java
@@ -1,3 +1,9 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
 package de.chojo.sadu.queries.calls;
 
 import de.chojo.sadu.mapper.util.Results;

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/AppendedQuery.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/AppendedQuery.java
@@ -1,3 +1,9 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
 package de.chojo.sadu.queries.stages;
 
 import de.chojo.sadu.queries.TokenizedQuery;

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/Query.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/Query.java
@@ -20,8 +20,8 @@
 public class Query implements DataSourceProvider, ConnectionProvider, QueryProvider {
 
     private final DataSource dataSource;
-    private Connection connection;
     private final ResultStorage storage = new ResultStorage();
+    private Connection connection;
 
     private Query(DataSource dataSource) {
         this.dataSource = dataSource;
@@ -52,11 +52,11 @@ public Connection connection() throws SQLException {
     }
 
     @Override
-    public Query query(){
+    public Query query() {
         return this;
     }
 
-    public ResultStorage storage(){
+    public ResultStorage storage() {
         return storage;
     }
 }
diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/base/QueryProvider.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/base/QueryProvider.java
@@ -1,3 +1,9 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
 package de.chojo.sadu.queries.stages.base;
 
 import de.chojo.sadu.base.DataSourceProvider;
@@ -11,12 +17,12 @@ public interface QueryProvider extends ConnectionProvider, DataSourceProvider {
     Query query();
 
     @Override
-    default DataSource source(){
+    default DataSource source() {
         return query().source();
     }
 
     @Override
-    default Connection connection() throws SQLException{
+    default Connection connection() throws SQLException {
         return query().connection();
     }
 }
diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/calls/CallSupplier.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/calls/CallSupplier.java
@@ -1,3 +1,9 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
 package de.chojo.sadu.queries.stages.calls;
 
 import de.chojo.sadu.queries.calls.Calls;

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/parsed/CalledBatchQuery.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/parsed/CalledBatchQuery.java
@@ -41,7 +41,7 @@ public ManipulationBatchQuery update() {
                 // TODO: logging
             }
         }
-        return new ManipulationBatchQuery(this,changed);
+        return new ManipulationBatchQuery(this, changed);
     }
 
     public ManipulationBatchQuery delete() {

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/parsed/CalledSingletonQuery.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/parsed/CalledSingletonQuery.java
@@ -12,14 +12,11 @@
 import de.chojo.sadu.queries.calls.SingletonCall;
 import de.chojo.sadu.queries.stages.ParsedQuery;
 import de.chojo.sadu.queries.stages.Query;
-import de.chojo.sadu.queries.stages.base.ConnectionProvider;
 import de.chojo.sadu.queries.stages.base.QueryProvider;
 import de.chojo.sadu.queries.stages.mapped.ManipulationQuery;
 import de.chojo.sadu.queries.stages.mapped.MappedQuery;
 import de.chojo.sadu.wrapper.util.Row;
 
-import javax.sql.DataSource;
-import java.sql.Connection;
 import java.sql.SQLException;
 
 public class CalledSingletonQuery implements QueryProvider {

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/results/Result.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/stages/results/Result.java
@@ -1,6 +1,10 @@
-package de.chojo.sadu.queries.stages.results;
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
 
-import de.chojo.sadu.queries.stages.base.QueryProvider;
+package de.chojo.sadu.queries.stages.results;
 
 public interface Result<T> {
     T result();

diff --git a/sadu-queries2/src/main/java/de/chojo/sadu/queries/storage/ResultStorage.java b/sadu-queries2/src/main/java/de/chojo/sadu/queries/storage/ResultStorage.java
@@ -1,3 +1,9 @@
+/*
+ *     SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */
+
 package de.chojo.sadu.queries.storage;
 
 import de.chojo.sadu.queries.stages.results.Result;