Merge branch 'feature/issue_1018_SA_peformance_1'

Author: zgramana

src/main/java/com/couchbase/lite/BlobStore.java

@@ -108,7 +108,7 @@ private void verifyExistingStore() throws CouchbaseLiteException {
                 throw new CouchbaseLiteException(Status.UNAUTHORIZED);
             } else if (!encryptionAlg.equals(ENCRYPTION_ALGORITHM)) {
                 Log.w(Log.TAG_DATABASE, "BlobStore: Blob store uses unrecognized encryption '" +
-                        encryptionAlg + "'");
+                        encryptionAlg + '\'');
                 throw new CouchbaseLiteException(Status.UNAUTHORIZED);
             }
         } else if (!isMarkerExists) {
@@ -180,7 +180,7 @@ public boolean accept(File dir, String name) {
                     @Override
                     public void execute() throws ActionException {
                         Log.i(Log.TAG_DATABASE, "BlobStore: " +
-                                (newKey != null ? "encrypting" : "decrypting") + " " + path);
+                                (newKey != null ? "encrypting" : "decrypting") + ' ' + path);
                         Log.i(Log.TAG_DATABASE, "BlobStore: **No blobs to copy; done.**");
                         encryptionKey = newKey;
                         try {
@@ -216,7 +216,7 @@ public void execute() throws ActionException {
                 @Override
                 public void execute() throws ActionException {
                     Log.i(Log.TAG_DATABASE, "BlobStore: " +
-                            (newKey != null ? "encrypting" : "decrypting") + " " + path);
+                            (newKey != null ? "encrypting" : "decrypting") + ' ' + path);
                     if (tempStoreDir == null)
                         throw  new ActionException("Cannot create a temporary directory");
                 }
@@ -315,7 +315,7 @@ public boolean accept(File dir, String name) {
         });
 
         for (File file : files) {
-            String name = file.getName().substring(0);
+            String name = file.getName();
             name = name.substring(0, name.indexOf(FILE_EXTENSION));
             File dest = new File(directory, name.toUpperCase() + FILE_EXTENSION);
             file.renameTo(dest);

src/main/java/com/couchbase/lite/Database.java

@@ -675,7 +675,7 @@ public interface ChangeListener {
      */
     @InterfaceAudience.Public
     public String toString() {
-        return this.getClass().getName() + "[" + path + "]";
+        return this.getClass().getName() + '[' + path + ']';
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -1244,7 +1244,7 @@ SymmetricKey createSymmetricKey(Object keyOrPassword) throws CouchbaseLiteExcept
             rawKey = (byte[])keyOrPassword;
         } else {
             throw new CouchbaseLiteException("Key must be String or byte[" +
-                    SymmetricKey.KEY_SIZE + "]", Status.BAD_REQUEST);
+                    SymmetricKey.KEY_SIZE + ']', Status.BAD_REQUEST);
         }
 
         SymmetricKey symmetricKey = null;
@@ -1677,7 +1677,7 @@ public static List<String> parseCouchDBRevisionHistory(Map<String, Object> docPr
         if (start != null) {
             for (int i = 0; i < revIDs.size(); i++) {
                 String revID = revIDs.get(i);
-                revIDs.set(i, Integer.toString(start--) + "-" + revID);
+                revIDs.set(i, Integer.toString(start--) + '-' + revID);
             }
         }
         return revIDs;

src/main/java/com/couchbase/lite/Revision.java

@@ -254,7 +254,7 @@ public int hashCode() {
     @Override
     @InterfaceAudience.Public
     public String toString() {
-        return "{" + this.document.getId() + " #" + this.getId() + (isDeletion() ? "DEL" : "") + "}";
+        return '{' + this.document.getId() + " #" + this.getId() + (isDeletion() ? "DEL" : "") + '}';
     }
 
     /**

src/main/java/com/couchbase/lite/Status.java

@@ -85,7 +85,7 @@ public String getMessage() {
 
         @Override
         public String toString() {
-            return "HTTP " + code + " " + message;
+            return "HTTP " + code + ' ' + message;
         }
     }
 
@@ -162,7 +162,7 @@ public boolean isError() {
 
     @Override
     public String toString() {
-        return "Status: " + code + " (" + getHTTPStatus().toString() + ")";
+        return "Status: " + code + " (" + getHTTPStatus().toString() + ')';
     }
 
     public HTTPStatus getHTTPStatus() {

src/main/java/com/couchbase/lite/View.java

@@ -330,7 +330,7 @@ protected Status updateIndexes(List<View> views) throws CouchbaseLiteException {
     @InterfaceAudience.Private
     protected List<View> getViewsInGroup() {
         List<View> views = new ArrayList<View>();
-        int slash = name.indexOf("/");
+        int slash = name.indexOf('/');
         if (slash > 0) {
             String prefix = name.substring(0, slash + 1);
             for (View view : database.getAllViews()) {
@@ -371,7 +371,7 @@ public static Object keyForPrefixMatch(Object key, int depth) {
             return key;
         } else if (key instanceof String) {
             // Kludge: prefix match a string by appending max possible character value to it
-            return key + "\uffff";
+            return (String) key + '\uffff';
         } else if (key instanceof List) {
             List<Object> nuKey = new ArrayList<Object>(((List<Object>) key));
             if (depth == 1) {

src/main/java/com/couchbase/lite/auth/BasicAuthenticator.java

@@ -25,7 +25,7 @@ public boolean usesCookieBasedLogin() {
     @Override
     public String authUserInfo() {
         if (this.username != null && this.password != null) {
-            return this.username + ":" + this.password;
+            return this.username + ':' + this.password;
         }
         return super.authUserInfo();
     }

src/main/java/com/couchbase/lite/auth/TokenAuthenticator.java

@@ -31,7 +31,7 @@ public Map<String, String> loginParametersForSite(URL site) {
     public String loginPathForSite(URL site) {
         String path = loginPath;
         if (path != null && !path.startsWith("/")) {
-            path = "/" + path;
+            path = '/' + path;
         }
         return path;
     }

src/main/java/com/couchbase/lite/internal/RevisionInternal.java

@@ -194,7 +194,7 @@ public long getSequence() {
 
     @Override
     public String toString() {
-        return "{" + this.docID + " #" + this.revID + (deleted ? "DEL" : "") + "}";
+        return '{' + this.docID + " #" + this.revID + (deleted ? "DEL" : "") + '}';
     }
 
     /**
@@ -208,7 +208,7 @@ public int getGeneration() {
     public static int generationFromRevID(String revID) {
         if(revID == null) return 0;
         int generation = 0;
-        int dashPos = revID.indexOf("-");
+        int dashPos = revID.indexOf('-');
         if (dashPos > 0) {
             generation = Integer.parseInt(revID.substring(0, dashPos));
         }
@@ -217,7 +217,7 @@ public static int generationFromRevID(String revID) {
 
     public static String digestFromRevID(String revID) {
         String digest = "error";
-        int dashPos = revID.indexOf("-");
+        int dashPos = revID.indexOf('-');
         if (dashPos > 0) {
             digest = revID.substring(dashPos + 1);
             return digest;

src/main/java/com/couchbase/lite/replicator/BulkDownloader.java

@@ -92,7 +92,7 @@ public void run() {
     }
 
     public String toString() {
-        return this.getClass().getName() + "[" + url.getPath() + "]";
+        return this.getClass().getName() + '[' + url.getPath() + ']';
     }
 
     private static final int BUF_LEN = 1024;

src/main/java/com/couchbase/lite/replicator/ChangeTracker.java

@@ -191,7 +191,7 @@ public String getChangesFeedPath() {
                             throw new IllegalArgumentException(e);
                         }
                     }
-                    path += "&" + URLEncoder.encode(key) + "=" + URLEncoder.encode(value.toString());
+                    path += '&' + URLEncoder.encode(key) + '=' + URLEncoder.encode(value.toString());
                 }
             }
         }