From e0fa181a1c05345ee172625e955cf7749fa1d659 Mon Sep 17 00:00:00 2001 From: George Kankava Date: Fri, 5 Feb 2016 17:43:39 +0400 Subject: [PATCH] squid:UselessParenthesesCheck - Useless parentheses around expressions should be removed to prevent any misunderstanding --- .../JavaStringDateObjectInspector.java | 4 +-- .../org/openx/data/jsonserde/JsonSerDe.java | 26 +++++++++---------- .../JsonObjectInspectorUtils.java | 2 +- .../JsonStructObjectInspector.java | 2 +- .../JavaStringBooleanObjectInspector.java | 4 +-- .../JavaStringByteObjectInspector.java | 4 +-- .../JavaStringDoubleObjectInspector.java | 4 +-- .../JavaStringFloatObjectInspector.java | 2 +- .../JavaStringIntObjectInspector.java | 2 +- .../JavaStringLongObjectInspector.java | 2 +- .../JavaStringShortObjectInspector.java | 2 +- .../JavaStringTimestampObjectInspector.java | 4 +-- .../JsonStringJavaObjectInspector.java | 2 +- .../main/java/org/openx/data/udf/JsonUDF.java | 2 +- .../openx/data/jsonserde/json/JSONObject.java | 2 +- .../org/openx/data/jsonserde/json/XML.java | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/json-serde-cdh5-shim/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDateObjectInspector.java b/json-serde-cdh5-shim/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDateObjectInspector.java index 6232f35f..aed34804 100644 --- a/json-serde-cdh5-shim/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDateObjectInspector.java +++ b/json-serde-cdh5-shim/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDateObjectInspector.java @@ -44,7 +44,7 @@ public DateWritable getPrimitiveWritableObject(Object o) { if(o instanceof String) { return new DateWritable(parse((String)o)); } else { - return new DateWritable(((Date) o)); + return new DateWritable((Date) o); } } @@ -53,7 +53,7 @@ public Date getPrimitiveJavaObject(Object o) { if(o instanceof String) { parse((String)o); } else { - if (o instanceof Date) return ((Date) o); + if (o instanceof Date) return (Date) o; } return null; } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/JsonSerDe.java b/json-serde/src/main/java/org/openx/data/jsonserde/JsonSerDe.java index cff36c26..67168e20 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/JsonSerDe.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/JsonSerDe.java @@ -109,7 +109,7 @@ public void initialize(Configuration conf, Properties tbl) throws SerDeException } else { columnTypes = TypeInfoUtils.getTypeInfosFromTypeString(columnTypeProperty); } - assert (columnNames.size() == columnTypes.size()); + assert columnNames.size() == columnTypes.size(); stats = new SerDeStats(); @@ -128,8 +128,8 @@ public void initialize(Configuration conf, Properties tbl) throws SerDeException String columnSortOrder = tbl.getProperty(Constants.SERIALIZATION_SORT_ORDER); columnSortOrderIsDesc = new boolean[columnNames.size()]; for (int i = 0; i < columnSortOrderIsDesc.length; i++) { - columnSortOrderIsDesc[i] = (columnSortOrder != null && - columnSortOrder.charAt(i) == '-'); + columnSortOrderIsDesc[i] = columnSortOrder != null && + columnSortOrder.charAt(i) == '-'; } @@ -222,7 +222,7 @@ public Writable serialize(Object obj, ObjectInspector objInspector) throws SerDe } private String getSerializedFieldName( List columnNames, int pos, StructField sf) { - String n = (columnNames==null? sf.getFieldName(): columnNames.get(pos)); + String n = columnNames==null? sf.getFieldName(): columnNames.get(pos); if(options.getMappings().containsKey(n)) { return options.getMappings().get(n); @@ -291,30 +291,30 @@ public Object serializeField(Object obj, result = null; break; case BOOLEAN: - result = (((BooleanObjectInspector)poi).get(obj)? + result = ((BooleanObjectInspector)poi).get(obj)? Boolean.TRUE: - Boolean.FALSE); + Boolean.FALSE; break; case BYTE: - result = (((ByteObjectInspector)poi).get(obj)); + result = ((ByteObjectInspector)poi).get(obj); break; case DOUBLE: - result = (((DoubleObjectInspector)poi).get(obj)); + result = ((DoubleObjectInspector)poi).get(obj); break; case FLOAT: - result = (((FloatObjectInspector)poi).get(obj)); + result = ((FloatObjectInspector)poi).get(obj); break; case INT: - result = (((IntObjectInspector)poi).get(obj)); + result = ((IntObjectInspector)poi).get(obj); break; case LONG: - result = (((LongObjectInspector)poi).get(obj)); + result = ((LongObjectInspector)poi).get(obj); break; case SHORT: - result = (((ShortObjectInspector)poi).get(obj)); + result = ((ShortObjectInspector)poi).get(obj); break; case STRING: - result = (((StringObjectInspector)poi).getPrimitiveJavaObject(obj)); + result = ((StringObjectInspector)poi).getPrimitiveJavaObject(obj); break; case UNKNOWN: throw new RuntimeException("Unknown primitive"); diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonObjectInspectorUtils.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonObjectInspectorUtils.java index da140823..186a8285 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonObjectInspectorUtils.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonObjectInspectorUtils.java @@ -29,7 +29,7 @@ public static Object checkObject(Object data) { if(data instanceof String || data instanceof Text) { - String str = (data instanceof String ? (String)data : ((Text)data).toString() ); + String str = data instanceof String ? (String)data : ((Text)data).toString(); if(str.trim().isEmpty()) return null; } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonStructObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonStructObjectInspector.java index f93009ab..0df057fc 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonStructObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/JsonStructObjectInspector.java @@ -98,7 +98,7 @@ public Object getStructFieldDataFromJsonObject(JSONObject data, StructField fiel MyField f = (MyField) fieldRef; int fieldID = f.getFieldID(); - assert (fieldID >= 0 && fieldID < fields.size()); + assert fieldID >= 0 && fieldID < fields.size(); Object fieldData = null; diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringBooleanObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringBooleanObjectInspector.java index dcca52ff..0ef634d7 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringBooleanObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringBooleanObjectInspector.java @@ -35,7 +35,7 @@ public Object getPrimitiveWritableObject(Object o) { if(o instanceof String) { return new BooleanWritable(Boolean.parseBoolean((String) o)); } else { - return new BooleanWritable(((Boolean) o)); + return new BooleanWritable((Boolean) o); } } @@ -45,7 +45,7 @@ public boolean get(Object o) { if(o instanceof String) { return Boolean.parseBoolean((String) o); } else { - return (((Boolean) o)); + return (Boolean) o; } } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringByteObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringByteObjectInspector.java index f3190ec8..b13c3775 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringByteObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringByteObjectInspector.java @@ -44,7 +44,7 @@ public byte get(Object o) { if(o instanceof String) { return ParsePrimitiveUtils.parseByte((String)o); } else { - return ((Byte) o); + return (Byte) o; } } @@ -56,7 +56,7 @@ public Object getPrimitiveJavaObject(Object o) @Override public Object create(byte value) { - return (value); + return value; } @Override diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDoubleObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDoubleObjectInspector.java index da915479..704fb214 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDoubleObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringDoubleObjectInspector.java @@ -34,7 +34,7 @@ public Object getPrimitiveWritableObject(Object o) { if(o instanceof String) { return new DoubleWritable(Double.parseDouble((String)o)); } else { - return new DoubleWritable(((Double) o)); + return new DoubleWritable((Double) o); } } @@ -44,7 +44,7 @@ public double get(Object o) { if(o instanceof String) { return Double.parseDouble((String)o); } else { - return (((Double) o)); + return (Double) o; } } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringFloatObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringFloatObjectInspector.java index 269a5cd7..67a9fd61 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringFloatObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringFloatObjectInspector.java @@ -43,7 +43,7 @@ public float get(Object o) { if(o instanceof String) { return Float.parseFloat((String)o); } else { - return ((Float) o); + return (Float) o; } } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringIntObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringIntObjectInspector.java index dbde9bce..50f7bc99 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringIntObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringIntObjectInspector.java @@ -44,7 +44,7 @@ public int get(Object o) { if(o instanceof String) { return ParsePrimitiveUtils.parseInt((String)o); } else { - return ((Integer) o); + return (Integer) o; } } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringLongObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringLongObjectInspector.java index 3febe11e..1505eec5 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringLongObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringLongObjectInspector.java @@ -45,7 +45,7 @@ public long get(Object o) { if(o instanceof String) { return ParsePrimitiveUtils.parseLong((String)o); } else { - return ((Long) o); + return (Long) o; } } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java index 9fd14d46..5fb5feb4 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java @@ -45,7 +45,7 @@ public short get(Object o) { if(o instanceof String) { return ParsePrimitiveUtils.parseShort((String)o); } else { - return ((Short) o); + return (Short) o; } } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringTimestampObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringTimestampObjectInspector.java index 695d3852..8e2decf6 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringTimestampObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringTimestampObjectInspector.java @@ -61,7 +61,7 @@ public TimestampWritable getPrimitiveWritableObject(Object o) { if(o instanceof String) { return new TimestampWritable(ParsePrimitiveUtils.parseTimestamp((String)o)); } else { - return new TimestampWritable(((Timestamp) o)); + return new TimestampWritable((Timestamp) o); } } @@ -70,7 +70,7 @@ public Timestamp getPrimitiveJavaObject(Object o) { if(o instanceof String) { return ParsePrimitiveUtils.parseTimestamp((String)o); } else { - return ((Timestamp) o); + return (Timestamp) o; } } diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JsonStringJavaObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JsonStringJavaObjectInspector.java index c81dcf43..55417b15 100644 --- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JsonStringJavaObjectInspector.java +++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JsonStringJavaObjectInspector.java @@ -31,7 +31,7 @@ public class JsonStringJavaObjectInspector extends @Override public Text getPrimitiveWritableObject(Object o) { - return o == null ? null : new Text(((String) o.toString())); + return o == null ? null : new Text((String) o.toString()); } @Override diff --git a/json-udf/src/main/java/org/openx/data/udf/JsonUDF.java b/json-udf/src/main/java/org/openx/data/udf/JsonUDF.java index 9b41e7c6..c70370f4 100644 --- a/json-udf/src/main/java/org/openx/data/udf/JsonUDF.java +++ b/json-udf/src/main/java/org/openx/data/udf/JsonUDF.java @@ -66,7 +66,7 @@ public Object evaluate(DeferredObject[] arguments) throws HiveException { @Override public String getDisplayString(String[] children) { - assert (children.length > 0); + assert children.length > 0; StringBuilder sb = new StringBuilder(); sb.append("JsonUDF("); diff --git a/json/src/main/java/org/openx/data/jsonserde/json/JSONObject.java b/json/src/main/java/org/openx/data/jsonserde/json/JSONObject.java index 5f7bd183..0efae423 100644 --- a/json/src/main/java/org/openx/data/jsonserde/json/JSONObject.java +++ b/json/src/main/java/org/openx/data/jsonserde/json/JSONObject.java @@ -968,7 +968,7 @@ private void populateMap(Object bean) { boolean includeSuperClass = klass.getClassLoader() != null; - Method[] methods = (includeSuperClass) ? + Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods(); for (int i = 0; i < methods.length; i += 1) { try { diff --git a/json/src/main/java/org/openx/data/jsonserde/json/XML.java b/json/src/main/java/org/openx/data/jsonserde/json/XML.java index 8bffe58b..1f3e8cc7 100644 --- a/json/src/main/java/org/openx/data/jsonserde/json/XML.java +++ b/json/src/main/java/org/openx/data/jsonserde/json/XML.java @@ -330,7 +330,7 @@ public static Object stringToValue(String string) { if (initial == '0' && string.charAt(negative ? 2 : 1) == '0') { return string; } - if ((initial >= '0' && initial <= '9')) { + if (initial >= '0' && initial <= '9') { if (string.indexOf('.') >= 0) { return Double.valueOf(string); } else if (string.indexOf('e') < 0 && string.indexOf('E') < 0) {