From cbd3bab35666aa676c1f3722aaef8dcbbdc8243f Mon Sep 17 00:00:00 2001
From: Almog Gavra <almog@confluent.io>
Date: Fri, 20 Dec 2019 11:25:56 -0800
Subject: [PATCH] fix: immutability in some more classes (MINOR) (#4179)

---
 .../io/confluent/ksql/execution/codegen/CodeGenSpec.java     | 5 +++--
 .../execution/expression/tree/CreateStructExpression.java    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/codegen/CodeGenSpec.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/codegen/CodeGenSpec.java
index ee5a5b9bd334..56ede106bf78 100644
--- a/ksql-execution/src/main/java/io/confluent/ksql/execution/codegen/CodeGenSpec.java
+++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/codegen/CodeGenSpec.java
@@ -32,6 +32,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.kafka.connect.data.ConnectSchema;
 import org.apache.kafka.connect.data.Schema;
 
 @Immutable
@@ -239,14 +240,14 @@ public String toString() {
   @Immutable
   public static final class SchemaArgumentSpec extends BaseArgumentSpec {
 
-    private final Schema schema;
+    private final ConnectSchema schema;
 
     SchemaArgumentSpec(
         String name,
         Schema schema
     ) {
       super(name, Schema.class);
-      this.schema = requireNonNull(schema, "schema");
+      this.schema = (ConnectSchema) requireNonNull(schema, "schema").schema();
     }
 
     @Override
diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/expression/tree/CreateStructExpression.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/expression/tree/CreateStructExpression.java
index 925e49638c2b..3a07370f3ca5 100644
--- a/ksql-execution/src/main/java/io/confluent/ksql/execution/expression/tree/CreateStructExpression.java
+++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/expression/tree/CreateStructExpression.java
@@ -67,6 +67,7 @@ public int hashCode() {
     return Objects.hash(fields);
   }
 
+  @Immutable
   public static class Field {
     private final String name;
     private final Expression value;