diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/EntityCategoryConverter.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/EntityCategoryConverter.java index 4946a53a9340..7d351210dd65 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/EntityCategoryConverter.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/EntityCategoryConverter.java @@ -6,9 +6,6 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.search.documents.indexes.models.EntityCategory; -import static com.azure.search.documents.implementation.util.Constants.ENUM_EXTERNAL_ERROR_MSG; -import static com.azure.search.documents.implementation.util.Constants.ENUM_INTERNAL_ERROR_MSG; - /** * A converter between {@link com.azure.search.documents.indexes.implementation.models.EntityCategory} and * {@link EntityCategory}. @@ -24,24 +21,7 @@ public static EntityCategory map(com.azure.search.documents.indexes.implementati if (obj == null) { return null; } - switch (obj) { - case LOCATION: - return EntityCategory.LOCATION; - case ORGANIZATION: - return EntityCategory.ORGANIZATION; - case PERSON: - return EntityCategory.PERSON; - case QUANTITY: - return EntityCategory.QUANTITY; - case DATETIME: - return EntityCategory.DATETIME; - case URL: - return EntityCategory.URL; - case EMAIL: - return EntityCategory.EMAIL; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_EXTERNAL_ERROR_MSG, obj))); - } + return EntityCategory.fromString(obj.toString()); } /** @@ -52,24 +32,7 @@ public static com.azure.search.documents.indexes.implementation.models.EntityCat if (obj == null) { return null; } - switch (obj) { - case LOCATION: - return com.azure.search.documents.indexes.implementation.models.EntityCategory.LOCATION; - case ORGANIZATION: - return com.azure.search.documents.indexes.implementation.models.EntityCategory.ORGANIZATION; - case PERSON: - return com.azure.search.documents.indexes.implementation.models.EntityCategory.PERSON; - case QUANTITY: - return com.azure.search.documents.indexes.implementation.models.EntityCategory.QUANTITY; - case DATETIME: - return com.azure.search.documents.indexes.implementation.models.EntityCategory.DATETIME; - case URL: - return com.azure.search.documents.indexes.implementation.models.EntityCategory.URL; - case EMAIL: - return com.azure.search.documents.indexes.implementation.models.EntityCategory.EMAIL; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_INTERNAL_ERROR_MSG, obj))); - } + return com.azure.search.documents.indexes.implementation.models.EntityCategory.fromString(obj.toString()); } private EntityCategoryConverter() { diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/ImageDetailConverter.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/ImageDetailConverter.java index 17bf59644b29..e68ec147dd1f 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/ImageDetailConverter.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/ImageDetailConverter.java @@ -3,17 +3,12 @@ package com.azure.search.documents.implementation.converters; -import com.azure.core.util.logging.ClientLogger; import com.azure.search.documents.indexes.models.ImageDetail; -import static com.azure.search.documents.implementation.util.Constants.ENUM_EXTERNAL_ERROR_MSG; -import static com.azure.search.documents.implementation.util.Constants.ENUM_INTERNAL_ERROR_MSG; - /** * A converter between {@link com.azure.search.documents.indexes.implementation.models.ImageDetail} and {@link ImageDetail}. */ public final class ImageDetailConverter { - private static final ClientLogger LOGGER = new ClientLogger(ImageDetailConverter.class); /** * Maps from enum {@link com.azure.search.documents.indexes.implementation.models.ImageDetail} to enum {@link ImageDetail}. @@ -22,14 +17,7 @@ public static ImageDetail map(com.azure.search.documents.indexes.implementation. if (obj == null) { return null; } - switch (obj) { - case CELEBRITIES: - return ImageDetail.CELEBRITIES; - case LANDMARKS: - return ImageDetail.LANDMARKS; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_EXTERNAL_ERROR_MSG, obj))); - } + return ImageDetail.fromString(obj.toString()); } /** @@ -39,14 +27,7 @@ public static com.azure.search.documents.indexes.implementation.models.ImageDeta if (obj == null) { return null; } - switch (obj) { - case CELEBRITIES: - return com.azure.search.documents.indexes.implementation.models.ImageDetail.CELEBRITIES; - case LANDMARKS: - return com.azure.search.documents.indexes.implementation.models.ImageDetail.LANDMARKS; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_INTERNAL_ERROR_MSG, obj))); - } + return com.azure.search.documents.indexes.implementation.models.ImageDetail.fromString(obj.toString()); } private ImageDetailConverter() { diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/OcrSkillConverter.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/OcrSkillConverter.java index 3e3339eae848..200072c1f12f 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/OcrSkillConverter.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/OcrSkillConverter.java @@ -7,7 +7,6 @@ import com.azure.search.documents.indexes.models.OcrSkill; import com.azure.search.documents.indexes.models.OcrSkillLanguage; import com.azure.search.documents.indexes.models.OutputFieldMappingEntry; -import com.azure.search.documents.indexes.models.TextExtractionAlgorithm; import java.util.List; import java.util.stream.Collectors; @@ -46,11 +45,6 @@ public static OcrSkill map(com.azure.search.documents.indexes.implementation.mod String description = obj.getDescription(); ocrSkill.setDescription(description); - if (obj.getTextExtractionAlgorithm() != null) { - TextExtractionAlgorithm textExtractionAlgorithm = - TextExtractionAlgorithmConverter.map(obj.getTextExtractionAlgorithm()); - ocrSkill.setTextExtractionAlgorithm(textExtractionAlgorithm); - } if (obj.getDefaultLanguageCode() != null) { OcrSkillLanguage defaultLanguageCode = OcrSkillLanguageConverter.map(obj.getDefaultLanguageCode()); @@ -58,7 +52,7 @@ public static OcrSkill map(com.azure.search.documents.indexes.implementation.mod } Boolean shouldDetectOrientation = obj.isShouldDetectOrientation(); - ocrSkill.setShouldDetectOrientation(shouldDetectOrientation); + ocrSkill.shouldDetectOrientation(shouldDetectOrientation); return ocrSkill; } @@ -93,12 +87,6 @@ public static com.azure.search.documents.indexes.implementation.models.OcrSkill String description = obj.getDescription(); ocrSkill.setDescription(description); - if (obj.getTextExtractionAlgorithm() != null) { - com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm textExtractionAlgorithm = - TextExtractionAlgorithmConverter.map(obj.getTextExtractionAlgorithm()); - ocrSkill.setTextExtractionAlgorithm(textExtractionAlgorithm); - } - if (obj.getDefaultLanguageCode() != null) { com.azure.search.documents.indexes.implementation.models.OcrSkillLanguage defaultLanguageCode = OcrSkillLanguageConverter.map(obj.getDefaultLanguageCode()); diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/TextExtractionAlgorithmConverter.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/TextExtractionAlgorithmConverter.java deleted file mode 100644 index 36d463a59cf4..000000000000 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/TextExtractionAlgorithmConverter.java +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.search.documents.implementation.converters; - -import com.azure.core.util.logging.ClientLogger; -import com.azure.search.documents.indexes.models.TextExtractionAlgorithm; - -import static com.azure.search.documents.implementation.util.Constants.ENUM_EXTERNAL_ERROR_MSG; -import static com.azure.search.documents.implementation.util.Constants.ENUM_INTERNAL_ERROR_MSG; - -/** - * A converter between {@link com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm} and - * {@link TextExtractionAlgorithm}. - */ -public final class TextExtractionAlgorithmConverter { - private static final ClientLogger LOGGER = new ClientLogger(TextExtractionAlgorithmConverter.class); - - /** - * Maps from enum {@link com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm} to enum - * {@link TextExtractionAlgorithm}. - */ - public static TextExtractionAlgorithm map(com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm obj) { - if (obj == null) { - return null; - } - switch (obj) { - case PRINTED: - return TextExtractionAlgorithm.PRINTED; - case HANDWRITTEN: - return TextExtractionAlgorithm.HANDWRITTEN; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_EXTERNAL_ERROR_MSG, obj))); - } - } - - /** - * Maps from enum {@link TextExtractionAlgorithm} to enum - * {@link com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm}. - */ - public static com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm map(TextExtractionAlgorithm obj) { - if (obj == null) { - return null; - } - switch (obj) { - case PRINTED: - return com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm.PRINTED; - case HANDWRITTEN: - return com.azure.search.documents.indexes.implementation.models.TextExtractionAlgorithm.HANDWRITTEN; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_INTERNAL_ERROR_MSG, obj))); - } - } - - private TextExtractionAlgorithmConverter() { - } -} diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/TextSplitModeConverter.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/TextSplitModeConverter.java index 04b88f58f836..bbfdf698efef 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/TextSplitModeConverter.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/TextSplitModeConverter.java @@ -6,9 +6,6 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.search.documents.indexes.models.TextSplitMode; -import static com.azure.search.documents.implementation.util.Constants.ENUM_EXTERNAL_ERROR_MSG; -import static com.azure.search.documents.implementation.util.Constants.ENUM_INTERNAL_ERROR_MSG; - /** * A converter between {@link com.azure.search.documents.indexes.implementation.models.TextSplitMode} and {@link TextSplitMode}. */ @@ -23,14 +20,7 @@ public static TextSplitMode map(com.azure.search.documents.indexes.implementatio if (obj == null) { return null; } - switch (obj) { - case PAGES: - return TextSplitMode.PAGES; - case SENTENCES: - return TextSplitMode.SENTENCES; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_EXTERNAL_ERROR_MSG, obj))); - } + return TextSplitMode.fromString(obj.toString()); } /** @@ -41,14 +31,7 @@ public static com.azure.search.documents.indexes.implementation.models.TextSplit if (obj == null) { return null; } - switch (obj) { - case PAGES: - return com.azure.search.documents.indexes.implementation.models.TextSplitMode.PAGES; - case SENTENCES: - return com.azure.search.documents.indexes.implementation.models.TextSplitMode.SENTENCES; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_INTERNAL_ERROR_MSG, obj))); - } + return com.azure.search.documents.indexes.implementation.models.TextSplitMode.fromString(obj.toString()); } private TextSplitModeConverter() { diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/VisualFeatureConverter.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/VisualFeatureConverter.java index b82e0b78518c..4b328bf270eb 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/VisualFeatureConverter.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/VisualFeatureConverter.java @@ -6,9 +6,6 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.search.documents.indexes.models.VisualFeature; -import static com.azure.search.documents.implementation.util.Constants.ENUM_EXTERNAL_ERROR_MSG; -import static com.azure.search.documents.implementation.util.Constants.ENUM_INTERNAL_ERROR_MSG; - /** * A converter between {@link com.azure.search.documents.indexes.implementation.models.VisualFeature} and {@link VisualFeature}. */ @@ -23,24 +20,7 @@ public static VisualFeature map(com.azure.search.documents.indexes.implementatio if (obj == null) { return null; } - switch (obj) { - case ADULT: - return VisualFeature.ADULT; - case BRANDS: - return VisualFeature.BRANDS; - case CATEGORIES: - return VisualFeature.CATEGORIES; - case DESCRIPTION: - return VisualFeature.DESCRIPTION; - case FACES: - return VisualFeature.FACES; - case OBJECTS: - return VisualFeature.OBJECTS; - case TAGS: - return VisualFeature.TAGS; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_EXTERNAL_ERROR_MSG, obj))); - } + return VisualFeature.fromString(obj.toString()); } /** @@ -51,26 +31,6 @@ public static com.azure.search.documents.indexes.implementation.models.VisualFea if (obj == null) { return null; } - switch (obj) { - case ADULT: - return com.azure.search.documents.indexes.implementation.models.VisualFeature.ADULT; - case BRANDS: - return com.azure.search.documents.indexes.implementation.models.VisualFeature.BRANDS; - case CATEGORIES: - return com.azure.search.documents.indexes.implementation.models.VisualFeature.CATEGORIES; - case DESCRIPTION: - return com.azure.search.documents.indexes.implementation.models.VisualFeature.DESCRIPTION; - case FACES: - return com.azure.search.documents.indexes.implementation.models.VisualFeature.FACES; - case OBJECTS: - return com.azure.search.documents.indexes.implementation.models.VisualFeature.OBJECTS; - case TAGS: - return com.azure.search.documents.indexes.implementation.models.VisualFeature.TAGS; - default: - throw LOGGER.logExceptionAsError(new RuntimeException(String.format(ENUM_INTERNAL_ERROR_MSG, obj))); - } - } - - private VisualFeatureConverter() { + return com.azure.search.documents.indexes.implementation.models.VisualFeature.fromString(obj.toString()); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/EntityCategory.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/EntityCategory.java index 363cede871b3..15b68ed97833 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/EntityCategory.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/EntityCategory.java @@ -6,77 +6,64 @@ package com.azure.search.documents.indexes.implementation.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for EntityCategory. */ -public enum EntityCategory { +public final class EntityCategory extends ExpandableStringEnum { /** - * Enum value location. + * Static value location for EntityCategory. */ - LOCATION("location"), + public static final EntityCategory LOCATION = fromString("location"); /** - * Enum value organization. + * Static value organization for EntityCategory. */ - ORGANIZATION("organization"), + public static final EntityCategory ORGANIZATION = fromString("organization"); /** - * Enum value person. + * Static value person for EntityCategory. */ - PERSON("person"), + public static final EntityCategory PERSON = fromString("person"); /** - * Enum value quantity. + * Static value quantity for EntityCategory. */ - QUANTITY("quantity"), + public static final EntityCategory QUANTITY = fromString("quantity"); /** - * Enum value datetime. + * Static value datetime for EntityCategory. */ - DATETIME("datetime"), + public static final EntityCategory DATETIME = fromString("datetime"); /** - * Enum value url. + * Static value url for EntityCategory. */ - URL("url"), + public static final EntityCategory URL = fromString("url"); /** - * Enum value email. + * Static value email for EntityCategory. */ - EMAIL("email"); + public static final EntityCategory EMAIL = fromString("email"); /** - * The actual serialized value for a EntityCategory instance. - */ - private final String value; - - EntityCategory(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a EntityCategory instance. + * Creates or finds a EntityCategory from its string representation. * - * @param value the serialized value to parse. - * @return the parsed EntityCategory object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding EntityCategory. */ @JsonCreator - public static EntityCategory fromString(String value) { - EntityCategory[] items = EntityCategory.values(); - for (EntityCategory item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static EntityCategory fromString(String name) { + return fromString(name, EntityCategory.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known EntityCategory values. + */ + public static Collection values() { + return values(EntityCategory.class); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/ImageDetail.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/ImageDetail.java index 0979587dbcbd..6b957d6a931f 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/ImageDetail.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/ImageDetail.java @@ -6,52 +6,39 @@ package com.azure.search.documents.indexes.implementation.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for ImageDetail. */ -public enum ImageDetail { +public final class ImageDetail extends ExpandableStringEnum { /** - * Enum value celebrities. + * Static value celebrities for ImageDetail. */ - CELEBRITIES("celebrities"), + public static final ImageDetail CELEBRITIES = fromString("celebrities"); /** - * Enum value landmarks. + * Static value landmarks for ImageDetail. */ - LANDMARKS("landmarks"); + public static final ImageDetail LANDMARKS = fromString("landmarks"); /** - * The actual serialized value for a ImageDetail instance. - */ - private final String value; - - ImageDetail(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a ImageDetail instance. + * Creates or finds a ImageDetail from its string representation. * - * @param value the serialized value to parse. - * @return the parsed ImageDetail object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding ImageDetail. */ @JsonCreator - public static ImageDetail fromString(String value) { - ImageDetail[] items = ImageDetail.values(); - for (ImageDetail item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static ImageDetail fromString(String name) { + return fromString(name, ImageDetail.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known ImageDetail values. + */ + public static Collection values() { + return values(ImageDetail.class); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/OcrSkill.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/OcrSkill.java index 7b5d21378a5d..616096421eba 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/OcrSkill.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/OcrSkill.java @@ -18,13 +18,6 @@ @JsonTypeName("#Microsoft.Skills.Vision.OcrSkill") @Fluent public final class OcrSkill extends SearchIndexerSkill { - /* - * A value indicating which algorithm to use for extracting text. Default - * is printed. Possible values include: 'Printed', 'Handwritten' - */ - @JsonProperty(value = "textExtractionAlgorithm") - private TextExtractionAlgorithm textExtractionAlgorithm; - /* * A value indicating which language code to use. Default is en. Possible * values include: 'zh-Hans', 'zh-Hant', 'cs', 'da', 'nl', 'en', 'fi', @@ -41,30 +34,6 @@ public final class OcrSkill extends SearchIndexerSkill { @JsonProperty(value = "detectOrientation") private Boolean shouldDetectOrientation; - /** - * Get the textExtractionAlgorithm property: A value indicating which - * algorithm to use for extracting text. Default is printed. Possible - * values include: 'Printed', 'Handwritten'. - * - * @return the textExtractionAlgorithm value. - */ - public TextExtractionAlgorithm getTextExtractionAlgorithm() { - return this.textExtractionAlgorithm; - } - - /** - * Set the textExtractionAlgorithm property: A value indicating which - * algorithm to use for extracting text. Default is printed. Possible - * values include: 'Printed', 'Handwritten'. - * - * @param textExtractionAlgorithm the textExtractionAlgorithm value to set. - * @return the OcrSkill object itself. - */ - public OcrSkill setTextExtractionAlgorithm(TextExtractionAlgorithm textExtractionAlgorithm) { - this.textExtractionAlgorithm = textExtractionAlgorithm; - return this; - } - /** * Get the defaultLanguageCode property: A value indicating which language * code to use. Default is en. Possible values include: 'zh-Hans', diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/SearchIndexerSkillset.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/SearchIndexerSkillset.java index e7993952d8b4..386638640f87 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/SearchIndexerSkillset.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/SearchIndexerSkillset.java @@ -24,7 +24,7 @@ public final class SearchIndexerSkillset { /* * The description of the skillset. */ - @JsonProperty(value = "description", required = true) + @JsonProperty(value = "description") private String description; /* diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/TextExtractionAlgorithm.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/TextExtractionAlgorithm.java deleted file mode 100644 index 0baaee07ec68..000000000000 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/TextExtractionAlgorithm.java +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. - -package com.azure.search.documents.indexes.implementation.models; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Defines values for TextExtractionAlgorithm. - */ -public enum TextExtractionAlgorithm { - /** - * Enum value printed. - */ - PRINTED("printed"), - - /** - * Enum value handwritten. - */ - HANDWRITTEN("handwritten"); - - /** - * The actual serialized value for a TextExtractionAlgorithm instance. - */ - private final String value; - - TextExtractionAlgorithm(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a TextExtractionAlgorithm instance. - * - * @param value the serialized value to parse. - * @return the parsed TextExtractionAlgorithm object, or null if unable to parse. - */ - @JsonCreator - public static TextExtractionAlgorithm fromString(String value) { - TextExtractionAlgorithm[] items = TextExtractionAlgorithm.values(); - for (TextExtractionAlgorithm item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; - } - - @JsonValue - @Override - public String toString() { - return this.value; - } -} diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/TextSplitMode.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/TextSplitMode.java index 0939e96ef936..3053ce51c248 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/TextSplitMode.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/TextSplitMode.java @@ -6,52 +6,39 @@ package com.azure.search.documents.indexes.implementation.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for TextSplitMode. */ -public enum TextSplitMode { +public final class TextSplitMode extends ExpandableStringEnum { /** - * Enum value pages. + * Static value pages for TextSplitMode. */ - PAGES("pages"), + public static final TextSplitMode PAGES = fromString("pages"); /** - * Enum value sentences. + * Static value sentences for TextSplitMode. */ - SENTENCES("sentences"); + public static final TextSplitMode SENTENCES = fromString("sentences"); /** - * The actual serialized value for a TextSplitMode instance. - */ - private final String value; - - TextSplitMode(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a TextSplitMode instance. + * Creates or finds a TextSplitMode from its string representation. * - * @param value the serialized value to parse. - * @return the parsed TextSplitMode object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding TextSplitMode. */ @JsonCreator - public static TextSplitMode fromString(String value) { - TextSplitMode[] items = TextSplitMode.values(); - for (TextSplitMode item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static TextSplitMode fromString(String name) { + return fromString(name, TextSplitMode.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known TextSplitMode values. + */ + public static Collection values() { + return values(TextSplitMode.class); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/VisualFeature.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/VisualFeature.java index c77a2b380313..db4254117ade 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/VisualFeature.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/implementation/models/VisualFeature.java @@ -6,77 +6,64 @@ package com.azure.search.documents.indexes.implementation.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for VisualFeature. */ -public enum VisualFeature { +public final class VisualFeature extends ExpandableStringEnum { /** - * Enum value adult. + * Static value adult for VisualFeature. */ - ADULT("adult"), + public static final VisualFeature ADULT = fromString("adult"); /** - * Enum value brands. + * Static value brands for VisualFeature. */ - BRANDS("brands"), + public static final VisualFeature BRANDS = fromString("brands"); /** - * Enum value categories. + * Static value categories for VisualFeature. */ - CATEGORIES("categories"), + public static final VisualFeature CATEGORIES = fromString("categories"); /** - * Enum value description. + * Static value description for VisualFeature. */ - DESCRIPTION("description"), + public static final VisualFeature DESCRIPTION = fromString("description"); /** - * Enum value faces. + * Static value faces for VisualFeature. */ - FACES("faces"), + public static final VisualFeature FACES = fromString("faces"); /** - * Enum value objects. + * Static value objects for VisualFeature. */ - OBJECTS("objects"), + public static final VisualFeature OBJECTS = fromString("objects"); /** - * Enum value tags. + * Static value tags for VisualFeature. */ - TAGS("tags"); + public static final VisualFeature TAGS = fromString("tags"); /** - * The actual serialized value for a VisualFeature instance. - */ - private final String value; - - VisualFeature(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a VisualFeature instance. + * Creates or finds a VisualFeature from its string representation. * - * @param value the serialized value to parse. - * @return the parsed VisualFeature object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding VisualFeature. */ @JsonCreator - public static VisualFeature fromString(String value) { - VisualFeature[] items = VisualFeature.values(); - for (VisualFeature item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static VisualFeature fromString(String name) { + return fromString(name, VisualFeature.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known VisualFeature values. + */ + public static Collection values() { + return values(VisualFeature.class); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/EntityCategory.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/EntityCategory.java index e5b23465a9e9..8ac6e5abef26 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/EntityCategory.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/EntityCategory.java @@ -3,77 +3,64 @@ package com.azure.search.documents.indexes.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for EntityCategory. */ -public enum EntityCategory { +public final class EntityCategory extends ExpandableStringEnum { /** - * Enum value location. + * Static value location for EntityCategory. */ - LOCATION("location"), + public static final EntityCategory LOCATION = fromString("location"); /** - * Enum value organization. + * Static value organization for EntityCategory. */ - ORGANIZATION("organization"), + public static final EntityCategory ORGANIZATION = fromString("organization"); /** - * Enum value person. + * Static value person for EntityCategory. */ - PERSON("person"), + public static final EntityCategory PERSON = fromString("person"); /** - * Enum value quantity. + * Static value quantity for EntityCategory. */ - QUANTITY("quantity"), + public static final EntityCategory QUANTITY = fromString("quantity"); /** - * Enum value datetime. + * Static value datetime for EntityCategory. */ - DATETIME("datetime"), + public static final EntityCategory DATETIME = fromString("datetime"); /** - * Enum value url. + * Static value url for EntityCategory. */ - URL("url"), + public static final EntityCategory URL = fromString("url"); /** - * Enum value email. + * Static value email for EntityCategory. */ - EMAIL("email"); + public static final EntityCategory EMAIL = fromString("email"); /** - * The actual serialized value for a EntityCategory instance. - */ - private final String value; - - EntityCategory(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a EntityCategory instance. + * Creates or finds a EntityCategory from its string representation. * - * @param value the serialized value to parse. - * @return the parsed EntityCategory object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding EntityCategory. */ @JsonCreator - public static EntityCategory fromString(String value) { - EntityCategory[] items = EntityCategory.values(); - for (EntityCategory item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static EntityCategory fromString(String name) { + return fromString(name, EntityCategory.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known EntityCategory values. + */ + public static Collection values() { + return values(EntityCategory.class); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/ImageDetail.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/ImageDetail.java index 2f06f0820d32..97a526ea72fb 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/ImageDetail.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/ImageDetail.java @@ -3,52 +3,39 @@ package com.azure.search.documents.indexes.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for ImageDetail. */ -public enum ImageDetail { +public final class ImageDetail extends ExpandableStringEnum { /** - * Enum value celebrities. + * Static value celebrities for ImageDetail. */ - CELEBRITIES("celebrities"), + public static final ImageDetail CELEBRITIES = fromString("celebrities"); /** - * Enum value landmarks. + * Static value landmarks for ImageDetail. */ - LANDMARKS("landmarks"); + public static final ImageDetail LANDMARKS = fromString("landmarks"); /** - * The actual serialized value for a ImageDetail instance. - */ - private final String value; - - ImageDetail(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a ImageDetail instance. + * Creates or finds a ImageDetail from its string representation. * - * @param value the serialized value to parse. - * @return the parsed ImageDetail object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding ImageDetail. */ @JsonCreator - public static ImageDetail fromString(String value) { - ImageDetail[] items = ImageDetail.values(); - for (ImageDetail item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static ImageDetail fromString(String name) { + return fromString(name, ImageDetail.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known ImageDetail values. + */ + public static Collection values() { + return values(ImageDetail.class); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/OcrSkill.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/OcrSkill.java index 45af98a42e6d..90b96fefa34e 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/OcrSkill.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/OcrSkill.java @@ -15,13 +15,6 @@ @JsonTypeName("#Microsoft.Skills.Vision.OcrSkill") @Fluent public final class OcrSkill extends SearchIndexerSkill { - /* - * A value indicating which algorithm to use for extracting text. Default - * is printed. Possible values include: 'Printed', 'Handwritten' - */ - @JsonProperty(value = "textExtractionAlgorithm") - private TextExtractionAlgorithm textExtractionAlgorithm; - /* * A value indicating which language code to use. Default is en. Possible * values include: 'zh-Hans', 'zh-Hant', 'cs', 'da', 'nl', 'en', 'fi', @@ -38,30 +31,6 @@ public final class OcrSkill extends SearchIndexerSkill { @JsonProperty(value = "detectOrientation") private Boolean shouldDetectOrientation; - /** - * Get the textExtractionAlgorithm property: A value indicating which - * algorithm to use for extracting text. Default is printed. Possible - * values include: 'Printed', 'Handwritten'. - * - * @return the textExtractionAlgorithm value. - */ - public TextExtractionAlgorithm getTextExtractionAlgorithm() { - return this.textExtractionAlgorithm; - } - - /** - * Set the textExtractionAlgorithm property: A value indicating which - * algorithm to use for extracting text. Default is printed. Possible - * values include: 'Printed', 'Handwritten'. - * - * @param textExtractionAlgorithm the textExtractionAlgorithm value to set. - * @return the OcrSkill object itself. - */ - public OcrSkill setTextExtractionAlgorithm(TextExtractionAlgorithm textExtractionAlgorithm) { - this.textExtractionAlgorithm = textExtractionAlgorithm; - return this; - } - /** * Get the defaultLanguageCode property: A value indicating which language * code to use. Default is en. Possible values include: 'zh-Hans', @@ -107,7 +76,7 @@ public Boolean shouldDetectOrientation() { * @param shouldDetectOrientation the shouldDetectOrientation value to set. * @return the OcrSkill object itself. */ - public OcrSkill setShouldDetectOrientation(Boolean shouldDetectOrientation) { + public OcrSkill shouldDetectOrientation(Boolean shouldDetectOrientation) { this.shouldDetectOrientation = shouldDetectOrientation; return this; } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextExtractionAlgorithm.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextExtractionAlgorithm.java deleted file mode 100644 index 18e5e0d331ec..000000000000 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextExtractionAlgorithm.java +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.search.documents.indexes.models; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Defines values for TextExtractionAlgorithm. - */ -public enum TextExtractionAlgorithm { - /** - * Enum value printed. - */ - PRINTED("printed"), - - /** - * Enum value handwritten. - */ - HANDWRITTEN("handwritten"); - - /** - * The actual serialized value for a TextExtractionAlgorithm instance. - */ - private final String value; - - TextExtractionAlgorithm(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a TextExtractionAlgorithm instance. - * - * @param value the serialized value to parse. - * @return the parsed TextExtractionAlgorithm object, or null if unable to parse. - */ - @JsonCreator - public static TextExtractionAlgorithm fromString(String value) { - TextExtractionAlgorithm[] items = TextExtractionAlgorithm.values(); - for (TextExtractionAlgorithm item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; - } - - @JsonValue - @Override - public String toString() { - return this.value; - } -} diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextSplitMode.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextSplitMode.java index 1e1a54a3b9ff..304e2e50fcc7 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextSplitMode.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextSplitMode.java @@ -1,54 +1,44 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. package com.azure.search.documents.indexes.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for TextSplitMode. */ -public enum TextSplitMode { +public final class TextSplitMode extends ExpandableStringEnum { /** - * Enum value pages. + * Static value pages for TextSplitMode. */ - PAGES("pages"), + public static final TextSplitMode PAGES = fromString("pages"); /** - * Enum value sentences. + * Static value sentences for TextSplitMode. */ - SENTENCES("sentences"); + public static final TextSplitMode SENTENCES = fromString("sentences"); /** - * The actual serialized value for a TextSplitMode instance. - */ - private final String value; - - TextSplitMode(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a TextSplitMode instance. + * Creates or finds a TextSplitMode from its string representation. * - * @param value the serialized value to parse. - * @return the parsed TextSplitMode object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding TextSplitMode. */ @JsonCreator - public static TextSplitMode fromString(String value) { - TextSplitMode[] items = TextSplitMode.values(); - for (TextSplitMode item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static TextSplitMode fromString(String name) { + return fromString(name, TextSplitMode.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known TextSplitMode values. + */ + public static Collection values() { + return values(TextSplitMode.class); } } diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VisualFeature.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VisualFeature.java index c76751755440..7b19d36cd96b 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VisualFeature.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VisualFeature.java @@ -3,77 +3,64 @@ package com.azure.search.documents.indexes.models; +import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Collection; /** * Defines values for VisualFeature. */ -public enum VisualFeature { +public final class VisualFeature extends ExpandableStringEnum { /** - * Enum value adult. + * Static value adult for VisualFeature. */ - ADULT("adult"), + public static final VisualFeature ADULT = fromString("adult"); /** - * Enum value brands. + * Static value brands for VisualFeature. */ - BRANDS("brands"), + public static final VisualFeature BRANDS = fromString("brands"); /** - * Enum value categories. + * Static value categories for VisualFeature. */ - CATEGORIES("categories"), + public static final VisualFeature CATEGORIES = fromString("categories"); /** - * Enum value description. + * Static value description for VisualFeature. */ - DESCRIPTION("description"), + public static final VisualFeature DESCRIPTION = fromString("description"); /** - * Enum value faces. + * Static value faces for VisualFeature. */ - FACES("faces"), + public static final VisualFeature FACES = fromString("faces"); /** - * Enum value objects. + * Static value objects for VisualFeature. */ - OBJECTS("objects"), + public static final VisualFeature OBJECTS = fromString("objects"); /** - * Enum value tags. + * Static value tags for VisualFeature. */ - TAGS("tags"); + public static final VisualFeature TAGS = fromString("tags"); /** - * The actual serialized value for a VisualFeature instance. - */ - private final String value; - - VisualFeature(String value) { - this.value = value; - } - - /** - * Parses a serialized value to a VisualFeature instance. + * Creates or finds a VisualFeature from its string representation. * - * @param value the serialized value to parse. - * @return the parsed VisualFeature object, or null if unable to parse. + * @param name a name to look for. + * @return the corresponding VisualFeature. */ @JsonCreator - public static VisualFeature fromString(String value) { - VisualFeature[] items = VisualFeature.values(); - for (VisualFeature item : items) { - if (item.toString().equalsIgnoreCase(value)) { - return item; - } - } - return null; + public static VisualFeature fromString(String name) { + return fromString(name, VisualFeature.class); } - @JsonValue - @Override - public String toString() { - return this.value; + /** + * @return known VisualFeature values. + */ + public static Collection values() { + return values(VisualFeature.class); } } diff --git a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/CreateSkillsetExample.java b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/CreateSkillsetExample.java index 6eaea18707e9..6c82b0468c41 100644 --- a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/CreateSkillsetExample.java +++ b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/CreateSkillsetExample.java @@ -60,7 +60,7 @@ private static void createOcrSkillset(SearchIndexerClient searchIndexerClient) { List skills = Collections.singletonList( new OcrSkill() - .setShouldDetectOrientation(true) + .shouldDetectOrientation(true) .setDefaultLanguageCode(null) .setName("myocr") .setDescription("Extracts text (plain and structured) from image.") diff --git a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/IndexersManagementSyncTests.java b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/IndexersManagementSyncTests.java index 84d483631551..7d393c3bfb14 100644 --- a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/IndexersManagementSyncTests.java +++ b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/IndexersManagementSyncTests.java @@ -647,7 +647,7 @@ SearchIndexerSkillset createSkillsetObject() { List skills = Collections.singletonList( new OcrSkill() - .setShouldDetectOrientation(true) + .shouldDetectOrientation(true) .setName("myocr") .setDescription("Tested OCR skill") .setContext("/document") diff --git a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/SkillsetManagementSyncTests.java b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/SkillsetManagementSyncTests.java index 7defcb94d07d..9521a27cdbe7 100644 --- a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/SkillsetManagementSyncTests.java +++ b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/SkillsetManagementSyncTests.java @@ -31,7 +31,6 @@ import com.azure.search.documents.indexes.models.ShaperSkill; import com.azure.search.documents.indexes.models.SplitSkill; import com.azure.search.documents.indexes.models.SplitSkillLanguage; -import com.azure.search.documents.indexes.models.TextExtractionAlgorithm; import com.azure.search.documents.indexes.models.TextSplitMode; import com.azure.search.documents.indexes.models.VisualFeature; import com.azure.search.documents.indexes.models.WebApiSkill; @@ -118,7 +117,7 @@ public void createSkillsetReturnsCorrectDefinitionMergeText() { @Test public void createSkillsetReturnsCorrectDefinitionOcrEntity() { - SearchIndexerSkillset expectedSkillset = createTestSkillsetOcrEntity(null, null); + SearchIndexerSkillset expectedSkillset = createTestSkillsetOcrEntity(null); SearchIndexerSkillset actualSkillset = client.createSkillset(expectedSkillset); skillsetsToDelete.add(actualSkillset.getName()); assertObjectEquals(expectedSkillset, actualSkillset, true, "etag"); @@ -126,7 +125,7 @@ public void createSkillsetReturnsCorrectDefinitionOcrEntity() { List entityCategories = Arrays.asList( EntityCategory.LOCATION, EntityCategory.ORGANIZATION, EntityCategory.PERSON); - expectedSkillset = createTestSkillsetOcrEntity(TextExtractionAlgorithm.PRINTED, entityCategories); + expectedSkillset = createTestSkillsetOcrEntity(entityCategories); actualSkillset = client.createSkillset(expectedSkillset); skillsetsToDelete.add(actualSkillset.getName()); assertObjectEquals(expectedSkillset, actualSkillset, true, "etag"); @@ -135,19 +134,19 @@ public void createSkillsetReturnsCorrectDefinitionOcrEntity() { @Test public void createSkillsetReturnsCorrectDefinitionOcrHandwritingSentiment() { SearchIndexerSkillset expectedSkillset = createTestSkillsetOcrSentiment(OcrSkillLanguage.PT, - SentimentSkillLanguage.PT_PT, TextExtractionAlgorithm.PRINTED); + SentimentSkillLanguage.PT_PT); SearchIndexerSkillset actualSkillset = client.createSkillset(expectedSkillset); skillsetsToDelete.add(actualSkillset.getName()); assertObjectEquals(expectedSkillset, actualSkillset, true, "etag"); expectedSkillset = createTestSkillsetOcrSentiment(OcrSkillLanguage.FI, - SentimentSkillLanguage.FI, TextExtractionAlgorithm.PRINTED); + SentimentSkillLanguage.FI); actualSkillset = client.createSkillset(expectedSkillset); skillsetsToDelete.add(actualSkillset.getName()); assertObjectEquals(expectedSkillset, actualSkillset, true, "etag"); expectedSkillset = createTestSkillsetOcrSentiment(OcrSkillLanguage.EN, - SentimentSkillLanguage.EN, TextExtractionAlgorithm.HANDWRITTEN); + SentimentSkillLanguage.EN); actualSkillset = client.createSkillset(expectedSkillset); skillsetsToDelete.add(actualSkillset.getName()); assertObjectEquals(expectedSkillset, actualSkillset, true, "etag"); @@ -397,7 +396,7 @@ public void canCreateAndDeleteSkillset() { @Test public void createOrUpdateCreatesWhenSkillsetDoesNotExist() { - SearchIndexerSkillset expected = createTestOcrSkillSet(1, TextExtractionAlgorithm.PRINTED); + SearchIndexerSkillset expected = createTestOcrSkillSet(1); SearchIndexerSkillset actual = client.createOrUpdateSkillset(expected); skillsetsToDelete.add(actual.getName()); @@ -406,7 +405,7 @@ public void createOrUpdateCreatesWhenSkillsetDoesNotExist() { @Test public void createOrUpdateCreatesWhenSkillsetDoesNotExistWithResponse() { - SearchIndexerSkillset expected = createTestOcrSkillSet(1, TextExtractionAlgorithm.PRINTED); + SearchIndexerSkillset expected = createTestOcrSkillSet(1); Response createOrUpdateResponse = client.createOrUpdateSkillsetWithResponse(expected, false, generateRequestOptions(), Context.NONE); skillsetsToDelete.add(createOrUpdateResponse.getValue().getName()); @@ -416,13 +415,13 @@ public void createOrUpdateCreatesWhenSkillsetDoesNotExistWithResponse() { @Test public void createOrUpdateUpdatesWhenSkillsetExists() { - SearchIndexerSkillset skillset = createTestOcrSkillSet(1, TextExtractionAlgorithm.HANDWRITTEN); + SearchIndexerSkillset skillset = createTestOcrSkillSet(1); Response createOrUpdateResponse = client.createOrUpdateSkillsetWithResponse(skillset, false, generateRequestOptions(), Context.NONE); skillsetsToDelete.add(createOrUpdateResponse.getValue().getName()); assertEquals(HttpURLConnection.HTTP_CREATED, createOrUpdateResponse.getStatusCode()); - skillset = createTestOcrSkillSet(2, TextExtractionAlgorithm.PRINTED).setName(skillset.getName()); + skillset = createTestOcrSkillSet(2).setName(skillset.getName()); createOrUpdateResponse = client.createOrUpdateSkillsetWithResponse(skillset, false, generateRequestOptions(), Context.NONE); assertEquals(HttpURLConnection.HTTP_OK, createOrUpdateResponse.getStatusCode()); @@ -614,8 +613,8 @@ SearchIndexerSkillset createTestSkillsetImageAnalysisKeyPhrase() { .singletonList(createOutputFieldMappingEntry("description", "mydescription")); skills.add(new ImageAnalysisSkill() - .setVisualFeatures(Arrays.asList(VisualFeature.values())) - .setDetails(Arrays.asList(ImageDetail.values())) + .setVisualFeatures(new ArrayList<>(VisualFeature.values())) + .setDetails(new ArrayList<>((ImageDetail.values()))) .setDefaultLanguageCode(ImageAnalysisSkillLanguage.EN) .setName("myimage") .setDescription("Tested image analysis skill") @@ -695,7 +694,6 @@ SearchIndexerSkillset createTestSkillsetOcrShaper() { .singletonList(createOutputFieldMappingEntry("text", "mytext")); skills.add(new OcrSkill() - .setTextExtractionAlgorithm(TextExtractionAlgorithm.PRINTED) .setDefaultLanguageCode(OcrSkillLanguage.EN) .setName("myocr") .setDescription("Tested OCR skill") @@ -728,7 +726,6 @@ SearchIndexerSkillset createSkillsetWithCognitiveServicesKey() { List skills = Collections.singletonList( new OcrSkill() - .setTextExtractionAlgorithm(TextExtractionAlgorithm.PRINTED) .setDefaultLanguageCode(OcrSkillLanguage.EN) .setName("myocr") .setDescription("Tested OCR skill") @@ -781,7 +778,7 @@ SearchIndexerSkillset mutateSkillsInSkillset(SearchIndexerSkillset skillset) { )); } - SearchIndexerSkillset createTestSkillsetOcrEntity(TextExtractionAlgorithm algorithm, List categories) { + SearchIndexerSkillset createTestSkillsetOcrEntity(List categories) { List skills = new ArrayList<>(); List inputs = Arrays.asList( simpleInputFieldMappingEntry("url", "/document/url"), @@ -791,7 +788,6 @@ SearchIndexerSkillset createTestSkillsetOcrEntity(TextExtractionAlgorithm algori .singletonList(createOutputFieldMappingEntry("text", "mytext")); skills.add(new OcrSkill() - .setTextExtractionAlgorithm(algorithm) .setDefaultLanguageCode(OcrSkillLanguage.EN) .setName("myocr") .setDescription("Tested OCR skill") @@ -819,7 +815,7 @@ SearchIndexerSkillset createTestSkillsetOcrEntity(TextExtractionAlgorithm algori } SearchIndexerSkillset createTestSkillsetOcrSentiment(OcrSkillLanguage ocrLanguageCode, - SentimentSkillLanguage sentimentLanguageCode, TextExtractionAlgorithm algorithm) { + SentimentSkillLanguage sentimentLanguageCode) { List skills = new ArrayList<>(); List inputs = Arrays.asList( simpleInputFieldMappingEntry("url", "/document/url"), @@ -828,7 +824,6 @@ SearchIndexerSkillset createTestSkillsetOcrSentiment(OcrSkillLanguage ocrLanguag List outputs = Collections .singletonList(createOutputFieldMappingEntry("text", "mytext")); skills.add(new OcrSkill() - .setTextExtractionAlgorithm(algorithm) .setDefaultLanguageCode(ocrLanguageCode) .setName("myocr") .setDescription("Tested OCR skill") @@ -862,7 +857,6 @@ SearchIndexerSkillset createTestSkillsetOcrKeyPhrase(OcrSkillLanguage ocrLanguag .singletonList(createOutputFieldMappingEntry("text", "mytext")); skills.add(new OcrSkill() - .setTextExtractionAlgorithm(TextExtractionAlgorithm.PRINTED) .setDefaultLanguageCode(ocrLanguageCode) .setName("myocr") .setDescription("Tested OCR skill") @@ -897,7 +891,6 @@ SearchIndexerSkillset createTestSkillsetOcrSplitText(OcrSkillLanguage ocrLanguag .singletonList(createOutputFieldMappingEntry("text", "mytext")); skills.add(new OcrSkill() - .setTextExtractionAlgorithm(TextExtractionAlgorithm.PRINTED) .setDefaultLanguageCode(ocrLanguageCode) .setName("myocr") .setDescription("Tested OCR skill") @@ -922,7 +915,7 @@ SearchIndexerSkillset createTestSkillsetOcrSplitText(OcrSkillLanguage ocrLanguag .setSkills(skills); } - SearchIndexerSkillset createTestOcrSkillSet(int repeat, TextExtractionAlgorithm algorithm) { + SearchIndexerSkillset createTestOcrSkillSet(int repeat) { List skills = new ArrayList<>(); List inputs = Arrays.asList( @@ -935,8 +928,7 @@ SearchIndexerSkillset createTestOcrSkillSet(int repeat, TextExtractionAlgorithm skills.add(new OcrSkill() .setDefaultLanguageCode(OcrSkillLanguage.EN) - .setTextExtractionAlgorithm(algorithm) - .setShouldDetectOrientation(false) + .shouldDetectOrientation(false) .setName("myocr-" + i) .setDescription("Tested OCR skill") .setContext(CONTEXT_VALUE) @@ -960,7 +952,7 @@ SearchIndexerSkillset createSkillsetWithOcrDefaultSettings(Boolean shouldDetectO List skills = Collections.singletonList( new OcrSkill() - .setShouldDetectOrientation(shouldDetectOrientation) + .shouldDetectOrientation(shouldDetectOrientation) .setName("myocr") .setDescription("Tested OCR skill") .setContext(CONTEXT_VALUE)