Merge pull request #157 from couchbaselabs/pr/CBL-7448

CBL-7448 : Update Test App to use CBL android 4.0 API

Author: Aniket392

CBLClient/Apps/CBLTestServer-Android/app/build.gradle

@@ -27,7 +27,7 @@ android {
     defaultConfig {
         applicationId 'com.couchbase.TestServerApp'
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName DEF_VERSION
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'

CBLClient/Apps/CBLTestServer-Android/app/src/androidTest/java/com/couchbase/CouchbaseLiteServ/LogTest.java

@@ -22,10 +22,8 @@
 
 import com.couchbase.mobiletestkit.javacommon.*;
 import com.couchbase.mobiletestkit.javacommon.RequestHandler.*;
-import com.couchbase.lite.Database;
-import com.couchbase.lite.FileLogger;
 import com.couchbase.lite.LogDomain;
-import com.couchbase.lite.LogLevel;
+import com.couchbase.lite.internal.logging.Log;
 
 
 public class LogTest {
@@ -52,17 +50,13 @@ public void testLogZipper() throws Exception {
 
         Assert.assertNotNull(data);
         Assert.assertEquals("application/zip", data.contentType);
-        // I don't know a good way to test the contents of the zip data.  Pick a random number...
         Assert.assertTrue(data.data.length > 20);
     }
 
     private void writeAllLogs(String message) {
-        FileLogger logger = Database.log.getFile();
-        logger.log(LogLevel.DEBUG, LogDomain.DATABASE, message);
-        logger.log(LogLevel.VERBOSE, LogDomain.DATABASE, message);
-        logger.log(LogLevel.INFO, LogDomain.DATABASE, message);
-        logger.log(LogLevel.WARNING, LogDomain.DATABASE, message);
-        logger.log(LogLevel.ERROR, LogDomain.DATABASE, message);
+        Log.d(LogDomain.DATABASE, message);
+        Log.i(LogDomain.DATABASE, message);
+        Log.w(LogDomain.DATABASE, message);
+        Log.e(LogDomain.DATABASE, message);
     }
-}
-
+}

CBLClient/Apps/CBLTestServer-Android/app/src/main/AndroidManifest.xml

@@ -16,7 +16,8 @@
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config"
         >
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

CBLClient/Apps/CBLTestServer-Android/app/src/main/java/com/couchbase/CouchbaseLiteServ/TestServerContext.java

@@ -2,6 +2,7 @@
 
 import com.couchbase.lite.CouchbaseLiteException;
 import com.couchbase.lite.KeyStoreUtils;
+import com.couchbase.lite.KeyUsage;
 import com.couchbase.lite.TLSIdentity;
 import com.couchbase.mobiletestkit.javacommon.Context;
 import com.couchbase.mobiletestkit.javacommon.util.Log;
@@ -12,8 +13,6 @@
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableEntryException;
@@ -25,15 +24,13 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.security.NoSuchProviderException;
-import java.security.UnrecoverableEntryException;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
 import java.net.URL;
 import java.net.URISyntaxException;
 
@@ -117,7 +114,10 @@ public TLSIdentity getCreateIdentity() {
         String alias = UUID.randomUUID().toString();
         TLSIdentity identity = null;
         try {
-            identity = TLSIdentity.createIdentity(true, X509Attributes, certTime, alias);
+            Set<KeyUsage> keyUsage = new HashSet<>();
+            keyUsage.add(KeyUsage.SERVER_AUTH);
+            keyUsage.add(KeyUsage.CLIENT_AUTH);
+            identity = TLSIdentity.createIdentity(keyUsage, X509Attributes, certTime, alias);
         } catch (CouchbaseLiteException e) {
             e.printStackTrace();
         }

CBLClient/Apps/CBLTestServer-Java-Desktop/build.gradle

@@ -24,6 +24,7 @@ jar {
     archiveAppendix = 'Desktop'
     archiveVersion = COUCHBASE_LITE_JAVA_VERSION
     archiveClassifier = 'enterprise'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
     manifest {
         attributes('Main-Class': 'com.couchbase.mobiletestkit.javatestserver.TestServerMain')
@@ -37,6 +38,7 @@ repositories {
     mavenCentral()
     maven {
         url 'http://proget.build.couchbase.com/maven2/internalmaven/'
+        allowInsecureProtocol = true
         // Release repo
         // url 'https://mobile.maven.couchbase.com/maven2/dev/'
     }

CBLClient/Apps/CBLTestServer-Java-Desktop/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

CBLClient/Apps/CBLTestServer-Java-WS/build.gradle

@@ -23,6 +23,7 @@ repositories {
     mavenCentral()
     maven {
         url "http://proget.build.couchbase.com/maven2/internalmaven/"
+        allowInsecureProtocol = true
     }
 }
 
@@ -39,7 +40,7 @@ sourceSets {
 dependencies {
     providedCompile "com.couchbase.lite:couchbase-lite-java-ee:${COUCHBASE_LITE_JAVA_VERSION}"
     implementation 'com.google.code.gson:gson:2.8.5'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
     providedCompile "javax.servlet:javax.servlet-api:4.0.1"
 }
 

CBLClient/Apps/CBLTestServer-Java-WS/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

CBLClient/Apps/CBLTestServer-Java-WS/src/main/java/com/couchbase/javaws/TestServerWS.java

@@ -1,9 +1,10 @@
 package com.couchbase.javaws;
 
+import com.couchbase.lite.logging.ConsoleLogSink;
+import com.couchbase.lite.logging.LogSinks;
 import com.couchbase.mobiletestkit.javacommon.*;
 import com.couchbase.mobiletestkit.javacommon.util.Log;
 import com.couchbase.lite.CouchbaseLite;
-import com.couchbase.lite.Database;
 import com.couchbase.lite.LogDomain;
 import com.couchbase.lite.LogLevel;
 import com.google.gson.Gson;
@@ -28,9 +29,7 @@ public class TestServerWS extends HttpServlet {
     @Override
     public void init() throws ServletException {
         CouchbaseLite.init();
-        Database.log.getConsole().setLevel(LogLevel.DEBUG);
-        Database.log.getConsole().setDomains(LogDomain.ALL_DOMAINS);
-
+        LogSinks.get().setConsole(new ConsoleLogSink(LogLevel.DEBUG, LogDomain.ALL));
         Log.init(new TestServerLogger());
     }
 

CBLClient/Apps/JavaRequestHandlers/src/main/java/com/couchbase/mobiletestkit/javacommon/RequestHandler/CollectionRequestHandler.java

@@ -8,13 +8,14 @@
 import java.util.Set;
 
 import com.couchbase.lite.Blob;
+import com.couchbase.lite.CollectionChange;
+import com.couchbase.lite.CollectionChangeListener;
 import com.couchbase.lite.CouchbaseLiteException;
 import com.couchbase.lite.DataSource;
 import com.couchbase.lite.Database;
 import com.couchbase.lite.Expression;
-import com.couchbase.lite.Index;
 import com.couchbase.lite.IndexConfiguration;
-import com.couchbase.lite.Limit;
+import com.couchbase.lite.ListenerToken;
 import com.couchbase.lite.Meta;
 import com.couchbase.lite.Query;
 import com.couchbase.lite.QueryBuilder;
@@ -30,6 +31,7 @@
 import com.couchbase.lite.Document;
 import com.couchbase.lite.MutableDocument;
 import com.couchbase.mobiletestkit.javacommon.RequestHandlerDispatcher;
+import com.couchbase.mobiletestkit.javacommon.util.ConcurrentExecutor;
 import com.couchbase.mobiletestkit.javacommon.util.Log;
 
 public class CollectionRequestHandler {
@@ -314,4 +316,61 @@ else if (attItemValue.containsKey("digest")) {
 
         return data;
     }
+
+
+    public ListenerToken addChangeListener(Args args) throws CouchbaseLiteException {
+        Database database = args.get("database");
+        ListenerToken token;
+        if (args.contain("docId")) {
+            String docId = args.get("docId");
+            MyDocumentChangeListener changeListener = new MyDocumentChangeListener();
+            token = database.getDefaultCollection().addDocumentChangeListener(docId, ConcurrentExecutor.EXECUTOR, changeListener);
+        }
+        else {
+            MyCollectionChangeListener changeListener = new MyCollectionChangeListener();
+            token = database.getDefaultCollection().addChangeListener(ConcurrentExecutor.EXECUTOR, changeListener);
+        }
+        return token;
+    }
+
+    public void removeChangeListener(Args args) {
+        Database database = args.get("database");
+        ListenerToken token = args.get("changeListenerToken");
+        token.remove();
+    }
+
+    public int databaseChangeListenerChangesCount(Args args) {
+        MyCollectionChangeListener changeListener = args.get("changeListener");
+        return changeListener.getChanges().size();
+    }
+
+    public CollectionChange databaseChangeListenerGetChange(Args args) {
+        MyCollectionChangeListener changeListener = args.get("changeListener");
+        int index = args.get("index");
+        return changeListener.getChanges().get(index);
+    }
+
+    public Database changeGetDatabase(Args args) {
+        CollectionChange change = args.get("change");
+        return change.getDatabase();
+    }
+
+    public List<String> changeGetDocumentId(Args args) {
+        CollectionChange change = args.get("change");
+        return change.getDocumentIDs();
+    }
+
+    class MyCollectionChangeListener implements CollectionChangeListener {
+        private List<CollectionChange> changes;
+
+        public List<CollectionChange> getChanges() {
+            return changes;
+        }
+
+
+        @Override
+        public void changed(CollectionChange change) {
+            changes.add(change);
+        }
+    }
 }