Added BatchMessage class and tests

.gitignore

@@ -5,6 +5,8 @@ target/
 .classpath
 .project
 .checkstyle
+.factorypath
+.vscode/
 release.properties
 integration_cert.json
 integration_apikey.txt

src/main/java/com/google/firebase/messaging/BatchMessage.java

@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import com.google.api.client.util.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.firebase.internal.NonNull;
@@ -41,13 +42,32 @@ private BatchMessage(Builder builder) {
     this.tokens = builder.tokens.build();
     checkArgument(!this.tokens.isEmpty(), "at least one token must be specified");
     checkArgument(this.tokens.size() <= 1000, "no more than 1000 tokens can be specified");
+    for (String token : this.tokens) {
+      checkArgument(!Strings.isNullOrEmpty(token), "none of the tokens can be null or empty");
+    }
     this.data = builder.data.isEmpty() ? null : ImmutableMap.copyOf(builder.data);
     this.notification = builder.notification;
     this.androidConfig = builder.androidConfig;
     this.webpushConfig = builder.webpushConfig;
     this.apnsConfig = builder.apnsConfig;
   }
 
+  List<Message> getMessageList() {
+    Message.Builder builder = Message.builder()
+        .setNotification(this.notification)
+        .setAndroidConfig(this.androidConfig)
+        .setApnsConfig(this.apnsConfig)
+        .setWebpushConfig(this.webpushConfig);
+    if (this.data != null) {
+      builder.putAllData(this.data);
+    }
+    ImmutableList.Builder<Message> messages = ImmutableList.builder();
+    for (String token : this.tokens) {
+      messages.add(builder.setToken(token).build());
+    }
+    return messages.build();
+  }
+
   /**
    * Creates a new {@link Message.Builder}.
    *
@@ -157,5 +177,4 @@ public BatchMessage build() {
       return new BatchMessage(this);
     }
   }
-
 }

src/main/java/com/google/firebase/messaging/FirebaseMessaging.java

@@ -31,7 +31,6 @@
 import com.google.api.client.http.HttpResponseInterceptor;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.json.JsonHttpContent;
-import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.json.JsonParser;
@@ -229,90 +228,35 @@ public List<BatchResponse> sendBatch(List<Message> messages) throws FirebaseMess
   }
 
   public List<BatchResponse> sendBatch(
-      List<Message> messages, boolean dryRun) throws FirebaseMessagingException {
-    return sendBatchOp(messages, dryRun).call();
+      BatchMessage batch, boolean dryRun) throws FirebaseMessagingException {
+    checkNotNull(batch, "batch message must not be null");
+    return sendBatch(batch.getMessageList(), dryRun);
   }
 
-  public ApiFuture<List<BatchResponse>> sendBatchAsync(List<Message> messages) {
-    return sendBatchAsync(messages, false);
+  public List<BatchResponse> sendBatch(BatchMessage batch) throws FirebaseMessagingException {
+    return sendBatch(batch, false);
   }
 
-  public ApiFuture<List<BatchResponse>> sendBatchAsync(List<Message> messages, boolean dryRun) {
-    return sendBatchOp(messages, dryRun).callAsync(app);
+  public List<BatchResponse> sendBatch(
+      List<Message> messages, boolean dryRun) throws FirebaseMessagingException {
+    return sendBatchOp(messages, dryRun).call();
   }
 
-  private CallableOperation<List<BatchResponse>, FirebaseMessagingException> sendBatchOp(
-      final List<Message> messages, final boolean dryRun) {
-
-    final List<Message> immutableMessages = ImmutableList.copyOf(messages);
-    checkArgument(!immutableMessages.isEmpty(), "messages list must not be empty");
-    checkArgument(immutableMessages.size() <= 1000,
-        "messages list must not contain more than 1000 elements");
-    return new CallableOperation<List<BatchResponse>,FirebaseMessagingException>() {
-      @Override
-      protected List<BatchResponse> execute() throws FirebaseMessagingException {
-        try {
-          return sendBatchRequest(immutableMessages, dryRun);
-        } catch (HttpResponseException e) {
-          handleSendHttpError(e);
-          return null;
-        } catch (IOException e) {
-          throw new FirebaseMessagingException(
-              INTERNAL_ERROR, "Error while calling FCM backend service", e);
-        }
-      }
-    };
+  public ApiFuture<List<BatchResponse>> sendBatchAsync(BatchMessage batch) {
+    return sendBatchAsync(batch, false);
   }
 
-  private List<BatchResponse> sendBatchRequest(
-      List<Message> messages, boolean dryRun) throws IOException {
-
-    MessagingBatchCallback callback = new MessagingBatchCallback();
-    BatchRequest batch = newBatchRequest(messages, dryRun, callback);
-    batch.execute();
-    return ImmutableList.copyOf(callback.responses);
+  public ApiFuture<List<BatchResponse>> sendBatchAsync(BatchMessage batch, boolean dryRun) {
+    checkNotNull(batch, "batch message must not be null");
+    return sendBatchAsync(batch.getMessageList(), dryRun);
   }
 
-  private BatchRequest newBatchRequest(
-      List<Message> messages, boolean dryRun, MessagingBatchCallback callback) throws IOException {
-
-    BatchRequest batch = new BatchRequest(
-        requestFactory.getTransport(), requestFactory.getInitializer());
-    batch.setBatchUrl(new GenericUrl(FCM_BATCH_URL));
-
-    for (Message message : messages) {
-      ImmutableMap.Builder<String, Object> payload = ImmutableMap.<String, Object>builder()
-            .put("message", message);
-      if (dryRun) {
-        payload.put("validate_only", true);
-      }
-      HttpRequest request = requestFactory.buildPostRequest(
-          new GenericUrl(url), new JsonHttpContent(jsonFactory, payload.build()));
-      request.getHeaders().set("X-GOOG-API-FORMAT-VERSION", "2");
-      request.setParser(new JsonObjectParser(jsonFactory));
-      batch.queue(
-          request, MessagingServiceResponse.class, MessagingServiceErrorResponse.class, callback);
-    }
-
-    return batch;
+  public ApiFuture<List<BatchResponse>> sendBatchAsync(List<Message> messages) {
+    return sendBatchAsync(messages, false);
   }
 
-  private static class MessagingBatchCallback
-      implements BatchCallback<MessagingServiceResponse, MessagingServiceErrorResponse> {
-
-    private final List<BatchResponse> responses = new ArrayList<>();
-
-    @Override
-    public void onSuccess(
-        MessagingServiceResponse response, HttpHeaders responseHeaders) throws IOException {
-      responses.add(BatchResponse.fromSuccessResponse(response));
-    }
-
-    @Override
-    public void onFailure(
-        MessagingServiceErrorResponse error, HttpHeaders responseHeaders) throws IOException {
-      responses.add(BatchResponse.fromErrorResponse(error));
-    }
+  public ApiFuture<List<BatchResponse>> sendBatchAsync(List<Message> messages, boolean dryRun) {
+    return sendBatchOp(messages, dryRun).callAsync(app);
   }
 
   private CallableOperation<String, FirebaseMessagingException> sendOp(
@@ -432,6 +376,62 @@ private void handleTopicManagementHttpError(
     throw new FirebaseMessagingException(code, msg, e);
   }
 
+  private CallableOperation<List<BatchResponse>, FirebaseMessagingException> sendBatchOp(
+      final List<Message> messages, final boolean dryRun) {
+
+    final List<Message> immutableMessages = ImmutableList.copyOf(messages);
+    checkArgument(!immutableMessages.isEmpty(), "messages list must not be empty");
+    checkArgument(immutableMessages.size() <= 1000,
+        "messages list must not contain more than 1000 elements");
+    return new CallableOperation<List<BatchResponse>,FirebaseMessagingException>() {
+      @Override
+      protected List<BatchResponse> execute() throws FirebaseMessagingException {
+        try {
+          return sendBatchRequest(immutableMessages, dryRun);
+        } catch (HttpResponseException e) {
+          handleSendHttpError(e);
+          return null;
+        } catch (IOException e) {
+          throw new FirebaseMessagingException(
+              INTERNAL_ERROR, "Error while calling FCM backend service", e);
+        }
+      }
+    };
+  }
+
+  private List<BatchResponse> sendBatchRequest(
+      List<Message> messages, boolean dryRun) throws IOException {
+
+    MessagingBatchCallback callback = new MessagingBatchCallback();
+    BatchRequest batch = newBatchRequest(messages, dryRun, callback);
+    batch.execute();
+    return ImmutableList.copyOf(callback.responses);
+  }
+
+  private BatchRequest newBatchRequest(
+      List<Message> messages, boolean dryRun, MessagingBatchCallback callback) throws IOException {
+
+    BatchRequest batch = new BatchRequest(
+        requestFactory.getTransport(), requestFactory.getInitializer());
+    batch.setBatchUrl(new GenericUrl(FCM_BATCH_URL));
+
+    for (Message message : messages) {
+      ImmutableMap.Builder<String, Object> payload = ImmutableMap.<String, Object>builder()
+            .put("message", message);
+      if (dryRun) {
+        payload.put("validate_only", true);
+      }
+      HttpRequest request = requestFactory.buildPostRequest(
+          new GenericUrl(url), new JsonHttpContent(jsonFactory, payload.build()));
+      request.getHeaders().set("X-GOOG-API-FORMAT-VERSION", "2");
+      request.setParser(new JsonObjectParser(jsonFactory));
+      batch.queue(
+          request, MessagingServiceResponse.class, MessagingServiceErrorResponse.class, callback);
+    }
+
+    return batch;
+  }
+
   private static void disconnectQuietly(HttpResponse response) {
     if (response != null) {
       try {
@@ -488,4 +488,22 @@ private static class InstanceIdServiceErrorResponse {
     @Key("error")
     private String error;
   }
+
+  private static class MessagingBatchCallback
+      implements BatchCallback<MessagingServiceResponse, MessagingServiceErrorResponse> {
+
+    private final List<BatchResponse> responses = new ArrayList<>();
+
+    @Override
+    public void onSuccess(
+        MessagingServiceResponse response, HttpHeaders responseHeaders) throws IOException {
+      responses.add(BatchResponse.fromSuccessResponse(response));
+    }
+
+    @Override
+    public void onFailure(
+        MessagingServiceErrorResponse error, HttpHeaders responseHeaders) throws IOException {
+      responses.add(BatchResponse.fromErrorResponse(error));
+    }
+  }
 }

src/main/java/com/google/firebase/messaging/Message.java

@@ -79,6 +79,38 @@ private Message(Builder builder) {
     this.condition = builder.condition;
   }
 
+  Map<String, String> getData() {
+    return data;
+  }
+
+  Notification getNotification() {
+    return notification;
+  }
+
+  AndroidConfig getAndroidConfig() {
+    return androidConfig;
+  }
+
+  WebpushConfig getWebpushConfig() {
+    return webpushConfig;
+  }
+
+  ApnsConfig getApnsConfig() {
+    return apnsConfig;
+  }
+
+  String getToken() {
+    return token;
+  }
+
+  String getTopic() {
+    return topic;
+  }
+
+  String getCondition() {
+    return condition;
+  }
+
   private static String stripPrefix(String topic) {
     if (Strings.isNullOrEmpty(topic)) {
       return null;
@@ -226,5 +258,4 @@ public Message build() {
       return new Message(this);
     }
   }
-
 }