Fix review comments

ballerina-platform · May 9, 2024 · 67082db · 67082db
1 parent a4d9890
commit 67082db
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/native/src/main/java/io/ballerina/lib/avro/deserialize/ArrayDeserializer.java b/native/src/main/java/io/ballerina/lib/avro/deserialize/ArrayDeserializer.java
@@ -26,7 +26,7 @@
 public class ArrayDeserializer extends Deserializer {
 
     public ArrayDeserializer(Schema schema, Type type) {
-        super(schema, type);
+        super(type, schema);
     }
 
     @Override

diff --git a/native/src/main/java/io/ballerina/lib/avro/deserialize/Deserializer.java b/native/src/main/java/io/ballerina/lib/avro/deserialize/Deserializer.java
@@ -30,18 +30,16 @@ public abstract class Deserializer {
     private final Type type;
 
     public Deserializer() {
-        this.schema = null;
-        this.type = null;
+        this(null);
     }
 
     public Deserializer(Type type) {
-        this.schema = null;
-        this.type = TypeUtils.getReferredType(type);
+        this(type, null);
     }
 
-    public Deserializer(Schema schema, Type type) {
-        this.schema = new Schema.Parser().parse(schema.toString());
-        this.type = TypeUtils.getReferredType(type);
+    public Deserializer(Type type, Schema schema) {
+        this.schema = schema == null ? null : new Schema.Parser().parse(schema.toString());
+        this.type = type == null ? null : TypeUtils.getReferredType(type);
     }
 
     public Schema getSchema() {

diff --git a/native/src/main/java/io/ballerina/lib/avro/deserialize/FixedDeserializer.java b/native/src/main/java/io/ballerina/lib/avro/deserialize/FixedDeserializer.java
@@ -26,7 +26,7 @@
 public class FixedDeserializer extends Deserializer {
 
     public FixedDeserializer(Schema schema, Type type) {
-        super(schema, type);
+        super(type, schema);
     }
 
     @Override

diff --git a/native/src/main/java/io/ballerina/lib/avro/deserialize/MapDeserializer.java b/native/src/main/java/io/ballerina/lib/avro/deserialize/MapDeserializer.java
@@ -28,7 +28,7 @@
 public class MapDeserializer extends Deserializer {
 
     public MapDeserializer(Schema schema, Type type) {
-        super(schema, type);
+        super(type, schema);
     }
 
     @Override

diff --git a/native/src/main/java/io/ballerina/lib/avro/deserialize/PrimitiveDeserializer.java b/native/src/main/java/io/ballerina/lib/avro/deserialize/PrimitiveDeserializer.java
@@ -26,7 +26,7 @@
 public class PrimitiveDeserializer extends Deserializer {
 
     public PrimitiveDeserializer(Schema schema, Type type) {
-        super(schema, type);
+        super(type, schema);
     }
 
     @Override

diff --git a/native/src/main/java/io/ballerina/lib/avro/deserialize/RecordDeserializer.java b/native/src/main/java/io/ballerina/lib/avro/deserialize/RecordDeserializer.java
@@ -27,7 +27,7 @@
 public class RecordDeserializer extends Deserializer {
 
     public RecordDeserializer(Schema schema, Type type) {
-        super(schema, type);
+        super(type, schema);
     }
 
     @Override

diff --git a/native/src/main/java/io/ballerina/lib/avro/deserialize/UnionDeserializer.java b/native/src/main/java/io/ballerina/lib/avro/deserialize/UnionDeserializer.java
@@ -8,7 +8,7 @@
 public class UnionDeserializer extends Deserializer {
 
     public UnionDeserializer(Schema schema, Type type) {
-        super(schema, type);
+        super(type, schema);
     }
 
     @Override