From 22b98085d54528b30840a60d9d0da04b0a6a3c72 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 29 Nov 2019 12:23:54 +0100
Subject: [PATCH] Do not allow TableSchema columns to be directly set

This makes it obvious that the collection is largely controlled
by TableSchema, bringing it another step closer to being immutable.

Change-Id: Iacb375c3cafbe687966729626fe30a3d08e8f31e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 6ad4ee4a708a10734161a52afb903e6797991937)
---
 .../opendaylight/ovsdb/lib/schema/TableSchema.java | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/TableSchema.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/TableSchema.java
index c2831c5c2..9ad3953d2 100644
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/TableSchema.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/TableSchema.java
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -26,11 +27,12 @@ import org.opendaylight.ovsdb.lib.schema.BaseType.UuidBaseType;
 
 public abstract class TableSchema<E extends TableSchema<E>> {
 
-    private String name;
-    private Map<String, ColumnSchema> columns;
+    private final String name;
+    private final Map<String, ColumnSchema> columns;
 
     protected TableSchema(final String name) {
         this.name = name;
+        this.columns = new HashMap<>();
     }
 
     protected TableSchema(final String name, final Map<String, ColumnSchema> columns) {
@@ -103,14 +105,6 @@ public abstract class TableSchema<E extends TableSchema<E>> {
         return name;
     }
 
-    protected void setName(final String name) {
-        this.name = name;
-    }
-
-    protected void setColumns(final Map<String, ColumnSchema> columns) {
-        this.columns = columns;
-    }
-
     public TableUpdate<E> updatesFromJson(final JsonNode value) {
         TableUpdate<E> tableUpdate = new TableUpdate<>();
         Iterator<Entry<String, JsonNode>> fields = value.fields();
-- 
2.36.6