Merge pull request #7 from GoodforGod/hotfix/1.1.6

1.1.6

Author: GoodforGod

README.md

@@ -13,7 +13,7 @@ Avro Decoder with support optional fields in JSON.
 **Gradle**
 ```groovy
 dependencies {
-    implementation 'com.github.goodforgod:avro-json-optional-decoder:1.1.5'
+    implementation 'com.github.goodforgod:avro-json-optional-decoder:1.1.6'
 }
 ```
 
@@ -22,7 +22,7 @@ dependencies {
 <dependency>
     <groupId>com.github.goodforgod</groupId>
     <artifactId>avro-json-optional-decoder</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
 </dependency>
 ```
 
@@ -34,7 +34,7 @@ Library is compatible with different Apache Avro versions. Please use compatible
 
 | [Apache Avro](https://mvnrepository.com/artifact/org.apache.avro/avro-compiler) Version | [Library](https://mvnrepository.com/artifact/com.github.goodforgod/avro-json-optional-decoder) Version |
 | ---- | ---- |
-| [1.9.2](https://mvnrepository.com/artifact/org.apache.avro/avro-compiler/1.9.2) | [1.1.5](https://mvnrepository.com/artifact/com.github.goodforgod/avro-json-optional-decoder/1.1.4) |
+| [1.9.2](https://mvnrepository.com/artifact/org.apache.avro/avro-compiler/1.9.2) | [1.1.6](https://mvnrepository.com/artifact/com.github.goodforgod/avro-json-optional-decoder/1.1.4) |
 | [1.8.2](https://mvnrepository.com/artifact/org.apache.avro/avro-compiler/1.8.2) | [1.0.1](https://mvnrepository.com/artifact/com.github.goodforgod/avro-json-optional-decoder/1.0.1) |
 
 

gradle.properties

@@ -1,6 +1,6 @@
 groupId=com.github.goodforgod
 artifactId=avro-json-optional-decoder
-artifactVersion=1.1.5
+artifactVersion=1.1.6
 
 
 ##### GRADLE

src/main/java/io/avro/decoder/JsonOptionalDecoder.java

@@ -557,6 +557,10 @@ private void injectDefaultValueIfAvailable(final JsonParser in, String fieldName
     }
 
     private static Field findField(Schema schema, String name) {
+        if (!schema.getType().equals(Schema.Type.RECORD)) {
+            return null;
+        }
+
         if (schema.getField(name) != null) {
             return schema.getField(name);
         }
@@ -570,8 +574,7 @@ private static Field findField(Schema schema, String name) {
                                 .map(sub -> {
                                     if (sub.getType().equals(Schema.Type.RECORD)) {
                                         return findField(sub, name);
-                                    } else if (sub.getType().equals(Schema.Type.ARRAY)
-                                            && sub.getElementType().getType().equals(Schema.Type.RECORD)) {
+                                    } else if (sub.getType().equals(Schema.Type.ARRAY)) {
                                         return findField(sub.getElementType(), name);
                                     } else {
                                         return null;