Merge branch 'master' into release/1.2.0

* master:
  support asterisk '*' as regal character for windows
  - update getViewStorage() method signature and according changes - update fileNameToViewName() and viewNameToFileName() to throw Exception if error occurs instead of return null.

Author: hideki

src/main/java/com/couchbase/lite/store/ForestDBStore.java

@@ -1047,24 +1047,20 @@ public Status run() {
     }
 
     @Override
-    public ViewStore getViewStorage(String name, boolean create) {
-        try {
-            return new ForestDBViewStore(this, name, create);
-        } catch (CouchbaseLiteException e) {
-            if(e.getCBLStatus().getCode() != Status.NOT_FOUND)
-                Log.e(TAG, "Error in getViewStorage()", e);
-            return null;
-        }
+    public ViewStore getViewStorage(String name, boolean create) throws CouchbaseLiteException {
+        return new ForestDBViewStore(this, name, create);
     }
 
     @Override
     public List<String> getAllViewNames() {
         List<String> result = new ArrayList<String>();
         String[] fileNames = new File(directory).list();
-        for(String filename : fileNames){
-            String viewName = ForestDBViewStore.fileNameToViewName(filename);
-            if(viewName != null)
-                result.add(viewName);
+        for (String filename : fileNames) {
+            try {
+                result.add(ForestDBViewStore.fileNameToViewName(filename));
+            } catch (CouchbaseLiteException e) {
+                Log.w(TAG, "Error in fileNameToViewName(): filename=" + filename, e);
+            }
         }
         return result;
     }
@@ -1311,8 +1307,12 @@ public Action actionToChangeEncryptionKey(final SymmetricKey newKey) {
         // Re-key the views!
         List<String> viewNames = getAllViewNames();
         for (String viewName : viewNames) {
-            ForestDBViewStore viewStorage = (ForestDBViewStore) getViewStorage(viewName, true);
-            action.add(viewStorage.getActionToChangeEncryptionKey());
+            try {
+                ForestDBViewStore viewStorage = (ForestDBViewStore) getViewStorage(viewName, true);
+                action.add(viewStorage.getActionToChangeEncryptionKey());
+            } catch (CouchbaseLiteException ex) {
+                Log.w(TAG, "Error in getViewStorage() viewName=" + viewName, ex);
+            }
         }
 
         // Re-key the database:

src/main/java/com/couchbase/lite/store/ForestDBViewStore.java

@@ -39,7 +39,6 @@
 import com.couchbase.lite.support.action.ActionException;
 import com.couchbase.lite.support.security.SymmetricKey;
 import com.couchbase.lite.util.Log;
-import com.fasterxml.jackson.core.JsonProcessingException;
 
 import java.io.File;
 import java.io.IOException;
@@ -702,33 +701,47 @@ public void execute() throws ActionException {
     // Internal (Protected/Private) Static Methods
     ///////////////////////////////////////////////////////////////////////////
 
-    protected static String fileNameToViewName(String fileName) {
+    protected static String fileNameToViewName(String fileName) throws CouchbaseLiteException {
         if (!fileName.endsWith(kViewIndexPathExtension))
-            return null;
+            throw new CouchbaseLiteException(Status.BAD_PARAM);
         if (fileName.startsWith("."))
-            return null;
+            throw new CouchbaseLiteException(Status.BAD_PARAM);
+
         String viewName = fileName.substring(0, fileName.indexOf("."));
-        try {
-            viewName = isWindows() ? URLDecoder.decode(viewName, "UTF-8") : viewName.replaceAll(":", "/");
-        }catch(UnsupportedEncodingException ex){
-            Log.w(TAG, "Error to url encode: " + viewName ,ex);
-        }
+        viewName = isWindows() ? unescapeViewNameWindows(viewName) : viewName.replaceAll(":", "/");
         return viewName;
     }
 
-    private static String viewNameToFileName(String viewName) {
+    private static String viewNameToFileName(String viewName) throws CouchbaseLiteException {
         if (viewName.startsWith(".") || viewName.indexOf(":") > 0)
-            return null;
-        try {
-            viewName = isWindows() ? URLEncoder.encode(viewName, "UTF-8") : viewName.replaceAll("/", ":");
-        }catch(UnsupportedEncodingException ex){
-            Log.w(TAG, "Error to url decode: " + viewName, ex);
-        }
+            throw new CouchbaseLiteException(Status.BAD_PARAM);
+
+        viewName = isWindows() ? escapeViewNameWindows(viewName) : viewName.replaceAll("/", ":");
+
         return viewName + "." + kViewIndexPathExtension;
     }
 
+    private static String escapeViewNameWindows(String viewName)throws CouchbaseLiteException {
+        try {
+            viewName = URLEncoder.encode(viewName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Log.w(TAG, "Error to url decode: " + viewName, e);
+            throw new CouchbaseLiteException(e, Status.BAD_ENCODING);
+        }
+        viewName = viewName.replaceAll("\\*", "%2A");
+        return viewName;
+    }
 
-
+    private static String unescapeViewNameWindows(String viewName)throws CouchbaseLiteException {
+        viewName = viewName.replaceAll("%2A", "*");
+        try {
+            viewName = URLDecoder.decode(viewName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Log.w(TAG, "Error to url decode: " + viewName, e);
+            throw new CouchbaseLiteException(e, Status.BAD_ENCODING);
+        }
+        return viewName;
+    }
     private static String OS = System.getProperty("os.name").toLowerCase();
 
     private static boolean isWindows(){