diff --git a/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java b/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java index 07a5bf962..49b85b27b 100644 --- a/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java +++ b/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java @@ -153,7 +153,7 @@ protected String execute() throws FirebaseMessagingException { *

The responses list obtained by calling {@link BatchResponse#getResponses()} on the return * value corresponds to the order of input messages. * - * @param messages A non-null, non-empty list containing up to 1000 messages. + * @param messages A non-null, non-empty list containing up to 100 messages. * @return A {@link BatchResponse} indicating the result of the operation. * @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for * delivery. An exception here indicates a total failure -- i.e. none of the messages in the @@ -175,7 +175,7 @@ public BatchResponse sendAll( *

The responses list obtained by calling {@link BatchResponse#getResponses()} on the return * value corresponds to the order of input messages. * - * @param messages A non-null, non-empty list containing up to 1000 messages. + * @param messages A non-null, non-empty list containing up to 100 messages. * @param dryRun A boolean indicating whether to perform a dry run (validation only) of the send. * @return A {@link BatchResponse} indicating the result of the operation. * @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for @@ -190,7 +190,7 @@ public BatchResponse sendAll( /** * Similar to {@link #sendAll(List)} but performs the operation asynchronously. * - * @param messages A non-null, non-empty list containing up to 1000 messages. + * @param messages A non-null, non-empty list containing up to 100 messages. * @return @return An {@code ApiFuture} that will complete with a {@link BatchResponse} when * the messages have been sent. */ @@ -201,7 +201,7 @@ public ApiFuture sendAllAsync(@NonNull List messages) { /** * Similar to {@link #sendAll(List, boolean)} but performs the operation asynchronously. * - * @param messages A non-null, non-empty list containing up to 1000 messages. + * @param messages A non-null, non-empty list containing up to 100 messages. * @param dryRun A boolean indicating whether to perform a dry run (validation only) of the send. * @return @return An {@code ApiFuture} that will complete with a {@link BatchResponse} when * the messages have been sent, or when the emulation has finished. @@ -288,8 +288,8 @@ private CallableOperation sendAllOp( final List 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"); + checkArgument(immutableMessages.size() <= 100, + "messages list must not contain more than 100 elements"); return new CallableOperation() { @Override protected BatchResponse execute() throws FirebaseMessagingException { diff --git a/src/main/java/com/google/firebase/messaging/MulticastMessage.java b/src/main/java/com/google/firebase/messaging/MulticastMessage.java index d63384155..610f9a030 100644 --- a/src/main/java/com/google/firebase/messaging/MulticastMessage.java +++ b/src/main/java/com/google/firebase/messaging/MulticastMessage.java @@ -29,7 +29,7 @@ /** * Represents a message that can be sent to multiple devices via Firebase Cloud Messaging (FCM). * Contains payload information as well as the list of device registration tokens to which the - * message should be sent. A single {@code MulticastMessage} may contain up to 1000 registration + * message should be sent. A single {@code MulticastMessage} may contain up to 100 registration * tokens. * *

Instances of this class are thread-safe and immutable. Use {@link MulticastMessage.Builder} @@ -53,7 +53,7 @@ public class MulticastMessage { private MulticastMessage(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"); + checkArgument(this.tokens.size() <= 100, "no more than 100 tokens can be specified"); for (String token : this.tokens) { checkArgument(!Strings.isNullOrEmpty(token), "none of the tokens can be null or empty"); } @@ -101,7 +101,7 @@ public static class Builder { private Builder() {} /** - * Adds a token to which the message should be sent. Up to 1000 tokens can be specified on + * Adds a token to which the message should be sent. Up to 100 tokens can be specified on * a single instance of {@link MulticastMessage}. * * @param token A non-null, non-empty Firebase device registration token. @@ -113,7 +113,7 @@ public Builder addToken(@NonNull String token) { } /** - * Adds a list of tokens to which the message should be sent. Up to 1000 tokens can be + * Adds a list of tokens to which the message should be sent. Up to 100 tokens can be * specified on a single instance of {@link MulticastMessage}. * * @param tokens List of Firebase device registration tokens. diff --git a/src/test/java/com/google/firebase/messaging/FirebaseMessagingIT.java b/src/test/java/com/google/firebase/messaging/FirebaseMessagingIT.java index 6722caaf5..9a2b3ff83 100644 --- a/src/test/java/com/google/firebase/messaging/FirebaseMessagingIT.java +++ b/src/test/java/com/google/firebase/messaging/FirebaseMessagingIT.java @@ -108,16 +108,16 @@ public void testSendAll() throws Exception { } @Test - public void testSendThousand() throws Exception { + public void testSendHundred() throws Exception { List messages = new ArrayList<>(); - for (int i = 0; i < 1000; i++) { + for (int i = 0; i < 100; i++) { messages.add(Message.builder().setTopic("foo-bar-" + (i % 10)).build()); } BatchResponse response = FirebaseMessaging.getInstance().sendAll(messages, true); - assertEquals(1000, response.getResponses().size()); - assertEquals(1000, response.getSuccessCount()); + assertEquals(100, response.getResponses().size()); + assertEquals(100, response.getSuccessCount()); assertEquals(0, response.getFailureCount()); for (SendResponse sendResponse : response.getResponses()) { if (!sendResponse.isSuccessful()) { diff --git a/src/test/java/com/google/firebase/messaging/FirebaseMessagingTest.java b/src/test/java/com/google/firebase/messaging/FirebaseMessagingTest.java index 526704ba7..f21975612 100644 --- a/src/test/java/com/google/firebase/messaging/FirebaseMessagingTest.java +++ b/src/test/java/com/google/firebase/messaging/FirebaseMessagingTest.java @@ -450,7 +450,7 @@ public void testSendAllWithEmptyList() { public void testSendAllWithTooManyMessages() { FirebaseMessaging messaging = initDefaultMessaging(); ImmutableList.Builder listBuilder = ImmutableList.builder(); - for (int i = 0; i < 1001; i++) { + for (int i = 0; i < 101; i++) { listBuilder.add(Message.builder().setTopic("topic").build()); } try { diff --git a/src/test/java/com/google/firebase/messaging/MulticastMessageTest.java b/src/test/java/com/google/firebase/messaging/MulticastMessageTest.java index 693a0eaa5..5cd053103 100644 --- a/src/test/java/com/google/firebase/messaging/MulticastMessageTest.java +++ b/src/test/java/com/google/firebase/messaging/MulticastMessageTest.java @@ -70,12 +70,12 @@ public void testNoTokens() { @Test public void testTooManyTokens() { MulticastMessage.Builder builder = MulticastMessage.builder(); - for (int i = 0; i < 1001; i++) { + for (int i = 0; i < 101; i++) { builder.addToken("token" + i); } try { builder.build(); - fail("No error thrown for more than 1000 tokens"); + fail("No error thrown for more than 100 tokens"); } catch (IllegalArgumentException expected) { // expected }