Fix checkstyle whitespace issues - WHITESPACE ONLY
Change-Id: Ic205c1afd639c6008d61d9de95cb764eeb6238ca
diff --git a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCClient.java b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCClient.java
index 7ff7e7f..41fda9e 100644
--- a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCClient.java
+++ b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCClient.java
@@ -61,16 +61,16 @@
/**
* @return JRamCloud instance intended to be used only within the
- * SameThread.
+ * SameThread.
* @note Do not store the returned instance in a member variable, etc. which
- * may be accessed later by another thread.
+ * may be accessed later by another thread.
*/
static JRamCloud getJRamCloudClient() {
return tlsRCClient.get();
}
// Currently RCClient is state-less
- private static final RCClient theInstance= new RCClient();
+ private static final RCClient theInstance = new RCClient();
public static RCClient getClient() {
return theInstance;
@@ -172,13 +172,13 @@
}
@Override
- public IMultiEntryOperation updateOp(IKVTableID tableId, byte[] key, byte[] value,long version) {
+ public IMultiEntryOperation updateOp(IKVTableID tableId, byte[] key, byte[] value, long version) {
return RCMultiEntryOperation.update(tableId, key, value, version);
}
@Override
public long update(IKVTableID tableId, byte[] key, byte[] value,
- long version) throws ObjectDoesntExistException,
+ long version) throws ObjectDoesntExistException,
WrongVersionException {
RCTableID rcTableId = (RCTableID) tableId;
@@ -222,7 +222,7 @@
}
@Override
- public IMultiEntryOperation deleteOp(IKVTableID tableId, byte[] key, byte[] value,long version) {
+ public IMultiEntryOperation deleteOp(IKVTableID tableId, byte[] key, byte[] value, long version) {
return RCMultiEntryOperation.delete(tableId, key, value, version);
}
@@ -323,9 +323,9 @@
@Override
public boolean multiRead(final Collection<IMultiEntryOperation> ops) {
- if ( ops.size() <= MAX_MULTI_READS && ops instanceof ArrayList) {
- @SuppressWarnings({ "unchecked", "rawtypes" })
- final ArrayList<RCMultiEntryOperation> arrays = (ArrayList)ops;
+ if (ops.size() <= MAX_MULTI_READS && ops instanceof ArrayList) {
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ final ArrayList<RCMultiEntryOperation> arrays = (ArrayList) ops;
return multiReadInternal(arrays);
}
@@ -356,9 +356,9 @@
@Override
public boolean multiWrite(final List<IMultiEntryOperation> ops) {
- if ( ops.size() <= MAX_MULTI_WRITES && ops instanceof ArrayList) {
- @SuppressWarnings({ "unchecked", "rawtypes" })
- final ArrayList<RCMultiEntryOperation> arrays = (ArrayList)ops;
+ if (ops.size() <= MAX_MULTI_WRITES && ops instanceof ArrayList) {
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ final ArrayList<RCMultiEntryOperation> arrays = (ArrayList) ops;
return multiWriteInternal(arrays);
}
@@ -395,45 +395,45 @@
JRamCloud rcClient = getJRamCloudClient();
for (IMultiEntryOperation iop : ops) {
- RCMultiEntryOperation op = (RCMultiEntryOperation)iop;
+ RCMultiEntryOperation op = (RCMultiEntryOperation) iop;
switch (op.getOperation()) {
- case DELETE:
- RejectRules rules = new RejectRules();
- rules.rejectIfDoesntExists();
- rules.rejectIfNeVersion(op.getVersion());
+ case DELETE:
+ RejectRules rules = new RejectRules();
+ rules.rejectIfDoesntExists();
+ rules.rejectIfNeVersion(op.getVersion());
- try {
- final long removedVersion = rcClient.remove(op.tableId.getTableID(), op.entry.getKey(), rules);
- op.entry.setVersion(removedVersion);
- op.status = STATUS.SUCCESS;
- } catch (JRamCloud.ObjectDoesntExistException|JRamCloud.WrongVersionException e) {
- log.error("Failed to remove key:" + ByteArrayUtil.toHexStringBuffer(op.entry.getKey(), "") + " from tableID:" + op.tableId, e );
+ try {
+ final long removedVersion = rcClient.remove(op.tableId.getTableID(), op.entry.getKey(), rules);
+ op.entry.setVersion(removedVersion);
+ op.status = STATUS.SUCCESS;
+ } catch (JRamCloud.ObjectDoesntExistException | JRamCloud.WrongVersionException e) {
+ log.error("Failed to remove key:" + ByteArrayUtil.toHexStringBuffer(op.entry.getKey(), "") + " from tableID:" + op.tableId, e);
+ failExists = true;
+ op.status = STATUS.FAILED;
+ } catch (JRamCloud.RejectRulesException e) {
+ log.error("Failed to remove key:" + ByteArrayUtil.toHexStringBuffer(op.entry.getKey(), "") + " from tableID:" + op.tableId, e);
+ failExists = true;
+ op.status = STATUS.FAILED;
+ }
+ break;
+
+ case FORCE_DELETE:
+ final long removedVersion = rcClient.remove(op.tableId.getTableID(), op.entry.getKey());
+ if (removedVersion != VERSION_NONEXISTENT) {
+ op.entry.setVersion(removedVersion);
+ op.status = STATUS.SUCCESS;
+ } else {
+ log.error("Failed to remove key:{} from tableID:{}", ByteArrayUtil.toHexStringBuffer(op.entry.getKey(), ""), op.tableId);
+ failExists = true;
+ op.status = STATUS.FAILED;
+ }
+ break;
+
+ default:
+ log.error("Invalid operation {} specified on multiDelete", op.getOperation());
failExists = true;
op.status = STATUS.FAILED;
- } catch (JRamCloud.RejectRulesException e) {
- log.error("Failed to remove key:" + ByteArrayUtil.toHexStringBuffer(op.entry.getKey(), "") + " from tableID:" + op.tableId, e );
- failExists = true;
- op.status = STATUS.FAILED;
- }
- break;
-
- case FORCE_DELETE:
- final long removedVersion = rcClient.remove(op.tableId.getTableID(), op.entry.getKey());
- if (removedVersion != VERSION_NONEXISTENT) {
- op.entry.setVersion(removedVersion);
- op.status = STATUS.SUCCESS;
- } else {
- log.error("Failed to remove key:{} from tableID:{}", ByteArrayUtil.toHexStringBuffer(op.entry.getKey(), ""), op.tableId );
- failExists = true;
- op.status = STATUS.FAILED;
- }
- break;
-
- default:
- log.error("Invalid operation {} specified on multiDelete", op.getOperation() );
- failExists = true;
- op.status = STATUS.FAILED;
- break;
+ break;
}
}
return failExists;
@@ -450,7 +450,7 @@
// setup multi-read operation objects
for (int i = 0; i < reqs; ++i) {
IMultiEntryOperation op = ops.get(i);
- multiReadObjects.setObject(i, ((RCTableID)op.getTableId()).getTableID(), op.getKey());
+ multiReadObjects.setObject(i, ((RCTableID) op.getTableId()).getTableID(), op.getKey());
}
// execute
@@ -496,24 +496,24 @@
RejectRules rules = new RejectRules();
switch (op.getOperation()) {
- case CREATE:
- rules.rejectIfExists();
- break;
- case FORCE_CREATE:
- // no reject rule
- break;
- case UPDATE:
- rules.rejectIfDoesntExists();
- rules.rejectIfNeVersion(op.getVersion());
- break;
+ case CREATE:
+ rules.rejectIfExists();
+ break;
+ case FORCE_CREATE:
+ // no reject rule
+ break;
+ case UPDATE:
+ rules.rejectIfDoesntExists();
+ rules.rejectIfNeVersion(op.getVersion());
+ break;
- default:
- log.error("Invalid operation {} specified on multiWriteInternal", op.getOperation() );
- failExists = true;
- op.setStatus(STATUS.FAILED);
- return failExists;
+ default:
+ log.error("Invalid operation {} specified on multiWriteInternal", op.getOperation());
+ failExists = true;
+ op.setStatus(STATUS.FAILED);
+ return failExists;
}
- multiWriteObjects.setObject(i, ((RCTableID)op.getTableId()).getTableID(), op.getKey(), op.getValue(), rules);
+ multiWriteObjects.setObject(i, ((RCTableID) op.getTableId()).getTableID(), op.getKey(), op.getValue(), rules);
}
MultiWriteRspObject[] results = rcClient.multiWrite(multiWriteObjects.tableId, multiWriteObjects.key, multiWriteObjects.keyLength, multiWriteObjects.value, multiWriteObjects.valueLength, ops.size(), multiWriteObjects.rules);
diff --git a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCMultiEntryOperation.java b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCMultiEntryOperation.java
index 9b8c8b6..9893838 100644
--- a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCMultiEntryOperation.java
+++ b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCMultiEntryOperation.java
@@ -73,33 +73,33 @@
}
public static IMultiEntryOperation create(final IKVTableID tableId, final byte[] key, final byte[] value) {
- return new RCMultiEntryOperation(tableId, new Entry(key,value, RCClient.VERSION_NONEXISTENT), OPERATION.CREATE);
+ return new RCMultiEntryOperation(tableId, new Entry(key, value, RCClient.VERSION_NONEXISTENT), OPERATION.CREATE);
}
public static IMultiEntryOperation forceCreate(final IKVTableID tableId, final byte[] key, final byte[] value) {
- return new RCMultiEntryOperation(tableId, new Entry(key,value, RCClient.VERSION_NONEXISTENT), OPERATION.FORCE_CREATE);
+ return new RCMultiEntryOperation(tableId, new Entry(key, value, RCClient.VERSION_NONEXISTENT), OPERATION.FORCE_CREATE);
}
/**
* Constructor for READ operation.
*
* @param tableId table to read from
- * @param key key of an Entry to read
+ * @param key key of an Entry to read
*/
public static IMultiEntryOperation read(final IKVTableID tableId, final byte[] key) {
return new RCMultiEntryOperation(tableId, new Entry(key), OPERATION.READ);
}
public static IMultiEntryOperation update(final IKVTableID tableId, final byte[] key, final byte[] value, final long version) {
- return new RCMultiEntryOperation(tableId, new Entry(key,value, version), OPERATION.UPDATE);
+ return new RCMultiEntryOperation(tableId, new Entry(key, value, version), OPERATION.UPDATE);
}
public static IMultiEntryOperation delete(final IKVTableID tableId, final byte[] key, final byte[] value, final long version) {
- return new RCMultiEntryOperation(tableId, new Entry(key,value, version), OPERATION.DELETE);
+ return new RCMultiEntryOperation(tableId, new Entry(key, value, version), OPERATION.DELETE);
}
public static IMultiEntryOperation forceDelete(final IKVTableID tableId, final byte[] key) {
- return new RCMultiEntryOperation(tableId, new Entry(key), OPERATION.FORCE_DELETE);
+ return new RCMultiEntryOperation(tableId, new Entry(key), OPERATION.FORCE_DELETE);
}
@Override
diff --git a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTable.java b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTable.java
index 098215e..e5a6675 100644
--- a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTable.java
+++ b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTable.java
@@ -58,8 +58,8 @@
private final RCTableID rcTableId;
/**
- *
* {@code rcTableName} must be unique cluster wide.
+ *
* @param rcTableName RAMCloud table name
*/
RCTable(final String rcTableName) {
diff --git a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTableID.java b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTableID.java
index f69addc..9882ce3 100644
--- a/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTableID.java
+++ b/src/main/java/net/onrc/onos/core/datastore/ramcloud/RCTableID.java
@@ -21,7 +21,7 @@
// following is RAMCloud specific
public long getTableID() {
- if ( tableID != 0) {
+ if (tableID != 0) {
return tableID;
}
tableID = RCClient.getJRamCloudClient().createTable(tableName);
@@ -34,7 +34,7 @@
@Override
public String toString() {
- return "["+tableName + "]@" + getTableID();
+ return "[" + tableName + "]@" + getTableID();
}
@Override