Merge remote-tracking branch 'symbolic_name_origin_or_upstream/pr/86'…

… into feature/CONJ-325 # Conflicts: # src/main/java/org/mariadb/jdbc/MariaDbConnection.java # src/main/java/org/mariadb/jdbc/UrlParser.java # src/main/java/org/mariadb/jdbc/internal/failover/impl/AuroraListener.java # src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java # src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java # src/main/java/org/mariadb/jdbc/internal/stream/PacketOutputStream.java # src/main/java/org/mariadb/jdbc/internal/util/Utils.java # src/main/java/org/mariadb/jdbc/internal/util/dao/PrepareResult.java # src/test/java/org/mariadb/jdbc/BaseTest.java # src/test/java/org/mariadb/jdbc/DatabaseMetadataTest.java # src/test/java/org/mariadb/jdbc/failover/AuroraFailoverTest.java
mariadb-corporation · Aug 1, 2016 · 0fefe45 · 0fefe45
2 parents 8e067d0 + 911fee9
commit 0fefe45
Show file tree

Hide file tree

Showing 22 changed files with 806 additions and 156 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/HostAddress.java b/src/main/java/org/mariadb/jdbc/HostAddress.java
@@ -50,8 +50,8 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 
 package org.mariadb.jdbc;
 
-import org.mariadb.jdbc.internal.util.constant.ParameterConstant;
 import org.mariadb.jdbc.internal.util.constant.HaMode;
+import org.mariadb.jdbc.internal.util.constant.ParameterConstant;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -107,11 +107,11 @@ public static List<HostAddress> parse(String spec, HaMode haMode) {
         String[] tokens = spec.trim().split(",");
         List<HostAddress> arr = new ArrayList<>(tokens.length);
 
-        for (int i = 0; i < tokens.length; i++) {
-            if (tokens[i].startsWith("address=")) {
-                arr.add(parseParameterHostAddress(tokens[i]));
+        for (String token : tokens) {
+            if (token.startsWith("address=")) {
+                arr.add(parseParameterHostAddress(token));
             } else {
-                arr.add(parseSimpleHostAddress(tokens[i]));
+                arr.add(parseSimpleHostAddress(token));
             }
         }
 
@@ -242,13 +242,7 @@ public boolean equals(Object obj) {
 
         HostAddress that = (HostAddress) obj;
 
-        if (port != that.port) {
-            return false;
-        }
-        if (host != null ? !host.equals(that.host) : that.host != null) {
-            return false;
-        }
-        return !(type != null ? !type.equals(that.type) : that.type != null);
+        return port == that.port && (host != null ? host.equals(that.host) : that.host == null && !(type != null ? !type.equals(that.type) : that.type != null));
 
     }
 
@@ -261,4 +255,3 @@ public int hashCode() {
 
 
 }
-
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbResultSetMetaData.java b/src/main/java/org/mariadb/jdbc/MariaDbResultSetMetaData.java
@@ -249,7 +249,7 @@ public int getScale(final int column) throws SQLException {
      * @throws SQLException if a database access error occurs
      */
     public String getTableName(final int column) throws SQLException {
-        if (returnTableAlias == true) {
+        if (returnTableAlias) {
             return getColumnInformation(column).getTable();
         } else {
             return getColumnInformation(column).getOriginalTable();

diff --git a/src/main/java/org/mariadb/jdbc/internal/failover/FailoverProxy.java b/src/main/java/org/mariadb/jdbc/internal/failover/FailoverProxy.java
@@ -85,7 +85,7 @@ public class FailoverProxy implements InvocationHandler {
     private Listener listener;
 
     /**
-     * Procy constructor.
+     * Proxy constructor.
      * @param listener failover implementation.
      * @param lock synchronisation lock
      * @throws QueryException if connection error occur
@@ -245,10 +245,7 @@ private Object handleFailOver(QueryException qe, Method method, Object[] args, P
      * @return true if there has been a connection error that must be handled by failover
      */
     public boolean hasToHandleFailover(QueryException exception) {
-        if (exception.getSqlState() != null && exception.getSqlState().startsWith("08")) {
-            return true;
-        }
-        return false;
+        return exception.getSqlState() != null && exception.getSqlState().startsWith("08");
     }
 
     /**