Use Varargs in Model APIs (#12878)

* Move model list APIs to use varargs * Add missing vararg and List overloads * Added more vararg and List overloads, add JsonGetters to List overloads * Fix failing test * Remove list overload from input only model * Fix Java 8 toArray call * Add null checking validation for vararg overloads
Azure · Jul 10, 2020 · f627f82 · f627f82
1 parent e0772d4
commit f627f82
Show file tree

Hide file tree

Showing 47 changed files with 750 additions and 446 deletions.
diff --git a/...in/java/com/azure/search/documents/implementation/converters/AnalyzeRequestConverter.java b/...in/java/com/azure/search/documents/implementation/converters/AnalyzeRequestConverter.java
@@ -35,16 +35,16 @@ public static AnalyzeTextOptions map(com.azure.search.documents.indexes.implemen
         }
 
         if (obj.getCharFilters() != null) {
-            List<CharFilterName> charFilters =
-                obj.getCharFilters().stream().map(CharFilterNameConverter::map).collect(Collectors.toList());
-            analyzeTextOptions.setCharFilters(charFilters);
+            analyzeTextOptions.setCharFilters(obj.getCharFilters().stream()
+                .map(CharFilterNameConverter::map)
+                .toArray(CharFilterName[]::new));
         }
 
 
         if (obj.getTokenFilters() != null) {
-            List<TokenFilterName> tokenFilters =
-                obj.getTokenFilters().stream().map(TokenFilterNameConverter::map).collect(Collectors.toList());
-            analyzeTextOptions.setTokenFilters(tokenFilters);
+            analyzeTextOptions.setTokenFilters(obj.getTokenFilters().stream()
+                .map(TokenFilterNameConverter::map)
+                .toArray(TokenFilterName[]::new));
         }
 
 

diff --git a/...a/com/azure/search/documents/implementation/converters/CjkBigramTokenFilterConverter.java b/...a/com/azure/search/documents/implementation/converters/CjkBigramTokenFilterConverter.java
@@ -4,7 +4,6 @@
 package com.azure.search.documents.implementation.converters;
 
 import com.azure.search.documents.indexes.models.CjkBigramTokenFilter;
-import com.azure.search.documents.indexes.models.CjkBigramTokenFilterScripts;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -28,9 +27,9 @@ public static CjkBigramTokenFilter map(com.azure.search.documents.indexes.implem
         cjkBigramTokenFilter.setOutputUnigrams(outputUnigrams);
 
         if (obj.getIgnoreScripts() != null) {
-            List<CjkBigramTokenFilterScripts> ignoreScripts =
-                obj.getIgnoreScripts().stream().map(CjkBigramTokenFilterScriptsConverter::map).collect(Collectors.toList());
-            cjkBigramTokenFilter.setIgnoreScripts(ignoreScripts);
+            cjkBigramTokenFilter.setIgnoreScripts(obj.getIgnoreScripts().stream()
+                .map(CjkBigramTokenFilterScriptsConverter::map)
+                .collect(Collectors.toList()));
         }
         return cjkBigramTokenFilter;
     }

diff --git a/...ava/com/azure/search/documents/implementation/converters/EdgeNGramTokenizerConverter.java b/...ava/com/azure/search/documents/implementation/converters/EdgeNGramTokenizerConverter.java
@@ -4,7 +4,6 @@
 package com.azure.search.documents.implementation.converters;
 
 import com.azure.search.documents.indexes.models.EdgeNGramTokenizer;
-import com.azure.search.documents.indexes.models.TokenCharacterKind;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -28,9 +27,9 @@ public static EdgeNGramTokenizer map(com.azure.search.documents.indexes.implemen
         edgeNGramTokenizer.setMaxGram(maxGram);
 
         if (obj.getTokenChars() != null) {
-            List<TokenCharacterKind> tokenChars =
-                obj.getTokenChars().stream().map(TokenCharacterKindConverter::map).collect(Collectors.toList());
-            edgeNGramTokenizer.setTokenChars(tokenChars);
+            edgeNGramTokenizer.setTokenChars(obj.getTokenChars().stream()
+                .map(TokenCharacterKindConverter::map)
+                .collect(Collectors.toList()));
         }
 
         Integer minGram = obj.getMinGram();

diff --git a/...ava/com/azure/search/documents/implementation/converters/ElisionTokenFilterConverter.java b/...ava/com/azure/search/documents/implementation/converters/ElisionTokenFilterConverter.java
@@ -24,8 +24,7 @@ public static ElisionTokenFilter map(com.azure.search.documents.indexes.implemen
         ElisionTokenFilter elisionTokenFilter = new ElisionTokenFilter(obj.getName());
 
         if (obj.getArticles() != null) {
-            List<String> articles = new ArrayList<>(obj.getArticles());
-            elisionTokenFilter.setArticles(articles);
+            elisionTokenFilter.setArticles(obj.getArticles());
         }
         return elisionTokenFilter;
     }

diff --git a/...com/azure/search/documents/implementation/converters/EntityRecognitionSkillConverter.java b/...com/azure/search/documents/implementation/converters/EntityRecognitionSkillConverter.java
@@ -3,7 +3,6 @@
 
 package com.azure.search.documents.implementation.converters;
 
-import com.azure.search.documents.indexes.models.EntityCategory;
 import com.azure.search.documents.indexes.models.EntityRecognitionSkill;
 import com.azure.search.documents.indexes.models.EntityRecognitionSkillLanguage;
 import com.azure.search.documents.indexes.models.InputFieldMappingEntry;
@@ -52,9 +51,9 @@ public static EntityRecognitionSkill map(com.azure.search.documents.indexes.impl
         }
 
         if (obj.getCategories() != null) {
-            List<EntityCategory> categories =
-                obj.getCategories().stream().map(EntityCategoryConverter::map).collect(Collectors.toList());
-            entityRecognitionSkill.setCategories(categories);
+            entityRecognitionSkill.setCategories(obj.getCategories().stream()
+                .map(EntityCategoryConverter::map)
+                .collect(Collectors.toList()));
         }
 
         Double minimumPrecision = obj.getMinimumPrecision();

diff --git a/...ava/com/azure/search/documents/implementation/converters/ImageAnalysisSkillConverter.java b/...ava/com/azure/search/documents/implementation/converters/ImageAnalysisSkillConverter.java
@@ -5,10 +5,8 @@
 
 import com.azure.search.documents.indexes.models.ImageAnalysisSkill;
 import com.azure.search.documents.indexes.models.ImageAnalysisSkillLanguage;
-import com.azure.search.documents.indexes.models.ImageDetail;
 import com.azure.search.documents.indexes.models.InputFieldMappingEntry;
 import com.azure.search.documents.indexes.models.OutputFieldMappingEntry;
-import com.azure.search.documents.indexes.models.VisualFeature;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -44,9 +42,9 @@ public static ImageAnalysisSkill map(com.azure.search.documents.indexes.implemen
         imageAnalysisSkill.setDescription(description);
 
         if (obj.getVisualFeatures() != null) {
-            List<VisualFeature> visualFeatures =
-                obj.getVisualFeatures().stream().map(VisualFeatureConverter::map).collect(Collectors.toList());
-            imageAnalysisSkill.setVisualFeatures(visualFeatures);
+            imageAnalysisSkill.setVisualFeatures(obj.getVisualFeatures().stream()
+                .map(VisualFeatureConverter::map)
+                .collect(Collectors.toList()));
         }
 
         if (obj.getDefaultLanguageCode() != null) {
@@ -56,9 +54,9 @@ public static ImageAnalysisSkill map(com.azure.search.documents.indexes.implemen
         }
 
         if (obj.getDetails() != null) {
-            List<ImageDetail> details =
-                obj.getDetails().stream().map(ImageDetailConverter::map).collect(Collectors.toList());
-            imageAnalysisSkill.setDetails(details);
+            imageAnalysisSkill.setDetails(obj.getDetails().stream()
+                .map(ImageDetailConverter::map)
+                .collect(Collectors.toList()));
         }
         return imageAnalysisSkill;
     }

diff --git a/...com/azure/search/documents/implementation/converters/LuceneStandardAnalyzerConverter.java b/...com/azure/search/documents/implementation/converters/LuceneStandardAnalyzerConverter.java
@@ -27,8 +27,7 @@ public static LuceneStandardAnalyzer map(com.azure.search.documents.indexes.impl
         luceneStandardAnalyzer.setMaxTokenLength(maxTokenLength);
 
         if (obj.getStopwords() != null) {
-            List<String> stopwords = new ArrayList<>(obj.getStopwords());
-            luceneStandardAnalyzer.setStopwords(stopwords);
+            luceneStandardAnalyzer.setStopwords(obj.getStopwords());
         }
         return luceneStandardAnalyzer;
     }

diff --git a/...in/java/com/azure/search/documents/implementation/converters/NGramTokenizerConverter.java b/...in/java/com/azure/search/documents/implementation/converters/NGramTokenizerConverter.java
@@ -4,7 +4,6 @@
 package com.azure.search.documents.implementation.converters;
 
 import com.azure.search.documents.indexes.models.NGramTokenizer;
-import com.azure.search.documents.indexes.models.TokenCharacterKind;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,9 +26,9 @@ public static NGramTokenizer map(com.azure.search.documents.indexes.implementati
         nGramTokenizer.setMaxGram(maxGram);
 
         if (obj.getTokenChars() != null) {
-            List<TokenCharacterKind> tokenChars =
-                obj.getTokenChars().stream().map(TokenCharacterKindConverter::map).collect(Collectors.toList());
-            nGramTokenizer.setTokenChars(tokenChars);
+            nGramTokenizer.setTokenChars(obj.getTokenChars().stream()
+                .map(TokenCharacterKindConverter::map)
+                .collect(Collectors.toList()));
         }
 
         Integer minGram = obj.getMinGram();

diff --git a/...n/java/com/azure/search/documents/implementation/converters/PatternAnalyzerConverter.java b/...n/java/com/azure/search/documents/implementation/converters/PatternAnalyzerConverter.java
@@ -32,14 +32,13 @@ public static PatternAnalyzer map(com.azure.search.documents.indexes.implementat
         patternAnalyzer.setPattern(pattern);
 
         if (obj.getFlags() != null) {
-            List<RegexFlags> regexFlags =
-                Arrays.stream(obj.getFlags().toString().split("\\|")).map(RegexFlags::fromString).collect(Collectors.toList());
-            patternAnalyzer.setFlags(regexFlags);
+            patternAnalyzer.setFlags(Arrays.stream(obj.getFlags().toString().split("\\|"))
+                .map(RegexFlags::fromString)
+                .collect(Collectors.toList()));
         }
 
         if (obj.getStopwords() != null) {
-            List<String> stopwords = new ArrayList<>(obj.getStopwords());
-            patternAnalyzer.setStopwords(stopwords);
+            patternAnalyzer.setStopwords(obj.getStopwords());
         }
         return patternAnalyzer;
     }

diff --git a/.../java/com/azure/search/documents/implementation/converters/PatternTokenizerConverter.java b/.../java/com/azure/search/documents/implementation/converters/PatternTokenizerConverter.java
@@ -7,7 +7,6 @@
 import com.azure.search.documents.indexes.models.RegexFlags;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -28,9 +27,9 @@ public static PatternTokenizer map(com.azure.search.documents.indexes.implementa
         patternTokenizer.setPattern(pattern);
 
         if (obj.getFlags() != null) {
-            List<RegexFlags> regexFlags =
-                Arrays.stream(obj.getFlags().toString().split("\\|")).map(RegexFlags::fromString).collect(Collectors.toList());
-            patternTokenizer.setFlags(regexFlags);
+            patternTokenizer.setFlags(Arrays.stream(obj.getFlags().toString().split("\\|"))
+                .map(RegexFlags::fromString)
+                .collect(Collectors.toList()));
         }
 
         Integer group = obj.getGroup();

diff --git a/...in/java/com/azure/search/documents/implementation/converters/ScoringProfileConverter.java b/...in/java/com/azure/search/documents/implementation/converters/ScoringProfileConverter.java
@@ -3,7 +3,6 @@
 
 package com.azure.search.documents.implementation.converters;
 
-import com.azure.search.documents.indexes.models.ScoringFunction;
 import com.azure.search.documents.indexes.models.ScoringFunctionAggregation;
 import com.azure.search.documents.indexes.models.ScoringProfile;
 import com.azure.search.documents.indexes.models.TextWeights;
@@ -26,9 +25,9 @@ public static ScoringProfile map(com.azure.search.documents.indexes.implementati
         ScoringProfile scoringProfile = new ScoringProfile(obj.getName());
 
         if (obj.getFunctions() != null) {
-            List<ScoringFunction> functions =
-                obj.getFunctions().stream().map(ScoringFunctionConverter::map).collect(Collectors.toList());
-            scoringProfile.setFunctions(functions);
+            scoringProfile.setFunctions(obj.getFunctions().stream()
+                .map(ScoringFunctionConverter::map)
+                .collect(Collectors.toList()));
         }
 
         if (obj.getTextWeights() != null) {

diff --git a/...main/java/com/azure/search/documents/implementation/converters/StopAnalyzerConverter.java b/...main/java/com/azure/search/documents/implementation/converters/StopAnalyzerConverter.java
@@ -22,8 +22,7 @@ public static StopAnalyzer map(com.azure.search.documents.indexes.implementation
         StopAnalyzer stopAnalyzer = new StopAnalyzer(obj.getName());
 
         if (obj.getStopwords() != null) {
-            List<String> stopwords = new ArrayList<>(obj.getStopwords());
-            stopAnalyzer.setStopwords(stopwords);
+            stopAnalyzer.setStopwords(obj.getStopwords());
         }
         return stopAnalyzer;
     }

diff --git a/...m/azure/search/documents/implementation/converters/WordDelimiterTokenFilterConverter.java b/...m/azure/search/documents/implementation/converters/WordDelimiterTokenFilterConverter.java
@@ -27,8 +27,7 @@ public static WordDelimiterTokenFilter map(com.azure.search.documents.indexes.im
         wordDelimiterTokenFilter.setNumbersCatenated(catenateNumbers);
 
         if (obj.getProtectedWords() != null) {
-            List<String> protectedWords = new ArrayList<>(obj.getProtectedWords());
-            wordDelimiterTokenFilter.setProtectedWords(protectedWords);
+            wordDelimiterTokenFilter.setProtectedWords(obj.getProtectedWords());
         }
 
         Boolean generateNumberParts = obj.isGenerateNumberParts();

diff --git a/...documents/src/main/java/com/azure/search/documents/indexes/models/AnalyzeTextOptions.java b/...documents/src/main/java/com/azure/search/documents/indexes/models/AnalyzeTextOptions.java
@@ -5,6 +5,8 @@
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -201,8 +203,8 @@ public List<TokenFilterName> getTokenFilters() {
      * @param tokenFilters the tokenFilters value to set.
      * @return the AnalyzeRequest object itself.
      */
-    public AnalyzeTextOptions setTokenFilters(List<TokenFilterName> tokenFilters) {
-        this.tokenFilters = tokenFilters;
+    public AnalyzeTextOptions setTokenFilters(TokenFilterName... tokenFilters) {
+        this.tokenFilters = (tokenFilters == null) ? null : Arrays.asList(tokenFilters);
         return this;
     }
 
@@ -225,8 +227,8 @@ public List<CharFilterName> getCharFilters() {
      * @param charFilters the charFilters value to set.
      * @return the AnalyzeRequest object itself.
      */
-    public AnalyzeTextOptions setCharFilters(List<CharFilterName> charFilters) {
-        this.charFilters = charFilters;
+    public AnalyzeTextOptions setCharFilters(CharFilterName... charFilters) {
+        this.charFilters = (charFilters == null) ? null : Arrays.asList(charFilters);
         return this;
     }
 }
diff --git a/...cuments/src/main/java/com/azure/search/documents/indexes/models/CjkBigramTokenFilter.java b/...cuments/src/main/java/com/azure/search/documents/indexes/models/CjkBigramTokenFilter.java
@@ -6,8 +6,11 @@
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -58,6 +61,18 @@ public List<CjkBigramTokenFilterScripts> getIgnoreScripts() {
      * @param ignoreScripts the ignoreScripts value to set.
      * @return the CjkBigramTokenFilter object itself.
      */
+    public CjkBigramTokenFilter setIgnoreScripts(CjkBigramTokenFilterScripts... ignoreScripts) {
+        this.ignoreScripts = (ignoreScripts == null) ? null : Arrays.asList(ignoreScripts);
+        return this;
+    }
+
+    /**
+     * Set the ignoreScripts property: The scripts to ignore.
+     *
+     * @param ignoreScripts the ignoreScripts value to set.
+     * @return the CjkBigramTokenFilter object itself.
+     */
+    @JsonSetter
     public CjkBigramTokenFilter setIgnoreScripts(List<CjkBigramTokenFilterScripts> ignoreScripts) {
         this.ignoreScripts = ignoreScripts;
         return this;

diff --git a/...rch-documents/src/main/java/com/azure/search/documents/indexes/models/CustomAnalyzer.java b/...rch-documents/src/main/java/com/azure/search/documents/indexes/models/CustomAnalyzer.java
@@ -5,8 +5,11 @@
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -102,6 +105,21 @@ public List<TokenFilterName> getTokenFilters() {
      * @param tokenFilters the tokenFilters value to set.
      * @return the CustomAnalyzer object itself.
      */
+    public CustomAnalyzer setTokenFilters(TokenFilterName... tokenFilters) {
+        this.tokenFilters = (tokenFilters == null) ? null : Arrays.asList(tokenFilters);
+        return this;
+    }
+
+    /**
+     * Set the tokenFilters property: A list of token filters used to filter
+     * out or modify the tokens generated by a tokenizer. For example, you can
+     * specify a lowercase filter that converts all characters to lowercase.
+     * The filters are run in the order in which they are listed.
+     *
+     * @param tokenFilters the tokenFilters value to set.
+     * @return the CustomAnalyzer object itself.
+     */
+    @JsonSetter
     public CustomAnalyzer setTokenFilters(List<TokenFilterName> tokenFilters) {
         this.tokenFilters = tokenFilters;
         return this;
@@ -128,6 +146,21 @@ public List<CharFilterName> getCharFilters() {
      * @param charFilters the charFilters value to set.
      * @return the CustomAnalyzer object itself.
      */
+    public CustomAnalyzer setCharFilters(CharFilterName... charFilters) {
+        this.charFilters = (charFilters == null) ? null : Arrays.asList(charFilters);
+        return this;
+    }
+
+    /**
+     * Set the charFilters property: A list of character filters used to
+     * prepare input text before it is processed by the tokenizer. For
+     * instance, they can replace certain characters or symbols. The filters
+     * are run in the order in which they are listed.
+     *
+     * @param charFilters the charFilters value to set.
+     * @return the CustomAnalyzer object itself.
+     */
+    @JsonSetter
     public CustomAnalyzer setCharFilters(List<CharFilterName> charFilters) {
         this.charFilters = charFilters;
         return this;

diff --git a/...documents/src/main/java/com/azure/search/documents/indexes/models/EdgeNGramTokenizer.java b/...documents/src/main/java/com/azure/search/documents/indexes/models/EdgeNGramTokenizer.java
@@ -5,8 +5,11 @@
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -106,6 +109,18 @@ public List<TokenCharacterKind> getTokenChars() {
      * @param tokenChars the tokenChars value to set.
      * @return the EdgeNGramTokenizer object itself.
      */
+    public EdgeNGramTokenizer setTokenChars(TokenCharacterKind... tokenChars) {
+        this.tokenChars = (tokenChars == null) ? null : Arrays.asList(tokenChars);
+        return this;
+    }
+
+    /**
+     * Set the tokenChars property: Character classes to keep in the tokens.
+     *
+     * @param tokenChars the tokenChars value to set.
+     * @return the EdgeNGramTokenizer object itself.
+     */
+    @JsonSetter
     public EdgeNGramTokenizer setTokenChars(List<TokenCharacterKind> tokenChars) {
         this.tokenChars = tokenChars;
         return this;