Update Subscribe and Managed Subscribe examples

java/README.md

@@ -47,6 +47,7 @@ In the `src/main` directory of the project, you will find several sub-directorie
        * `NUMBER_OF_EVENTS_TO_PUBLISH`: Specify the number of events to publish while using the PublishStream RPC.
        * `SINGLE_PUBLISH_REQUEST`: Specify if you want to publish the events in a single or multiple PublishRequests.
        * `NUMBER_OF_EVENTS_IN_FETCHREQUEST`: Specify the number of events that the Subscribe RPC requests from the server in each FetchRequest. The example fetches at most 5 events in each Subscribe request. If you pass in more than 5, it sends multiple Subscribe requests with at most 5 events requested in FetchRequest each. For more information about requesting events, see [Pull Subscription and Flow Control](https://developer.salesforce.com/docs/platform/pub-sub-api/guide/flow-control.html) in the Pub/Sub API documentation.
+       * `PROCESS_CHANGED_FIELDS`: Specify whether the Subscribe or ManagedSubscribe client should process the [ChangedFields](https://developer.salesforce.com/docs/atlas.en-us.apexref.meta/apexref/apex_class_eventbus_ChangeEventHeader.htm#apex_eventbus_ChangeEventHeader_changedfields) header in ChangeDataCapture (CDC) events.
        * `REPLAY_PRESET`: Specify the ReplayPreset for subscribe examples.
          * If a subscription has to be started using the CUSTOM replay preset, the `REPLAY_ID` parameter is mandatory. 
          * The `REPLAY_ID` is a byte array and must be specified in this format: `[<byte_values_separated_by_commas>]`. Please enter the values as is within the square brackets and without any quotes. 

java/src/main/java/genericpubsub/ManagedSubscribe.java

@@ -38,13 +38,15 @@ public class ManagedSubscribe extends CommonContext implements StreamObserver<Ma
     private AtomicInteger receivedEvents = new AtomicInteger(0);
     private String developerName;
     private String managedSubscriptionId;
+    private final boolean processChangedFields;
 
     public ManagedSubscribe(ExampleConfigurations exampleConfigurations) {
         super(exampleConfigurations);
         isActive.set(true);
         this.managedSubscriptionId = exampleConfigurations.getManagedSubscriptionId();
         this.developerName = exampleConfigurations.getDeveloperName();
         BATCH_SIZE = Math.min(5, exampleConfigurations.getNumberOfEventsToSubscribeInEachFetchRequest());
+        this.processChangedFields = exampleConfigurations.getProcessChangedFields();
     }
 
     /**
@@ -98,6 +100,9 @@ private void processEvent(ManagedFetchResponse response) throws IOException {
                 Schema writerSchema = getSchema(schemaId);
                 GenericRecord record = deserialize(writerSchema, event.getEvent().getPayload());
                 logger.info("Received event: {}", record.toString());
+                if (processChangedFields) {
+                    processAndPrintChangedFields(writerSchema, record);
+                }
             }
             logger.info("Processed batch of {} event(s)", response.getEventsList().size());
         }

java/src/main/java/genericpubsub/Subscribe.java

@@ -49,6 +49,7 @@ public class Subscribe extends CommonContext {
     private final ScheduledExecutorService retryScheduler;
     // Replay should be stored in replay store as bytes since replays are opaque.
     private volatile ByteString storedReplay;
+    private final boolean processChangedFields;
 
     public Subscribe(ExampleConfigurations exampleConfigurations) {
         super(exampleConfigurations);
@@ -60,6 +61,7 @@ public Subscribe(ExampleConfigurations exampleConfigurations) {
         this.replayPreset = exampleConfigurations.getReplayPreset();
         this.customReplayId = exampleConfigurations.getReplayId();
         this.retryScheduler = Executors.newScheduledThreadPool(1);
+        this.processChangedFields = exampleConfigurations.getProcessChangedFields();
     }
 
     public Subscribe(ExampleConfigurations exampleConfigurations, StreamObserver<FetchResponse> responseStreamObserver) {
@@ -72,6 +74,7 @@ public Subscribe(ExampleConfigurations exampleConfigurations, StreamObserver<Fet
         this.replayPreset = exampleConfigurations.getReplayPreset();
         this.customReplayId = exampleConfigurations.getReplayId();
         this.retryScheduler = Executors.newScheduledThreadPool(1);
+        this.processChangedFields = exampleConfigurations.getProcessChangedFields();
     }
 
     /**
@@ -246,6 +249,9 @@ private void processEvent(ConsumerEvent ce) throws IOException {
         this.storedReplay = ce.getReplayId();
         GenericRecord record = deserialize(writerSchema, ce.getEvent().getPayload());
         logger.info("Received event with payload: " + record.toString() + " with schema name: " + writerSchema.getName());
+        if (processChangedFields) {
+            processAndPrintChangedFields(writerSchema, record);
+        }
     }
 
     /**

java/src/main/java/utility/CommonContext.java

@@ -3,12 +3,12 @@
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.generic.GenericRecordBuilder;
@@ -25,6 +25,8 @@
 
 import io.grpc.*;
 
+import static utility.EventParser.getFieldListFromBitmap;
+
 /**
  * The CommonContext class provides a list of member variables and functions that is used across
  * all examples for various purposes like setting up the HttpClient, CallCredentials, stubs for
@@ -265,6 +267,26 @@ public static GenericRecord deserialize(Schema schema, ByteString payload) throw
         return reader.read(null, decoder);
     }
 
+    public static void processAndPrintChangedFields(Schema writerSchema, GenericRecord record) throws IOException {
+        try {
+            List<String> changedFields = getFieldListFromBitmap(writerSchema,
+                    (GenericData.Record) record.get("ChangeEventHeader"), "changedFields");
+            if (!changedFields.isEmpty()) {
+                logger.info("============================");
+                logger.info("       Changed Fields       ");
+                logger.info("============================");
+                for (String field : changedFields) {
+                    logger.info(field);
+                }
+                logger.info("============================\n");
+            } else {
+                logger.info("No ChangedFields found\n");
+            }
+        } catch (Exception e) {
+            logger.info("Trying to process ChangedFields on unsupported events or no ChangedFields found. Error: " + e.getMessage() + "\n");
+        }
+    }
+
     /**
      * Helper function to setup Subscribe configurations in some examples.
      *

java/src/main/java/utility/ExampleConfigurations.java

@@ -27,6 +27,7 @@ public class ExampleConfigurations {
     private Integer numberOfEventsToPublish;
     private Boolean singlePublishRequest;
     private Integer numberOfEventsToSubscribeInEachFetchRequest;
+    private Boolean processChangedFields;
     private Boolean plaintextChannel;
     private Boolean providedLoginUrl;
     private ReplayPreset replayPreset;
@@ -36,7 +37,7 @@ public class ExampleConfigurations {
 
     public ExampleConfigurations() {
         this(null, null, null, null, null,
-                null, null, null, 5, false, 5,
+                null, null, null, 5, false, 5, false,
                 false, false, ReplayPreset.LATEST, null, null, null);
     }
     public ExampleConfigurations(String filename) throws IOException {
@@ -62,6 +63,8 @@ public ExampleConfigurations(String filename) throws IOException {
                 false : Boolean.parseBoolean(obj.get("SINGLE_PUBLISH_REQUEST").toString());
         this.numberOfEventsToSubscribeInEachFetchRequest = obj.get("NUMBER_OF_EVENTS_IN_FETCHREQUEST") == null ?
                 5 : Integer.parseInt(obj.get("NUMBER_OF_EVENTS_IN_FETCHREQUEST").toString());
+        this.processChangedFields = obj.get("PROCESS_CHANGED_FIELDS") == null ?
+                false : Boolean.parseBoolean(obj.get("PROCESS_CHANGED_FIELDS").toString());
         this.plaintextChannel = obj.get("USE_PLAINTEXT_CHANNEL") != null && Boolean.parseBoolean(obj.get("USE_PLAINTEXT_CHANNEL").toString());
         this.providedLoginUrl = obj.get("USE_PROVIDED_LOGIN_URL") != null && Boolean.parseBoolean(obj.get("USE_PROVIDED_LOGIN_URL").toString());
 
@@ -85,12 +88,13 @@ public ExampleConfigurations(String filename) throws IOException {
     public ExampleConfigurations(String username, String password, String loginUrl,
                                  String pubsubHost, int pubsubPort, String topic) {
         this(username, password, loginUrl, null, null, pubsubHost, pubsubPort, topic,
-                5, false, Integer.MAX_VALUE, false, false, ReplayPreset.LATEST, null, null, null);
+                5, false, Integer.MAX_VALUE, false, false, false, ReplayPreset.LATEST, null, null, null);
     }
 
     public ExampleConfigurations(String username, String password, String loginUrl, String tenantId, String accessToken,
-                                 String pubsubHost, Integer pubsubPort, String topic, Integer numberOfEventsToPublish,Boolean singlePublishRequest,
-                                 Integer numberOfEventsToSubscribeInEachFetchRequest, Boolean plaintextChannel, Boolean providedLoginUrl,
+                                 String pubsubHost, Integer pubsubPort, String topic, Integer numberOfEventsToPublish,
+                                 Boolean singlePublishRequest, Integer numberOfEventsToSubscribeInEachFetchRequest,
+                                 Boolean processChangedFields, Boolean plaintextChannel, Boolean providedLoginUrl,
                                  ReplayPreset replayPreset, ByteString replayId, String devName, String managedSubId) {
         this.username = username;
         this.password = password;
@@ -100,8 +104,10 @@ public ExampleConfigurations(String username, String password, String loginUrl,
         this.pubsubHost = pubsubHost;
         this.pubsubPort = pubsubPort;
         this.topic = topic;
+        this.singlePublishRequest = singlePublishRequest;
         this.numberOfEventsToPublish = numberOfEventsToPublish;
         this.numberOfEventsToSubscribeInEachFetchRequest = numberOfEventsToSubscribeInEachFetchRequest;
+        this.processChangedFields = processChangedFields;
         this.plaintextChannel = plaintextChannel;
         this.providedLoginUrl = providedLoginUrl;
         this.replayPreset = replayPreset;
@@ -190,6 +196,14 @@ public void setNumberOfEventsToSubscribeInEachFetchRequest(int numberOfEventsToS
         this.numberOfEventsToSubscribeInEachFetchRequest = numberOfEventsToSubscribeInEachFetchRequest;
     }
 
+    public Boolean getProcessChangedFields() {
+        return processChangedFields;
+    }
+
+    public void setProcessChangedFields(Boolean processChangedFields) {
+        this.processChangedFields = processChangedFields;
+    }
+
     public boolean usePlaintextChannel() {
         return plaintextChannel;
     }

java/src/main/resources/arguments.yaml

@@ -26,7 +26,7 @@ TENANT_ID: null
 ACCESS_TOKEN: null
 
 # =========================
-# Optional configurations:
+# Optional Configurations:
 # =========================
 # Topic to publish/subscribe to (default: /event/Order_Event__e)
 TOPIC: null
@@ -43,6 +43,8 @@ NUMBER_OF_EVENTS_IN_FETCHREQUEST: null
 REPLAY_PRESET: null
 # Replay ID in ByteString
 REPLAY_ID: null
+# Flag to enable/disable ChangedFields processing in Subscribe and ManagedSubscribe examples for CDC events (default: false)
+PROCESS_CHANGED_FIELDS: null
 
 # ManagedSubscribe RPC parameters
 # For ManagedSubscribe.java, either supply the developer name or the ID of ManagedEventSubscription