@@ -60,75 +60,34 @@ public abstract static class Builder<B extends Builder<B, A>, A extends BaseArgs
6060
6161    protected  abstract  void  validate (A  args );
6262
63-     protected  void  validateNotNull (Object  arg , String  argName ) {
64-       if  (arg  == null ) {
65-         throw  new  IllegalArgumentException (argName  + " must not be null." );
66-       }
67-     }
68- 
69-     protected  void  validateNotEmptyString (String  arg , String  argName ) {
70-       validateNotNull (arg , argName );
71-       if  (arg .isEmpty ()) {
72-         throw  new  IllegalArgumentException (argName  + " must be a non-empty string." );
73-       }
74-     }
75- 
76-     protected  void  validateNullOrNotEmptyString (String  arg , String  argName ) {
77-       if  (arg  != null  && arg .isEmpty ()) {
78-         throw  new  IllegalArgumentException (argName  + " must be a non-empty string." );
79-       }
80-     }
81- 
82-     protected  void  validateNullOrPositive (Number  arg , String  argName ) {
83-       if  (arg  != null  && arg .longValue () < 0 ) {
84-         throw  new  IllegalArgumentException (argName  + " cannot be non-negative." );
85-       }
86-     }
87- 
8863    public  Builder () {
8964      this .operations  = new  ArrayList <>();
9065    }
9166
92-     protected  Multimap <String , String > copyMultimap (Multimap <String , String > multimap ) {
93-       Multimap <String , String > multimapCopy  = HashMultimap .create ();
94-       if  (multimap  != null ) {
95-         multimapCopy .putAll (multimap );
96-       }
97-       return  Multimaps .unmodifiableMultimap (multimapCopy );
98-     }
99- 
100-     protected  Multimap <String , String > toMultimap (Map <String , String > map ) {
101-       Multimap <String , String > multimap  = HashMultimap .create ();
102-       if  (map  != null ) {
103-         multimap .putAll (Multimaps .forMap (map ));
104-       }
105-       return  Multimaps .unmodifiableMultimap (multimap );
106-     }
107- 
10867    @ SuppressWarnings ("unchecked" ) // Its safe to type cast to B as B extends this class. 
10968    public  B  extraHeaders (Multimap <String , String > headers ) {
110-       final  Multimap <String , String > extraHeaders  = copyMultimap (headers );
69+       final  Multimap <String , String > extraHeaders  = Utils . newMultimap (headers );
11170      operations .add (args  -> args .extraHeaders  = extraHeaders );
11271      return  (B ) this ;
11372    }
11473
11574    @ SuppressWarnings ("unchecked" ) // Its safe to type cast to B as B extends this class. 
11675    public  B  extraQueryParams (Multimap <String , String > queryParams ) {
117-       final  Multimap <String , String > extraQueryParams  = copyMultimap (queryParams );
76+       final  Multimap <String , String > extraQueryParams  = Utils . newMultimap (queryParams );
11877      operations .add (args  -> args .extraQueryParams  = extraQueryParams );
11978      return  (B ) this ;
12079    }
12180
12281    @ SuppressWarnings ("unchecked" ) // Its safe to type cast to B as B extends this class. 
12382    public  B  extraHeaders (Map <String , String > headers ) {
124-       final  Multimap <String , String > extraHeaders  = toMultimap (headers );
83+       final  Multimap <String , String > extraHeaders  = Utils . newMultimap (headers );
12584      operations .add (args  -> args .extraHeaders  = extraHeaders );
12685      return  (B ) this ;
12786    }
12887
12988    @ SuppressWarnings ("unchecked" ) // Its safe to type cast to B as B extends this class. 
13089    public  B  extraQueryParams (Map <String , String > queryParams ) {
131-       final  Multimap <String , String > extraQueryParams  = toMultimap (queryParams );
90+       final  Multimap <String , String > extraQueryParams  = Utils . newMultimap (queryParams );
13291      operations .add (args  -> args .extraQueryParams  = extraQueryParams );
13392      return  (B ) this ;
13493    }
0 commit comments