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

Aniket392 · 2025-09-24T10:16:21Z

Updated replicationConfiguration constructor to take updated paramaters
Updated LogConfiguration to LogSink and its method
Removed API for adding collection as per new APIs
Changed the logic to update collectionconfig and update replconfig

pasin · 2025-09-24T15:56:39Z

...c/main/java/com/couchbase/mobiletestkit/javacommon/RequestHandler/LoggingRequestHandler.java

+                .setDirectory(directory);
        if (maxRotateCount > 1) {
-            config.setMaxRotateCount(maxRotateCount);
+            builder.setMaxKeptFiles(maxRotateCount-1);


Need to be maxRotateCount + 1.

maxKeptFiles = maxRotateCount + 1.

CC: @velicuvlad

Updated maxKeptFiles = maxRotateCount + 1

pasin · 2025-09-24T15:57:42Z

...c/main/java/com/couchbase/mobiletestkit/javacommon/RequestHandler/LoggingRequestHandler.java

    public int getMaxRotateCount(Args args) {
-        return Database.log.getFile().getConfig().getMaxRotateCount();
+        FileLogSink sink = LogSinks.get().getFile();
+        return sink != null ? sink.getMaxKeptFiles() - 1 : 0;


This is correct.

pasin · 2025-09-24T16:00:20Z

...c/main/java/com/couchbase/mobiletestkit/javacommon/RequestHandler/LoggingRequestHandler.java

+                .setMaxFileSize(currentSink.getMaxFileSize())
+                .setMaxKeptFiles(currentSink.getMaxKeptFiles())
+                .setPlainText(currentSink.isPlainText())
+                .build();


There is public Builder(@nonnull FileLogSink sink) that you can use here instead of re-setting everything.

Updated the FileLogSink Builder with builder of logSink parameter

pasin · 2025-09-24T17:46:32Z

...c/main/java/com/couchbase/mobiletestkit/javacommon/RequestHandler/LoggingRequestHandler.java

+
+        if (currentSink == null) return null;
+
+        FileLogSink newSink = new FileLogSink.Builder()


There is public Builder(@nonnull FileLogSink sink) that you can use here instead of re-setting everything.

Updated the FileLogSink Builder with builder of logSink parameter

pasin · 2025-09-24T17:46:39Z

...c/main/java/com/couchbase/mobiletestkit/javacommon/RequestHandler/LoggingRequestHandler.java

+
+        if (currentSink == null) return null;
+
+        FileLogSink newSink = new FileLogSink.Builder()


There is public Builder(@nonnull FileLogSink sink) that you can use here instead of re-setting everything.

Updated the FileLogSink Builder with builder of logSink parameter

pasin · 2025-09-24T18:04:59Z

...couchbase/mobiletestkit/javacommon/RequestHandler/ReplicatorConfigurationRequestHandler.java

-        ReplicatorConfiguration replicatorConfiguration = args.get("configuration");
-        return replicatorConfiguration.getChannels();
+        CollectionConfiguration collectionConfiguration = args.get("configuration");
+        return collectionConfiguration.getChannels();


ReplicatorConfiguration replicatorConfiguration = args.get("configuration"); return replicatorConfiguration.collections.get(0).getChannels();

Updated as
replicatorConfiguration.getCollections().stream().findFirst().map(CollectionConfiguration::getChannels).orElse(null);

pasin · 2025-09-24T18:05:32Z

...couchbase/mobiletestkit/javacommon/RequestHandler/ReplicatorConfigurationRequestHandler.java

-        ReplicatorConfiguration replicatorConfiguration = args.get("configuration");
-        return replicatorConfiguration.getDatabase();
+        CollectionConfiguration collectionConfiguration = args.get("configuration");
+        return collectionConfiguration.getCollection().getDatabase();


ReplicatorConfiguration replicatorConfiguration = args.get("configuration"); return replicatorConfiguration.collections.get(0).getCollection().getDatabase();

Updated as
replicatorConfiguration.getCollections().stream().findFirst().map(it -> it.getCollection().getDatabase()).orElse(null);

pasin · 2025-09-24T18:05:49Z

...couchbase/mobiletestkit/javacommon/RequestHandler/ReplicatorConfigurationRequestHandler.java

-        ReplicatorConfiguration replicatorConfiguration = args.get("configuration");
-        return replicatorConfiguration.getDocumentIDs();
+        CollectionConfiguration collectionConfigurationConfiguration = args.get("configuration");
+        return collectionConfigurationConfiguration.getDocumentIDs();


ReplicatorConfiguration replicatorConfiguration = args.get("configuration"); return replicatorConfiguration.collections.get(0).getDocumentIDs();

Updated as
replicatorConfiguration.getCollections().stream().findFirst().map(CollectionConfiguration::getDocumentIDs).orElse(null)

pasin · 2025-09-24T18:06:57Z

...couchbase/mobiletestkit/javacommon/RequestHandler/ReplicatorConfigurationRequestHandler.java

    }

-    public void setChannels(Args args) {
-        ReplicatorConfiguration replicatorConfiguration = args.get("configuration");


Not sure that it should be removed.

Both setChannels and setDocument are needed to change or remove as discussed in #156 (comment)

pasin · 2025-09-24T18:08:04Z

...couchbase/mobiletestkit/javacommon/RequestHandler/ReplicatorConfigurationRequestHandler.java

+        CollectionConfiguration collectionConfigurationConfiguration = args.get("configuration");
        List<String> documentIds = args.get("documentIds");
-        replicatorConfiguration.setDocumentIDs(documentIds);
+        collectionConfigurationConfiguration.setDocumentIDs(documentIds);


ReplicatorConfiguration replicatorConfiguration = args.get("configuration"); return replicatorConfiguration.collections.get(0).setDocumentIDs(documentIds);

Need to confirm that replicatorConfiguration.collections doesn't return a copy otherwise this will not work. I couldn't think about the alternative though.

Both setChannels and setDocument are needed to change or remove as discussed in #156 (comment)

…questHandler APIs

pasin

Look good to me.

Need @sanjivanipatrax @barkha06 to review about removing setting document ids / channels filter and addCollections endpoints as those will not be available anymore.

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

e16481c

Aniket392 requested review from barkha06, pasin and sanjivanipatrax September 24, 2025 10:18

pasin requested changes Sep 24, 2025

View reviewed changes

CBL-7448 : Updated FileLogSink Builder and ReplicationConfigurationRe…

be3a719

…questHandler APIs

Aniket392 requested a review from pasin September 25, 2025 07:39

pasin approved these changes Sep 25, 2025

View reviewed changes

Updated gradle version and added missing changes

42bd652

barkha06 approved these changes Oct 23, 2025

View reviewed changes

Aniket392 merged commit dd3ace8 into 3.3.x Oct 24, 2025


		if (currentSink == null) return null;

		FileLogSink newSink = new FileLogSink.Builder()

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

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

Uh oh!

Conversation

Aniket392 commented Sep 24, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pasin left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants