From e001c31529b208e7c9908017fafd4e9dd23cc5f0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 29 Nov 2019 12:29:08 +0100 Subject: [PATCH] Do not allow DatabaseSchema name/version to be mutated The setters to do so are not used anywhere, eliminate them, making it clear these two fields are final. Change-Id: I817dfb0cc0791c2ad91671b6d5e637c8ae8a0d92 Signed-off-by: Robert Varga (cherry picked from commit e93883f2dcf0bc9db2aee076ca851932b6549fc1) --- .../ovsdb/lib/schema/DatabaseSchema.java | 18 ++---------------- .../ovsdb/lib/schema/typed/TyperUtilsTest.java | 12 +++++++----- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java index 1868da636..ccf43d13a 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java @@ -25,18 +25,12 @@ import org.slf4j.LoggerFactory; * Represents an ovsdb database schema, which is comprised of a set of tables. */ public class DatabaseSchema { - private static final Logger LOG = LoggerFactory.getLogger(DatabaseSchema.class); - private String name; - - private Version version; + private final String name; + private final Version version; private final Map tables; - public DatabaseSchema(final Map tables) { - this.tables = tables; - } - public DatabaseSchema(final String name, final Version version, final Map tables) { this.name = name; this.version = version; @@ -107,18 +101,10 @@ public class DatabaseSchema { return name; } - public void setName(final String name) { - this.name = name; - } - public Version getVersion() { return version; } - public void setVersion(final Version version) { - this.version = version; - } - public void populateInternallyGeneratedColumns() { for (TableSchema tableSchema : tables.values()) { tableSchema.populateInternallyGeneratedColumns(); diff --git a/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java b/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java index e64203b3f..7d3e8a521 100644 --- a/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java +++ b/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java @@ -46,7 +46,8 @@ public class TyperUtilsTest { public void testGetTableSchemaWithIncludedTypedTable() { // Given ... GenericTableSchema testTableSchema = new GenericTableSchema("TestTypedTable"); - DatabaseSchema dbSchema = new DatabaseSchema(ImmutableMap.of(testTableSchema.getName(), testTableSchema)); + DatabaseSchema dbSchema = new DatabaseSchema("testDb", Version.NULL, + ImmutableMap.of(testTableSchema.getName(), testTableSchema)); // When ... GenericTableSchema tableSchema = TyperUtils.getTableSchema(dbSchema, TestTypedTable.class); @@ -63,7 +64,8 @@ public class TyperUtilsTest { public void testGetTableSchemaWithIncludedUntypedTable() { // Given ... GenericTableSchema testTableSchema = new GenericTableSchema("TestUntypedTable"); - DatabaseSchema dbSchema = new DatabaseSchema(ImmutableMap.of(testTableSchema.getName(), testTableSchema)); + DatabaseSchema dbSchema = new DatabaseSchema("testDb", Version.NULL, + ImmutableMap.of(testTableSchema.getName(), testTableSchema)); // When ... GenericTableSchema tableSchema = TyperUtils.getTableSchema(dbSchema, TestUntypedTable.class); @@ -79,7 +81,7 @@ public class TyperUtilsTest { @Test(expected = IllegalArgumentException.class) public void testGetTableSchemaWithoutIncludedTypedTable() { // Given ... - DatabaseSchema dbSchema = new DatabaseSchema(Collections.emptyMap()); + DatabaseSchema dbSchema = new DatabaseSchema("testDb", Version.NULL, Collections.emptyMap()); // When ... TyperUtils.getTableSchema(dbSchema, TestTypedTable.class); @@ -92,7 +94,7 @@ public class TyperUtilsTest { @Test(expected = IllegalArgumentException.class) public void testGetTableSchemaWithoutIncludedUntypedTable() { // Given ... - DatabaseSchema dbSchema = new DatabaseSchema(Collections.emptyMap()); + DatabaseSchema dbSchema = new DatabaseSchema("testDb", Version.NULL, Collections.emptyMap()); // When ... TyperUtils.getTableSchema(dbSchema, TestUntypedTable.class); @@ -172,7 +174,7 @@ public class TyperUtilsTest { */ // We extract the real cause, which “loses” the original cause, but that’s fine @SuppressWarnings("checkstyle:AvoidHidingCauseException") - private void callCheckVersion(Version schema, Version from, Version to) throws SchemaVersionMismatchException { + private static void callCheckVersion(final Version schema, final Version from, final Version to) { try { Method method = TyperUtils.class.getDeclaredMethod("checkVersion", Version.class, Version.class, Version.class); -- 2.36.6