55import java .util .LinkedHashMap ;
66import java .util .List ;
77import java .util .Map ;
8+ import java .util .Objects ;
89import java .util .concurrent .CompletableFuture ;
910import java .util .concurrent .ThreadLocalRandom ;
1011import java .util .regex .Matcher ;
@@ -60,10 +61,7 @@ public MSBatchRequestContent(@Nonnull final ILogger logger, @Nonnull final MSBat
6061 if (batchRequestStepsArray .length > MAX_NUMBER_OF_REQUESTS )
6162 throw new IllegalArgumentException ("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS );
6263
63- if (logger == null )
64- throw new IllegalArgumentException ("logger cannot be null" );
65-
66- this .logger = logger ;
64+ this .logger = Objects .requireNonNull (logger , "logger cannot be null" );
6765
6866 this .batchRequestStepsHashMap = new LinkedHashMap <>();
6967 for (final MSBatchRequestStep requestStep : batchRequestStepsArray )
@@ -78,8 +76,7 @@ public MSBatchRequestContent(@Nonnull final ILogger logger, @Nonnull final MSBat
7876 * given
7977 */
8078 public boolean addBatchRequestStep (@ Nonnull final MSBatchRequestStep batchRequestStep ) {
81- if (batchRequestStep == null )
82- throw new IllegalArgumentException ("batchRequestStep parameter cannot be null" );
79+ Objects .requireNonNull (batchRequestStep , "batchRequestStep parameter cannot be null" );
8380 if (batchRequestStepsHashMap .containsKey (batchRequestStep .getRequestId ()) ||
8481 batchRequestStepsHashMap .size () >= MAX_NUMBER_OF_REQUESTS )
8582 return false ;
@@ -95,8 +92,7 @@ public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchReques
9592 */
9693 @ Nonnull
9794 public String addBatchRequestStep (@ Nonnull final Request request , @ Nullable final String ... arrayOfDependsOnIds ) {
98- if (request == null )
99- throw new IllegalArgumentException ("request parameter cannot be null" );
95+ Objects .requireNonNull (request , "request parameter cannot be null" );
10096 String requestId ;
10197 do {
10298 requestId = Integer .toString (ThreadLocalRandom .current ().nextInt (1 , Integer .MAX_VALUE ));
@@ -168,9 +164,7 @@ public MSBatchResponseContent execute(@Nonnull final IBaseClient client) {
168164 */
169165 @ Nonnull
170166 public CompletableFuture <MSBatchResponseContent > executeAsync (@ Nonnull final IBaseClient client ) {
171- if (client == null ) {
172- throw new IllegalArgumentException ("client parameter cannot be null" );
173- }
167+ Objects .requireNonNull (client , "client parameter cannot be null" );
174168 final JsonObject content = getBatchRequestContentAsJson ();
175169 return client .customRequest ("/$batch" )
176170 .buildRequest ()
0 commit comments