Reformat all files in the project via IJ

Uncheck: * Optimize imports * Rearrange entries * Cleanup code
atlassian-labs · Dec 3, 2020 · d4d692a · d4d692a
1 parent 99f4fb9
commit d4d692a
Show file tree

Hide file tree

Showing 14 changed files with 242 additions and 79 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -107,7 +107,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = never
-ij_java_imports_layout = *,|,javax.**,java.**,|,$*
+ij_java_imports_layout = *, |, javax.**, java.**, |, $*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true
@@ -255,7 +255,7 @@ ij_editorconfig_space_before_colon = false
 ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
 
-[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
+[{*.gradle.kts, *.kt, *.kts, *.main.kts}]
 ij_continuation_indent_size = 4
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
@@ -335,7 +335,7 @@ ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 0
 ij_kotlin_wrap_first_method_in_call_chain = false
 
-[{*.yaml,*.yml}]
+[{*.yaml, *.yml}]
 indent_size = 2
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true

diff --git a/src/main/java/com/atlassian/db/replica/api/DualConnection.java b/src/main/java/com/atlassian/db/replica/api/DualConnection.java
@@ -28,7 +28,8 @@ public class DualConnection implements Connection {
     private DualConnection(
         ConnectionProvider connectionProvider,
         ReplicaConsistency consistency,
-        DualCall dualCall) {
+        DualCall dualCall
+    ) {
         this.connectionProvider = new ReplicaConnectionProvider(connectionProvider, consistency);
         this.consistency = consistency;
         this.dualCall = dualCall;

diff --git a/src/main/java/com/atlassian/db/replica/internal/DelegatingPreparedStatement.java b/src/main/java/com/atlassian/db/replica/internal/DelegatingPreparedStatement.java
@@ -7,7 +7,7 @@
 import java.sql.Date;
 import java.util.*;
 
-public class DelegatingPreparedStatement implements PreparedStatement  {
+public class DelegatingPreparedStatement implements PreparedStatement {
 
     private final PreparedStatement delegate;
 

diff --git a/src/main/java/com/atlassian/db/replica/internal/ReplicaPreparedStatement.java b/src/main/java/com/atlassian/db/replica/internal/ReplicaPreparedStatement.java
@@ -276,7 +276,11 @@ public void addBatch() throws SQLException {
     public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
         checkClosed();
         addOperation(
-            (StatementOperation<PreparedStatement>) statement -> statement.setCharacterStream(parameterIndex, reader, length)
+            (StatementOperation<PreparedStatement>) statement -> statement.setCharacterStream(
+                parameterIndex,
+                reader,
+                length
+            )
         );
     }
 
@@ -389,7 +393,11 @@ public void setNString(int parameterIndex, String value) throws SQLException {
     public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
         checkClosed();
         addOperation(
-            (StatementOperation<PreparedStatement>) statement -> statement.setNCharacterStream(parameterIndex, value, length)
+            (StatementOperation<PreparedStatement>) statement -> statement.setNCharacterStream(
+                parameterIndex,
+                value,
+                length
+            )
         );
     }
 
@@ -437,7 +445,12 @@ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException
     public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
         checkClosed();
         addOperation(
-            (StatementOperation<PreparedStatement>) statement -> statement.setObject(parameterIndex, x, targetSqlType, scaleOrLength)
+            (StatementOperation<PreparedStatement>) statement -> statement.setObject(
+                parameterIndex,
+                x,
+                targetSqlType,
+                scaleOrLength
+            )
         );
     }
 
@@ -461,7 +474,11 @@ public void setBinaryStream(int parameterIndex, InputStream x, long length) thro
     public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
         checkClosed();
         addOperation(
-            (StatementOperation<PreparedStatement>) statement -> statement.setCharacterStream(parameterIndex, reader, length)
+            (StatementOperation<PreparedStatement>) statement -> statement.setCharacterStream(
+                parameterIndex,
+                reader,
+                length
+            )
         );
     }
 

diff --git a/src/main/java/com/atlassian/db/replica/internal/ReplicaStatement.java b/src/main/java/com/atlassian/db/replica/internal/ReplicaStatement.java
@@ -507,7 +507,8 @@ void recordWriteAfterQueryExecution() throws SQLException {
     public Statement getReadStatement(String sql) {
         // if write connection is already initialized, but the current statement is null
         // we should use a write statement, regardless of the fact that readStatement has been called.
-        if (connectionProvider.hasWriteConnection() || isSelectForUpdate(sql) || isFunctionCall(sql) || isUpdate(sql) || isDelete(sql)) {
+        if (connectionProvider.hasWriteConnection() || isSelectForUpdate(sql) || isFunctionCall(sql) || isUpdate(sql) || isDelete(
+            sql)) {
             return getWriteStatement();
         }
         setCurrentStatement(getCurrentStatement() != null ? getCurrentStatement() : readStatement.get());

diff --git a/src/main/java/com/atlassian/db/replica/internal/circuitbreaker/BreakerCallableStatement.java b/src/main/java/com/atlassian/db/replica/internal/circuitbreaker/BreakerCallableStatement.java
@@ -596,8 +596,10 @@ public <T> T getObject(String parameterName, Class<T> type) throws SQLException
     }
 
     @Override
-    public void setObject(String parameterName, Object x, SQLType targetSqlType,
-                          int scaleOrLength) throws SQLException {
+    public void setObject(
+        String parameterName, Object x, SQLType targetSqlType,
+        int scaleOrLength
+    ) throws SQLException {
         breakerHandler.handle(() -> delegate.setObject(parameterName, x, targetSqlType, scaleOrLength));
     }
 
@@ -612,14 +614,18 @@ public void registerOutParameter(int parameterIndex, SQLType sqlType) throws SQL
     }
 
     @Override
-    public void registerOutParameter(int parameterIndex, SQLType sqlType,
-                                     int scale) throws SQLException {
+    public void registerOutParameter(
+        int parameterIndex, SQLType sqlType,
+        int scale
+    ) throws SQLException {
         breakerHandler.handle(() -> delegate.registerOutParameter(parameterIndex, sqlType, scale));
     }
 
     @Override
-    public void registerOutParameter(int parameterIndex, SQLType sqlType,
-                                     String typeName) throws SQLException {
+    public void registerOutParameter(
+        int parameterIndex, SQLType sqlType,
+        String typeName
+    ) throws SQLException {
         breakerHandler.handle(() -> delegate.registerOutParameter(parameterIndex, sqlType, typeName));
     }
 
@@ -629,14 +635,18 @@ public void registerOutParameter(String parameterName, SQLType sqlType) throws S
     }
 
     @Override
-    public void registerOutParameter(String parameterName, SQLType sqlType,
-                                     int scale) throws SQLException {
+    public void registerOutParameter(
+        String parameterName, SQLType sqlType,
+        int scale
+    ) throws SQLException {
         breakerHandler.handle(() -> delegate.registerOutParameter(parameterName, sqlType, scale));
     }
 
     @Override
-    public void registerOutParameter(String parameterName, SQLType sqlType,
-                                     String typeName) throws SQLException {
+    public void registerOutParameter(
+        String parameterName, SQLType sqlType,
+        String typeName
+    ) throws SQLException {
         breakerHandler.handle(() -> delegate.registerOutParameter(parameterName, sqlType, typeName));
     }
 }
diff --git a/src/main/java/com/atlassian/db/replica/internal/circuitbreaker/BreakerConnection.java b/src/main/java/com/atlassian/db/replica/internal/circuitbreaker/BreakerConnection.java
@@ -31,12 +31,18 @@ public BreakerConnection(Connection delegate, BreakerHandler breakerHandler) {
 
     @Override
     public Statement createStatement() throws SQLException {
-        return new BreakerStatement(breakerHandler.handle((SqlCall<Statement>) delegate::createStatement), breakerHandler);
+        return new BreakerStatement(
+            breakerHandler.handle((SqlCall<Statement>) delegate::createStatement),
+            breakerHandler
+        );
     }
 
     @Override
     public PreparedStatement prepareStatement(String sql) throws SQLException {
-        return new BreakerPreparedStatement(breakerHandler.handle(() -> delegate.prepareStatement(sql)), breakerHandler);
+        return new BreakerPreparedStatement(
+            breakerHandler.handle(() -> delegate.prepareStatement(sql)),
+            breakerHandler
+        );
     }
 
     @Override
@@ -127,11 +133,18 @@ public void clearWarnings() throws SQLException {
 
     @Override
     public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
-        return new BreakerStatement(breakerHandler.handle(() -> delegate.createStatement(resultSetType, resultSetConcurrency)), breakerHandler);
+        return new BreakerStatement(breakerHandler.handle(() -> delegate.createStatement(
+            resultSetType,
+            resultSetConcurrency
+        )), breakerHandler);
     }
 
     @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
+    public PreparedStatement prepareStatement(
+        String sql,
+        int resultSetType,
+        int resultSetConcurrency
+    ) throws SQLException {
         return new BreakerPreparedStatement(
             breakerHandler.handle(() -> delegate.prepareStatement(sql, resultSetType, resultSetConcurrency)),
             breakerHandler
@@ -187,25 +200,53 @@ public void releaseSavepoint(Savepoint savepoint) throws SQLException {
     }
 
     @Override
-    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+    public Statement createStatement(
+        int resultSetType,
+        int resultSetConcurrency,
+        int resultSetHoldability
+    ) throws SQLException {
         return new BreakerStatement(
-            breakerHandler.handle(() -> delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability)),
+            breakerHandler.handle(() -> delegate.createStatement(
+                resultSetType,
+                resultSetConcurrency,
+                resultSetHoldability
+            )),
             breakerHandler
         );
     }
 
     @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+    public PreparedStatement prepareStatement(
+        String sql,
+        int resultSetType,
+        int resultSetConcurrency,
+        int resultSetHoldability
+    ) throws SQLException {
         return new BreakerPreparedStatement(
-            breakerHandler.handle(() -> delegate.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability)),
+            breakerHandler.handle(() -> delegate.prepareStatement(
+                sql,
+                resultSetType,
+                resultSetConcurrency,
+                resultSetHoldability
+            )),
             breakerHandler
         );
     }
 
     @Override
-    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+    public CallableStatement prepareCall(
+        String sql,
+        int resultSetType,
+        int resultSetConcurrency,
+        int resultSetHoldability
+    ) throws SQLException {
         return new BreakerCallableStatement(
-            breakerHandler.handle(() -> delegate.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability)),
+            breakerHandler.handle(() -> delegate.prepareCall(
+                sql,
+                resultSetType,
+                resultSetConcurrency,
+                resultSetHoldability
+            )),
             breakerHandler
         );
     }

diff --git a/src/main/java/com/atlassian/db/replica/internal/circuitbreaker/BreakerPreparedStatement.java b/src/main/java/com/atlassian/db/replica/internal/circuitbreaker/BreakerPreparedStatement.java
@@ -311,8 +311,10 @@ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
     }
 
     @Override
-    public void setObject(int parameterIndex, Object x, SQLType targetSqlType,
-                          int scaleOrLength) throws SQLException {
+    public void setObject(
+        int parameterIndex, Object x, SQLType targetSqlType,
+        int scaleOrLength
+    ) throws SQLException {
         breakerHandler.handle(() -> delegate.setObject(parameterIndex, x, targetSqlType, scaleOrLength));
 
     }