From: Michael Vorburger Date: Fri, 22 Jul 2016 21:05:19 +0000 (+0200) Subject: Checkstyle fixes (to be enforced) X-Git-Tag: release/boron~32^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=dec6171073d874b5961e1119eb03d465bc8adf09;p=ovsdb.git Checkstyle fixes (to be enforced) preparing for https://git.opendaylight.org/gerrit/#/c/41305/ with: * Utility classes should have private constructor * potential future problems re. hidden fields * inner assignments Change-Id: I616414ed56e468910167a790b5e67a6807600f37 Signed-off-by: Michael Vorburger --- diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java index 2bf267939..374421e51 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java @@ -22,6 +22,9 @@ import org.opendaylight.ovsdb.lib.operations.OperationResult; public class FutureTransformUtils { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + private FutureTransformUtils() { + } + public static final ListenableFuture> transformTransactResponse( ListenableFuture> transactResponseFuture, final List operations) { OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java index 89a7a1ff6..2560c7192 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java @@ -63,7 +63,7 @@ public class OvsdbClientImpl implements OvsdbClient { private static final Logger LOG = LoggerFactory.getLogger(OvsdbClientImpl.class); private ExecutorService executorService; private OvsdbRPC rpc; - private Map schema = Maps.newHashMap(); + private Map schemas = Maps.newHashMap(); private Map monitorCallbacks = Maps.newHashMap(); private OvsdbRPC.Callback rpcCallback; private OvsdbConnectionInfo connectionInfo; @@ -86,7 +86,7 @@ public class OvsdbClientImpl implements OvsdbClient { } /** - * Genereate the threadFactory based on ACTIVE, PASSIVE (SSL/NON-SSL) connection type. + * Generate the threadFactory based on ACTIVE, PASSIVE (SSL/NON-SSL) connection type. * @param type ACTIVE or PASSIVE {@link ConnectionType} * @param socketConnType SSL or NON-SSL {@link SocketConnectionType} * @param executorNameArgs Additional args to append to thread name format @@ -158,7 +158,7 @@ public class OvsdbClientImpl implements OvsdbClient { for (Iterator> itr = updatesJson.fields(); itr.hasNext();) { Map.Entry entry = itr.next(); - DatabaseSchema databaseSchema = this.schema.get(dbSchema.getName()); + DatabaseSchema databaseSchema = this.schemas.get(dbSchema.getName()); TableSchema table = databaseSchema.table(entry.getKey(), TableSchema.class); tableUpdateMap.put(entry.getKey(), table.updatesFromJson(entry.getValue())); @@ -310,7 +310,7 @@ public class OvsdbClientImpl implements OvsdbClient { public boolean isReady(int timeout) throws InterruptedException { while (timeout > 0) { - if (!schema.isEmpty()) { + if (!schemas.isEmpty()) { return true; } Thread.sleep(1000); @@ -327,7 +327,7 @@ public class OvsdbClientImpl implements OvsdbClient { @Override public ListenableFuture getSchema(final String database) { - DatabaseSchema databaseSchema = schema.get(database); + DatabaseSchema databaseSchema = schemas.get(database); if (databaseSchema == null) { return Futures.transform( @@ -338,7 +338,7 @@ public class OvsdbClientImpl implements OvsdbClient { if (result.containsKey(database)) { DatabaseSchema dbSchema = result.get(database); dbSchema.populateInternallyGeneratedColumns(); - OvsdbClientImpl.this.schema.put(database, dbSchema); + OvsdbClientImpl.this.schemas.put(database, dbSchema); return dbSchema; } else { return null; @@ -401,7 +401,7 @@ public class OvsdbClientImpl implements OvsdbClient { @Override public DatabaseSchema getDatabaseSchema(String dbName) { - return schema.get(dbName); + return schemas.get(dbName); } /** diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java index 8aa082e4e..b8e3e29cf 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java @@ -109,7 +109,9 @@ public class JsonRpcDecoder extends ByteToMessageDecoder { JsonParser jp = jacksonJsonFactory.createParser(new ByteBufInputStream(slice)); JsonNode root = jp.readValueAsTree(); out.add(root); - leftCurlies = rightCurlies = lastRecordBytes = 0; + leftCurlies = 0; + rightCurlies = 0; + lastRecordBytes = 0; recordsRead++; break; } diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonUtils.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonUtils.java index 6b507139b..3b4c54297 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonUtils.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonUtils.java @@ -5,19 +5,19 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.ovsdb.lib.jsonrpc; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; - public class JsonUtils { - static ObjectMapper mapper = new ObjectMapper(); + private static ObjectMapper mapper = new ObjectMapper(); + private static ObjectWriter prettyWriter = mapper.writerWithDefaultPrettyPrinter(); - static ObjectWriter prettyWriter = mapper.writerWithDefaultPrettyPrinter(); + private JsonUtils() { + } public static String prettyString(Object jsonNode) { try { diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java index 0a10991d8..cc5e36809 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java @@ -60,11 +60,11 @@ public class MonitorRequestBuilder> { } public MonitorRequest build() { - MonitorRequest monitorRequest = getMonitorRequest(); - if (monitorRequest.getSelect() == null) { - monitorRequest.setSelect(new MonitorSelect()); + MonitorRequest newBuiltMonitorRequest = getMonitorRequest(); + if (newBuiltMonitorRequest.getSelect() == null) { + newBuiltMonitorRequest.setSelect(new MonitorSelect()); } - monitorRequest.setTableName(tableSchema.getName()); - return monitorRequest; + newBuiltMonitorRequest.setTableName(tableSchema.getName()); + return newBuiltMonitorRequest; } } diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java index ec10b71c4..180192f89 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java @@ -40,14 +40,15 @@ public class TableUpdate> { return oldRow; } - public void setOld(Row oldRow) { - this.oldRow = oldRow; + public void setOld(Row old) { + this.oldRow = old; } public Row getNew() { return newRow; } + @SuppressWarnings("checkstyle:HiddenField") public void setNew(Row newRow) { this.newRow = newRow; } diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java index 006334f28..65aeb6600 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java @@ -5,15 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.ovsdb.lib.notation; - import com.fasterxml.jackson.annotation.JsonIgnore; import org.opendaylight.ovsdb.lib.schema.ColumnSchema; import org.opendaylight.ovsdb.lib.schema.TableSchema; - public class Column, D> { @JsonIgnore private ColumnSchema schema; @@ -24,8 +21,8 @@ public class Column, D> { this.data = data; } - public , T> T getData(ColumnSchema schema) { - return schema.validate(data); + public , T> T getData(ColumnSchema anotherSchema) { + return anotherSchema.validate(data); } public D getData() { diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/BaseType.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/BaseType.java index 2e0e483bd..f3fb5cd0e 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/BaseType.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/BaseType.java @@ -93,17 +93,14 @@ public abstract class BaseType> { @Override protected void getConstraints(IntegerBaseType baseType, JsonNode type) { - - JsonNode node = null; - - if ((node = type.get("maxInteger")) != null) { - baseType.setMax(node.asLong()); + JsonNode typeMaxNode = type.get("maxInteger"); + if (typeMaxNode != null) { + baseType.setMax(typeMaxNode.asLong()); } - - if ((node = type.get("minInteger")) != null) { - baseType.setMin(node.asLong()); + JsonNode typeMinNode = type.get("minInteger"); + if (typeMinNode != null) { + baseType.setMin(typeMinNode.asLong()); } - populateEnum(type); } @@ -119,10 +116,10 @@ public abstract class BaseType> { private void populateEnum(JsonNode node) { if (node.has("enum")) { - Set enums = Sets.newHashSet(); + Set nodesEnums = Sets.newHashSet(); JsonNode anEnum = node.get("enum").get(1); for (JsonNode enm : anEnum) { - enums.add(enm.asLong()); + nodesEnums.add(enm.asLong()); } } } @@ -208,17 +205,14 @@ public abstract class BaseType> { @Override protected void getConstraints(RealBaseType baseType, JsonNode type) { - - JsonNode node; - - if ((node = type.get("maxReal")) != null) { - baseType.setMax(node.asLong()); + JsonNode typeMaxNode = type.get("maxReal"); + if (typeMaxNode != null) { + baseType.setMax(typeMaxNode.asLong()); } - - if ((node = type.get("minReal")) != null) { - baseType.setMin(node.asLong()); + JsonNode typeMinNode = type.get("minReal"); + if (typeMinNode != null) { + baseType.setMin(typeMinNode.asLong()); } - populateEnum(type); } @@ -234,10 +228,10 @@ public abstract class BaseType> { private void populateEnum(JsonNode node) { if (node.has("enum")) { - Set enums = Sets.newHashSet(); + Set nodesEnums = Sets.newHashSet(); JsonNode anEnum = node.get("enum").get(1); for (JsonNode enm : anEnum) { - enums.add(enm.asDouble()); + nodesEnums.add(enm.asDouble()); } } } @@ -354,17 +348,14 @@ public abstract class BaseType> { @Override protected void getConstraints(StringBaseType baseType, JsonNode type) { - - JsonNode node = null; - - if ((node = type.get("maxLength")) != null) { - baseType.setMaxLength(node.asInt()); + JsonNode typeMaxNode = type.get("maxLength"); + if (typeMaxNode != null) { + baseType.setMaxLength(typeMaxNode.asInt()); } - - if ((node = type.get("minLength")) != null) { - baseType.setMinLength(node.asInt()); + JsonNode typeMinNode = type.get("minLength"); + if (typeMinNode != null) { + baseType.setMinLength(typeMinNode.asInt()); } - populateEnum(baseType, type); } @@ -380,17 +371,17 @@ public abstract class BaseType> { private void populateEnum(StringBaseType baseType, JsonNode node) { if (node.has("enum")) { - Set enums = Sets.newHashSet(); + Set nodesEnums = Sets.newHashSet(); JsonNode enumVal = node.get("enum"); if (enumVal.isArray()) { JsonNode anEnum = enumVal.get(1); for (JsonNode enm : anEnum) { - enums.add(enm.asText()); + nodesEnums.add(enm.asText()); } } else if (enumVal.isTextual()) { - enums.add(enumVal.asText()); + nodesEnums.add(enumVal.asText()); } - baseType.setEnums(enums); + baseType.setEnums(nodesEnums); } } @@ -471,7 +462,6 @@ public abstract class BaseType> { String refTable; RefType refType; - @Override public UuidBaseType fromString(String typeString) { return "uuid".equals(typeString) ? new UuidBaseType() : null; @@ -479,13 +469,11 @@ public abstract class BaseType> { @Override protected void getConstraints(UuidBaseType baseType, JsonNode node) { - - JsonNode refTable = node.get("refTable"); - baseType.setRefTable(refTable != null ? refTable.asText() : null); + JsonNode refTableNode = node.get("refTable"); + baseType.setRefTable(refTableNode != null ? refTableNode.asText() : null); JsonNode refTypeJson = node.get("refType"); baseType.setRefType(refTypeJson != null ? RefType.valueOf(refTypeJson.asText()) : RefType.strong); - } @Override diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java index 386dd6791..5171748ec 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java @@ -129,9 +129,9 @@ public class ColumnSchema, D> { /** * Verifies if this Column if of the specified type. - * @param type the type to check for + * @param typeClass the type to check for */ - public void validateType(Class type) { + public void validateType(Class typeClass) { } diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java index faa32f9d8..40b421d83 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java @@ -177,15 +177,16 @@ public abstract class ColumnType { AtomicColumnType atomicColumnType = new AtomicColumnType(jsonBaseType); - JsonNode node; - if ((node = json.get("min")) != null) { - atomicColumnType.setMin(node.asLong()); + JsonNode minNode = json.get("min"); + if (minNode != null) { + atomicColumnType.setMin(minNode.asLong()); } - if ((node = json.get("max")) != null) { - if (node.isNumber()) { - atomicColumnType.setMax(node.asLong()); - } else if ("unlimited".equals(node.asText())) { + JsonNode maxNode = json.get("max"); + if (maxNode != null) { + if (maxNode.isNumber()) { + atomicColumnType.setMax(maxNode.asLong()); + } else if ("unlimited".equals(maxNode.asText())) { atomicColumnType.setMax(Long.MAX_VALUE); } } @@ -249,15 +250,16 @@ public abstract class ColumnType { BaseType valueType = BaseType.fromJson(json, "value"); KeyValuedColumnType keyValueColumnType = new KeyValuedColumnType(jsonKeyType, valueType); - JsonNode node; - if ((node = json.get("min")) != null) { - keyValueColumnType.setMin(node.asLong()); + JsonNode minNode = json.get("min"); + if (minNode != null) { + keyValueColumnType.setMin(minNode.asLong()); } - if ((node = json.get("max")) != null) { - if (node.isLong()) { - keyValueColumnType.setMax(node.asLong()); - } else if (node.isTextual() && "unlimited".equals(node.asText())) { + JsonNode maxNode = json.get("max"); + if (maxNode != null) { + if (maxNode.isLong()) { + keyValueColumnType.setMax(maxNode.asLong()); + } else if (maxNode.isTextual() && "unlimited".equals(maxNode.asText())) { keyValueColumnType.setMax(Long.MAX_VALUE); } } 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 96a26eca6..55a2e70ca 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 @@ -137,7 +137,7 @@ public abstract class TableSchema> { } public Row createRow(ObjectNode rowNode) { - List> columns = new ArrayList<>(); + List> newColumns = new ArrayList<>(); for (Iterator> iter = rowNode.fields(); iter.hasNext();) { Map.Entry next = iter.next(); ColumnSchema schema = column(next.getKey(), Object.class); @@ -149,10 +149,10 @@ public abstract class TableSchema> { */ if (schema != null) { Object value = schema.valueFromJson(next.getValue()); - columns.add(new Column<>(schema, value)); + newColumns.add(new Column<>(schema, value)); } } - return new Row<>(this, columns); + return new Row<>(this, newColumns); } public List> createRows(JsonNode rowsNode) {