Improve formatting

Author: Michael-A-McMahon

sample/src/main/java/oracle/r2dbc/samples/JdbcToR2dbc.java

@@ -140,6 +140,7 @@ public final class JdbcToR2dbc {
    * @return {@code DataSource} configured to connect with a database
    */
   static DataSource configureJdbc() throws SQLException {
+
     OracleDataSource dataSource = new oracle.jdbc.pool.OracleDataSource();
     dataSource.setDriverType("thin");
     dataSource.setServerName(DatabaseConfig.HOST);
@@ -148,6 +149,7 @@ static DataSource configureJdbc() throws SQLException {
     dataSource.setUser(DatabaseConfig.USER);
     dataSource.setPassword(DatabaseConfig.PASSWORD);
     return dataSource;
+
   }
 
   /**
@@ -157,6 +159,7 @@ static DataSource configureJdbc() throws SQLException {
    * @return {@code ConnectionFactory} configured to connect with a database
    */
   static ConnectionFactory configureR2dbc() {
+
     return ConnectionFactories.get(ConnectionFactoryOptions.builder()
       .option(DRIVER, "oracle")
       .option(HOST, DatabaseConfig.HOST)
@@ -165,15 +168,15 @@ static ConnectionFactory configureR2dbc() {
       .option(USER, DatabaseConfig.USER)
       .option(PASSWORD, DatabaseConfig.PASSWORD)
       .build());
+
   }
 
   /**
    * Executes a SQL query with JDBC. This method performs the same database
    * interactions as {@link #queryR2dbc(io.r2dbc.spi.Connection)}.
    * @return Value returned by a SQL query
    */
-  static String queryJdbc(java.sql.Connection connection)
-    throws SQLException {
+  static String queryJdbc(java.sql.Connection connection) throws SQLException {
 
     try (java.sql.Statement statement  = connection.createStatement()) {
       ResultSet resultSet =
@@ -184,6 +187,7 @@ static String queryJdbc(java.sql.Connection connection)
       else
         throw new NoSuchElementException("Query returned zero rows");
     }
+
   }
 
   /**
@@ -192,73 +196,79 @@ static String queryJdbc(java.sql.Connection connection)
    * @return Value returned by a SQL query
    */
   static Publisher<String> queryR2dbc(io.r2dbc.spi.Connection connection) {
+
     return Flux.from(connection.createStatement(
       "SELECT 'Hello, R2DBC!' FROM sys.dual")
       .execute())
       .flatMap(result ->
         result.map(row -> row.get(0, String.class)))
       .switchIfEmpty(Flux.error(
         new NoSuchElementException("Query returned zero rows")));
+
   }
 
   /**
    * Executes an INSERT with JDBC. This method performs the same database
    * interactions as {@link #insertR2dbc(io.r2dbc.spi.Connection)}.
    * @return Count of inserted rows.
    */
-  static int insertJdbc(java.sql.Connection connection)
-    throws SQLException {
+  static int insertJdbc(java.sql.Connection connection) throws SQLException {
+
     try (PreparedStatement preparedStatement = connection.prepareStatement(
       "INSERT INTO JdbcToR2dbcTable(id, value) VALUES (?, ?)")) {
       preparedStatement.setInt(1, 0);
       preparedStatement.setString(2, "JDBC");
       return preparedStatement.executeUpdate();
     }
+
   }
 
   /**
    * Executes an INSERT with R2DBC. This method performs the same database
    * interactions as {@link #insertJdbc(java.sql.Connection)}.
    * @return {@code Publisher} emitting the count of inserted rows.
    */
-  static Publisher<Integer> insertR2dbc(
-    io.r2dbc.spi.Connection connection) {
+  static Publisher<Integer> insertR2dbc(io.r2dbc.spi.Connection connection) {
+
     return Flux.from(connection.createStatement(
       "INSERT INTO JdbcToR2dbcTable(id, value) VALUES (?, ?)")
       .bind(0, 0)
       .bind(1, "R2DBC")
       .execute())
       .flatMap(Result::getRowsUpdated);
+
   }
 
   /**
    * Executes an UPDATE with JDBC. This method performs the same database
    * interactions as {@link #updateR2dbc(io.r2dbc.spi.Connection)}.
    * @return Count of updated rows.
    */
-  static int updateJdbc(java.sql.Connection connection)
-    throws SQLException {
+  static int updateJdbc(java.sql.Connection connection) throws SQLException {
+
     try (PreparedStatement preparedStatement = connection.prepareStatement(
       "UPDATE JdbcToR2dbcTable SET value = ? WHERE id = ?")) {
       preparedStatement.setString(1, "JDBC");
       preparedStatement.setInt(2, 0);
       return preparedStatement.executeUpdate();
     }
+
   }
 
   /**
    * Executes an UPDATE with R2DBC. This method performs the same database
    * interactions as {@link #updateJdbc(java.sql.Connection)}.
    * @return {@code Publisher} emitting the count of updated rows.
    */
-  static Publisher<Integer> updateR2dbc(
-    io.r2dbc.spi.Connection connection) {
+  static Publisher<Integer> updateR2dbc(io.r2dbc.spi.Connection connection) {
+
     return Flux.from(connection.createStatement(
       "UPDATE JdbcToR2dbcTable SET value = ? WHERE id = ?")
       .bind(0, "R2DBC")
       .bind(1, 0)
       .execute())
       .flatMap(Result::getRowsUpdated);
+
   }
 
   /**
@@ -268,8 +278,7 @@ static Publisher<Integer> updateR2dbc(
    * @param connection Database connection
    * @return Count of updated rows
    */
-  static int tryUpdateJdbc(java.sql.Connection connection)
-    throws SQLException {
+  static int tryUpdateJdbc(java.sql.Connection connection) throws SQLException {
 
     // Try to update the row
     int updateCount = updateJdbc(connection);
@@ -279,6 +288,7 @@ static int tryUpdateJdbc(java.sql.Connection connection)
       return insertJdbc(connection);
     else
       return updateCount;
+
   }
 
   /**
@@ -301,6 +311,7 @@ static Publisher<Integer> tryUpdateR2dbc(io.r2dbc.spi.Connection connection) {
           return Flux.just(updateCount);
 
       });
+
   }
 
   /**
@@ -311,8 +322,7 @@ static Publisher<Integer> tryUpdateR2dbc(io.r2dbc.spi.Connection connection) {
    * @param connection Database connection
    * @return Count of updated rows
    */
-  static int tryInsertJdbc(java.sql.Connection connection)
-    throws SQLException {
+  static int tryInsertJdbc(java.sql.Connection connection) throws SQLException {
 
     try {
       // Try to insert the row
@@ -327,6 +337,7 @@ static int tryInsertJdbc(java.sql.Connection connection)
         throw sqlException;
 
     }
+
   }
 
   /**
@@ -336,8 +347,7 @@ static int tryInsertJdbc(java.sql.Connection connection)
    * @param connection Database connection
    * @return {@code Publisher} emitting the count of updated rows.
    */
-  static Publisher<Integer> tryInsertR2dbc(
-    io.r2dbc.spi.Connection connection) {
+  static Publisher<Integer> tryInsertR2dbc(io.r2dbc.spi.Connection connection) {
 
     // Try to insert the row
     return Flux.from(insertR2dbc(connection))
@@ -350,6 +360,7 @@ static Publisher<Integer> tryInsertR2dbc(
           return Flux.error(r2dbcException);
 
       });
+
   }
 
   /**
@@ -364,11 +375,9 @@ static Publisher<Integer> tryInsertR2dbc(
    * @throws SQLException If the database interaction fails with an
    * unexpected error.
    */
-  static int loopJdbc(java.sql.Connection connection)
-    throws SQLException {
+  static int loopJdbc(java.sql.Connection connection) throws SQLException {
 
     do {
-
       try {
         // Try to update the row, or insert it if it does not exist
         return tryUpdateJdbc(connection);
@@ -381,8 +390,8 @@ static int loopJdbc(java.sql.Connection connection)
           throw sqlException;
 
       }
-
     } while (true);
+
   }
 
   /**
@@ -427,6 +436,7 @@ static Publisher<Integer> loopR2dbc(io.r2dbc.spi.Connection connection) {
           return loopR2dbc(connection);
 
       });
+
   }
 
   /**