update client file

Azure · Jul 8, 2021 · e94baba · e94baba
1 parent 00bed56
commit e94baba
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/...i-formrecognizer/src/main/java/com/azure/ai/formrecognizer/FormRecognizerAsyncClient.java b/...i-formrecognizer/src/main/java/com/azure/ai/formrecognizer/FormRecognizerAsyncClient.java
@@ -238,7 +238,7 @@ public final class FormRecognizerAsyncClient {
 
             final RecognizeCustomFormsOptions finalRecognizeCustomFormsOptions
                 = getRecognizeCustomFormOptions(recognizeCustomFormsOptions);
-            final boolean isFieldElementsIncluded = recognizeCustomFormsOptions.isFieldElementsIncluded();
+            final boolean isFieldElementsIncluded = finalRecognizeCustomFormsOptions.isFieldElementsIncluded();
             return new PollerFlux<>(
                 finalRecognizeCustomFormsOptions.getPollInterval(),
                 streamActivationOperation(
@@ -335,7 +335,7 @@ public PollerFlux<FormRecognizerOperationResult, List<FormPage>> beginRecognizeC
                             ? null : Language.fromString(finalRecognizeContentOptions.getLanguage().toString()),
                         finalRecognizeContentOptions.getReadingOrder() != null
                             ? com.azure.ai.formrecognizer.implementation.models.ReadingOrder.fromString(
-                                recognizeContentOptions.getReadingOrder().toString())
+                            finalRecognizeContentOptions.getReadingOrder().toString())
                             : null,
                         new SourcePath().setSource(formUrl),
                         context)
@@ -426,7 +426,7 @@ PollerFlux<FormRecognizerOperationResult, List<FormPage>> beginRecognizeContent(
                             ? null : Language.fromString(finalRecognizeContentOptions.getLanguage().toString()),
                         finalRecognizeContentOptions.getReadingOrder() != null
                             ? com.azure.ai.formrecognizer.implementation.models.ReadingOrder.fromString(
-                            recognizeContentOptions.getReadingOrder().toString())
+                            finalRecognizeContentOptions.getReadingOrder().toString())
                             : null,
                         form,
                         length,

diff --git a/...ognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/Transforms.java b/...ognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/Transforms.java
@@ -360,18 +360,12 @@ private static FormField setFormField(String name, FieldData valueData, FieldVal
                         DateTimeFormatter.ofPattern("HH:mm:ss"));
                     value = new com.azure.ai.formrecognizer.models.FieldValue(fieldTime, FieldValueType.TIME);
                 } else {
-                    throw LOGGER.logExceptionAsError(new RuntimeException(String.format(NORMALIZATION_ERROR_MESSAGE,
-                        fieldValue.getType())));
+                    value = new com.azure.ai.formrecognizer.models.FieldValue(null, FieldValueType.TIME);
                 }
                 break;
             case DATE:
-                if (fieldValue.getValueDate() != null) {
-                    value = new com.azure.ai.formrecognizer.models.FieldValue(fieldValue.getValueDate(),
-                        FieldValueType.DATE);
-                } else {
-                    throw LOGGER.logExceptionAsError(new RuntimeException(String.format(NORMALIZATION_ERROR_MESSAGE,
-                        fieldValue.getType())));
-                }
+                value = new com.azure.ai.formrecognizer.models.FieldValue(fieldValue.getValueDate(),
+                    FieldValueType.DATE);
                 break;
             case INTEGER:
                 if (fieldValue.getValueInteger() != null) {
@@ -386,12 +380,21 @@ private static FormField setFormField(String name, FieldData valueData, FieldVal
                     FieldValueType.FLOAT);
                 break;
             case ARRAY:
-                value = new com.azure.ai.formrecognizer.models.FieldValue(
-                    toFieldValueArray(fieldValue.getValueArray(), readResults), FieldValueType.LIST);
+                if (fieldValue.getValueArray() != null) {
+                    value = new com.azure.ai.formrecognizer.models.FieldValue(
+                        toFieldValueArray(fieldValue.getValueArray(), readResults), FieldValueType.LIST);
+                } else {
+                    value = new com.azure.ai.formrecognizer.models.FieldValue(null, FieldValueType.LIST);
+                }
                 break;
             case OBJECT:
-                value = new com.azure.ai.formrecognizer.models.FieldValue(
+                if (fieldValue.getValueObject() != null) {
+                    value = new com.azure.ai.formrecognizer.models.FieldValue(
                         toFieldValueObject(fieldValue.getValueObject(), readResults), FieldValueType.MAP);
+                } else {
+                    value = new com.azure.ai.formrecognizer.models.FieldValue(null, FieldValueType.MAP);
+                }
+
                 break;
             case SELECTION_MARK:
                 if (fieldValue.getValueSelectionMark() != null) {
@@ -446,9 +449,6 @@ private static float setDefaultConfidenceValue(Float confidence) {
      */
     private static Map<String, FormField> toFieldValueObject(Map<String, FieldValue> valueObject,
                                                              List<ReadResult> readResults) {
-        if (valueObject == null) {
-            return null;
-        }
         Map<String, FormField> fieldValueObjectMap = new TreeMap<>();
         valueObject.forEach((key, fieldValue) -> {
 
@@ -475,9 +475,6 @@ private static Map<String, FormField> toFieldValueObject(Map<String, FieldValue>
      * @return The List of {@link FormField}.
      */
     private static List<FormField> toFieldValueArray(List<FieldValue> valueArray, List<ReadResult> readResults) {
-        if (valueArray == null) {
-            return null;
-        }
         return valueArray.stream()
             .map(fieldValue -> {
                 FieldData valueData = null;