From d7131a123bd07a873fd37f0c2eddad251217cb85 Mon Sep 17 00:00:00 2001 From: George Kankava Date: Mon, 20 Jun 2016 19:21:19 +0400 Subject: [PATCH] Multiple code improvements - squid:SwitchLastCaseIsDefaultCheck, squid:S1197, squid:S1192, squid:S2131 --- .../client/MutationsRejectedException.java | 20 +++++++++++++------ .../impl/NamespaceOperationsHelper.java | 4 ++-- .../core/client/impl/TableOperationsImpl.java | 2 +- .../impl/thrift/ThriftSecurityException.java | 6 ++++++ .../blockfile/impl/CachableBlockFile.java | 4 ++-- .../iterators/user/TransformingIterator.java | 2 +- .../core/metadata/schema/DataFileValue.java | 4 ++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java index e8f675b8ea0..c4dcd91968e 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java +++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java @@ -39,6 +39,14 @@ * */ public class MutationsRejectedException extends AccumuloException { + private static final String EXCEPTIONS = " # exceptions "; + + private static final String SERVER_ERRORS = " # server errors "; + + private static final String SECURITY_CODES = " security codes: "; + + private static final String CONSTRAINT_VIOLATIONS = "# constraint violations : "; + private static final long serialVersionUID = 1L; private List cvsl; @@ -70,8 +78,8 @@ private static Map transformKeys(Map map, Function keyFun @Deprecated public MutationsRejectedException(List cvsList, HashMap> hashMap, Collection serverSideErrors, int unknownErrors, Throwable cause) { - super("# constraint violations : " + cvsList.size() + " security codes: " + hashMap.values() + " # server errors " + serverSideErrors.size() - + " # exceptions " + unknownErrors, cause); + super(CONSTRAINT_VIOLATIONS + cvsList.size() + SECURITY_CODES + hashMap.values() + SERVER_ERRORS + serverSideErrors.size() + + EXCEPTIONS + unknownErrors, cause); this.cvsl = cvsList; this.af = transformKeys(hashMap, TabletIdImpl.KE_2_TID_OLD); this.es = serverSideErrors; @@ -93,8 +101,8 @@ public MutationsRejectedException(List cvsList, Hash @Deprecated public MutationsRejectedException(Instance instance, List cvsList, HashMap> hashMap, Collection serverSideErrors, int unknownErrors, Throwable cause) { - super("# constraint violations : " + cvsList.size() + " security codes: " + format(transformKeys(hashMap, TabletIdImpl.KE_2_TID_OLD), instance) - + " # server errors " + serverSideErrors.size() + " # exceptions " + unknownErrors, cause); + super(CONSTRAINT_VIOLATIONS + cvsList.size() + SECURITY_CODES + format(transformKeys(hashMap, TabletIdImpl.KE_2_TID_OLD), instance) + + SERVER_ERRORS + serverSideErrors.size() + EXCEPTIONS + unknownErrors, cause); this.cvsl = cvsList; this.af = transformKeys(hashMap, TabletIdImpl.KE_2_TID_OLD); this.es = serverSideErrors; @@ -116,8 +124,8 @@ public MutationsRejectedException(Instance instance, List cvsList, Map> hashMap, Collection serverSideErrors, int unknownErrors, Throwable cause) { - super("# constraint violations : " + cvsList.size() + " security codes: " + format(hashMap, instance) + " # server errors " + serverSideErrors.size() - + " # exceptions " + unknownErrors, cause); + super(CONSTRAINT_VIOLATIONS + cvsList.size() + SECURITY_CODES + format(hashMap, instance) + SERVER_ERRORS + serverSideErrors.size() + + EXCEPTIONS + unknownErrors, cause); this.cvsl = cvsList; this.af = hashMap; this.es = serverSideErrors; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java index 2dac1fa3320..a51f1aa044e 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java @@ -92,7 +92,7 @@ public IteratorSetting getIteratorSetting(String namespace, String name, Iterato String opt = root + ".opt."; for (Entry property : this.getProperties(namespace)) { if (property.getKey().equals(root)) { - String parts[] = property.getValue().split(","); + String[] parts = property.getValue().split(","); if (parts.length != 2) { throw new AccumuloException("Bad value for iterator setting: " + property.getValue()); } @@ -147,7 +147,7 @@ public void checkIteratorConflicts(String namespace, IteratorSetting setting, En optionConflicts.put(property.getKey(), property.getValue()); if (property.getKey().contains(".opt.")) continue; - String parts[] = property.getValue().split(","); + String[] parts = property.getValue().split(","); if (parts.length != 2) throw new AccumuloException("Bad value for existing iterator setting: " + property.getKey() + "=" + property.getValue()); try { diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java index 5a685d851c9..a95bf1ca45c 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java @@ -1078,7 +1078,7 @@ public void importDirectory(String tableName, String dir, String failureDir, boo Path failPath = checkPath(failureDir, "Bulk", "failure"); List args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), ByteBuffer.wrap(dirPath.toString().getBytes(UTF_8)), - ByteBuffer.wrap(failPath.toString().getBytes(UTF_8)), ByteBuffer.wrap((setTime + "").getBytes(UTF_8))); + ByteBuffer.wrap(failPath.toString().getBytes(UTF_8)), ByteBuffer.wrap((Boolean.toString(setTime)).getBytes(UTF_8))); Map opts = new HashMap(); try { diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java index 52bd98f349f..8ace014cf4a 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java @@ -255,6 +255,8 @@ public void setFieldValue(_Fields field, Object value) { } break; + default: + break; } } @@ -266,6 +268,8 @@ public Object getFieldValue(_Fields field) { case CODE: return getCode(); + default: + break; } throw new IllegalStateException(); } @@ -281,6 +285,8 @@ public boolean isSet(_Fields field) { return isSetUser(); case CODE: return isSetCode(); + default: + break; } throw new IllegalStateException(); } diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java index 07ac5afee0c..4c4c3cf4ba0 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java @@ -170,7 +170,7 @@ public BlockReader get() throws IOException { @Override public String getInfo() { - return "" + blockIndex; + return Integer.toString(blockIndex); } } @@ -194,7 +194,7 @@ public BlockReader get() throws IOException { @Override public String getInfo() { - return "" + offset + "," + compressedSize + "," + rawSize; + return offset + "," + compressedSize + "," + rawSize; } } diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java index 66de3d6dc5e..d2c7d42b293 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java @@ -668,7 +668,7 @@ public static void setAuthorizations(IteratorSetting config, Authorizations auth * size in bytes */ public static void setMaxBufferSize(IteratorSetting config, long maxBufferSize) { - config.addOption(MAX_BUFFER_SIZE_OPT, maxBufferSize + ""); + config.addOption(MAX_BUFFER_SIZE_OPT, Long.toString(maxBufferSize)); } } diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java index 5f1379d6ca7..d5566d877cc 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java @@ -71,8 +71,8 @@ public byte[] encode() { public String encodeAsString() { if (time >= 0) - return ("" + size + "," + numEntries + "," + time); - return ("" + size + "," + numEntries); + return (size + "," + numEntries + "," + time); + return (size + "," + numEntries); } public Value encodeAsValue() {