From fe500865688eac55643b44718f21bd37c8ae3bc7 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 29 Aug 2012 08:41:29 +0800 Subject: [PATCH] fixed sonar rule violations --- .../druid/sql/ast/statement/SQLSelect.java | 4 +- .../mysql/parser/MySqlSelectParser.java | 4 +- .../dialect/oracle/ast/stmt/OracleSelect.java | 4 +- .../oracle/parser/OracleExprParser.java | 16 +++++-- .../oracle/parser/OracleSelectParser.java | 12 +++-- .../oracle/parser/OracleUpdateParser.java | 4 +- .../alibaba/druid/stat/DruidStatService.java | 16 +++++-- .../alibaba/druid/support/console/Option.java | 4 +- .../druid/support/logging/Resources.java | 28 +++++++++--- .../support/spring/stat/SpringMethodInfo.java | 4 +- .../java/com/alibaba/druid/util/HexBin.java | 20 ++++++--- .../alibaba/druid/util/LazyCompositeData.java | 44 ++++++++++++++----- .../com/alibaba/druid/util/MapComparator.java | 24 +++++++--- .../com/alibaba/druid/util/StringUtils.java | 9 +++- .../alibaba/druid/util/ThreadLocalRandom.java | 18 +++++--- 15 files changed, 157 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java index cfae764fc0..ec26633f9d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java @@ -50,7 +50,9 @@ public class SQLSelect extends SQLObjectImpl { this.query.output(buf); buf.append(" "); - if (this.orderBy != null) this.orderBy.output(buf); + if (this.orderBy != null) { + this.orderBy.output(buf); + } } protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java index db6c4d93ab..bfb313c360 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java @@ -228,7 +228,9 @@ public class MySqlSelectParser extends SQLSelectParser { SQLSelectGroupByClause groupBy = new SQLSelectGroupByClause(); while (true) { groupBy.getItems().add(this.exprParser.expr()); - if (!(lexer.token() == (Token.COMMA))) break; + if (!(lexer.token() == (Token.COMMA))) { + break; + } lexer.nextToken(); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java index 610223a75d..578ee4a47c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java @@ -60,7 +60,9 @@ public class OracleSelect extends SQLSelect { this.query.output(buf); buf.append(" "); - if (this.orderBy != null) this.orderBy.output(buf); + if (this.orderBy != null) { + this.orderBy.output(buf); + } } protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index fc6d3e9d76..9fd2d59321 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -619,10 +619,18 @@ public class OracleExprParser extends SQLExprParser { String currentTokenUpperValue = lexer.stringVal(); lexer.nextToken(); - if (currentTokenUpperValue.equals("YEAR")) return OracleIntervalType.YEAR; - if (currentTokenUpperValue.equals("MONTH")) return OracleIntervalType.MONTH; - if (currentTokenUpperValue.equals("HOUR")) return OracleIntervalType.HOUR; - if (currentTokenUpperValue.equals("MINUTE")) return OracleIntervalType.MINUTE; + if (currentTokenUpperValue.equals("YEAR")) { + return OracleIntervalType.YEAR; + } + if (currentTokenUpperValue.equals("MONTH")) { + return OracleIntervalType.MONTH; + } + if (currentTokenUpperValue.equals("HOUR")) { + return OracleIntervalType.HOUR; + } + if (currentTokenUpperValue.equals("MINUTE")) { + return OracleIntervalType.MINUTE; + } if (currentTokenUpperValue.equals("SECOND")) { return OracleIntervalType.SECOND; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java index 33505e2cc2..35998bdfee 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java @@ -965,7 +965,9 @@ public class OracleSelectParser extends SQLSelectParser { item.setAlias(as()); pivot.getItems().add(item); - if (!(lexer.token() == (Token.COMMA))) break; + if (!(lexer.token() == (Token.COMMA))) { + break; + } lexer.nextToken(); } @@ -977,7 +979,9 @@ public class OracleSelectParser extends SQLSelectParser { pivot.getPivotFor().add(new SQLIdentifierExpr(lexer.stringVal())); lexer.nextToken(); - if (!(lexer.token() == (Token.COMMA))) break; + if (!(lexer.token() == (Token.COMMA))) { + break; + } lexer.nextToken(); } @@ -1047,7 +1051,9 @@ public class OracleSelectParser extends SQLSelectParser { unPivot.getPivotFor().add(new SQLIdentifierExpr(lexer.stringVal())); lexer.nextToken(); - if (!(lexer.token() == (Token.COMMA))) break; + if (!(lexer.token() == (Token.COMMA))) { + break; + } lexer.nextToken(); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java index 8823527839..a4ff445455 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java @@ -67,7 +67,9 @@ public class OracleUpdateParser extends SQLStatementParser { } private void parseErrorLoging(OracleUpdateStatement update) throws ParserException { - if (identifierEquals("LOG")) throw new ParserException("TODO"); + if (identifierEquals("LOG")) { + throw new ParserException("TODO"); + } } private void parseReturn(OracleUpdateStatement update) throws ParserException { diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index a597f60e1b..2d4b864481 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -195,7 +195,9 @@ public class DruidStatService implements DruidStatServiceMBean { private List> comparatorOrderBy(List> array, Map parameters) { // when open the stat page before executing some sql - if (array == null || array.isEmpty()) return null; + if (array == null || array.isEmpty()) { + return null; + } // when parameters is null String orderBy, orderType = null; @@ -223,7 +225,9 @@ public class DruidStatService implements DruidStatServiceMBean { orderBy = orderBy == null ? DEFAULT_ORDERBY : orderBy; orderType = orderType == null ? DEFAULT_ORDER_TYPE : orderType; - if (!"desc".equals(orderType)) orderType = DEFAULT_ORDER_TYPE; + if (!"desc".equals(orderType)) { + orderType = DEFAULT_ORDER_TYPE; + } // orderby the statData array if (orderBy != null && orderBy.trim().length() != 0) { @@ -233,7 +237,9 @@ public class DruidStatService implements DruidStatServiceMBean { // page int fromIndex = (page - 1) * perPageCount; int toIndex = page * perPageCount; - if (toIndex > array.size()) toIndex = array.size(); + if (toIndex > array.size()) { + toIndex = array.size(); + } return array.subList(fromIndex, toIndex); } @@ -338,7 +344,9 @@ public class DruidStatService implements DruidStatServiceMBean { for (String parameterStr : parametersArray) { int index = parameterStr.indexOf("="); - if (index <= 0) continue; + if (index <= 0) { + continue; + } String name = parameterStr.substring(0, index); String value = parameterStr.substring(index + 1); diff --git a/src/main/java/com/alibaba/druid/support/console/Option.java b/src/main/java/com/alibaba/druid/support/console/Option.java index bf59ef4e54..414b52578b 100644 --- a/src/main/java/com/alibaba/druid/support/console/Option.java +++ b/src/main/java/com/alibaba/druid/support/console/Option.java @@ -32,7 +32,9 @@ public class Option { } public static boolean isPrintHelp(String[] args) { - if (args == null ) return true; + if (args == null ) { + return true; + } for (String arg: args) { if (arg.equals("-help") ) { return true; diff --git a/src/main/java/com/alibaba/druid/support/logging/Resources.java b/src/main/java/com/alibaba/druid/support/logging/Resources.java index 36e62baccb..68f5dbcc8e 100644 --- a/src/main/java/com/alibaba/druid/support/logging/Resources.java +++ b/src/main/java/com/alibaba/druid/support/logging/Resources.java @@ -79,9 +79,19 @@ public class Resources extends Object { */ public static URL getResourceURL(ClassLoader loader, String resource) throws IOException { URL url = null; - if (loader != null) url = loader.getResource(resource); - if (url == null) url = ClassLoader.getSystemResource(resource); - if (url == null) throw new IOException("Could not find resource " + resource); + + if (loader != null) { + url = loader.getResource(resource); + } + + if (url == null) { + url = ClassLoader.getSystemResource(resource); + } + + if (url == null) { + throw new IOException("Could not find resource " + resource); + } + return url; } @@ -106,9 +116,15 @@ public class Resources extends Object { */ public static InputStream getResourceAsStream(ClassLoader loader, String resource) throws IOException { InputStream in = null; - if (loader != null) in = loader.getResourceAsStream(resource); - if (in == null) in = ClassLoader.getSystemResourceAsStream(resource); - if (in == null) throw new IOException("Could not find resource " + resource); + if (loader != null) { + in = loader.getResourceAsStream(resource); + } + if (in == null) { + in = ClassLoader.getSystemResourceAsStream(resource); + } + if (in == null) { + throw new IOException("Could not find resource " + resource); + } return in; } diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java index 2935e99268..477bb22a24 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java @@ -86,7 +86,9 @@ public class SpringMethodInfo { Class[] params = method.getParameterTypes(); for (int j = 0; j < params.length; j++) { sb.append(params[j].getName()); - if (j < (params.length - 1)) sb.append(","); + if (j < (params.length - 1)) { + sb.append(","); + } } sb.append(")"); diff --git a/src/main/java/com/alibaba/druid/util/HexBin.java b/src/main/java/com/alibaba/druid/util/HexBin.java index c508330eb0..809e4fb4d9 100644 --- a/src/main/java/com/alibaba/druid/util/HexBin.java +++ b/src/main/java/com/alibaba/druid/util/HexBin.java @@ -62,16 +62,19 @@ public final class HexBin { * @return return encoded string */ static public String encode(byte[] binaryData) { - if (binaryData == null) + if (binaryData == null) { return null; + } + int lengthData = binaryData.length; int lengthEncode = lengthData * 2; char[] encodedData = new char[lengthEncode]; int temp; for (int i = 0; i < lengthData; i++) { temp = binaryData[i]; - if (temp < 0) + if (temp < 0) { temp += 256; + } encodedData[i*2] = lookUpHexAlphabet[temp >> 4]; encodedData[i*2+1] = lookUpHexAlphabet[temp & 0xf]; } @@ -85,11 +88,14 @@ public final class HexBin { * @return return array of byte to encode */ static public byte[] decode(String encoded) { - if (encoded == null) + if (encoded == null) { return null; + } + int lengthData = encoded.length(); - if (lengthData % 2 != 0) + if (lengthData % 2 != 0) { return null; + } char[] binaryData = encoded.toCharArray(); int lengthDecode = lengthData / 2; @@ -99,12 +105,14 @@ public final class HexBin { for( int i = 0; i ot1 = type1.getType(item); OpenType ot2 = type2.getType(item); if (ot1 instanceof CompositeType) { - if (!(ot2 instanceof CompositeType)) return false; - if (!isTypeMatched((CompositeType) ot1, (CompositeType) ot2)) return false; + if (!(ot2 instanceof CompositeType)) { + return false; + } + if (!isTypeMatched((CompositeType) ot1, (CompositeType) ot2)) { + return false; + } } else if (ot1 instanceof TabularType) { - if (!(ot2 instanceof TabularType)) return false; - if (!isTypeMatched((TabularType) ot1, (TabularType) ot2)) return false; + if (!(ot2 instanceof TabularType)) { + return false; + } + if (!isTypeMatched((TabularType) ot1, (TabularType) ot2)) { + return false; + } } else if (!ot1.equals(ot2)) { return false; } @@ -155,7 +175,9 @@ public abstract class LazyCompositeData implements CompositeData, Serializable { } protected static boolean isTypeMatched(TabularType type1, TabularType type2) { - if (type1 == type2) return true; + if (type1 == type2) { + return true; + } List list1 = type1.getIndexNames(); List list2 = type2.getIndexNames(); diff --git a/src/main/java/com/alibaba/druid/util/MapComparator.java b/src/main/java/com/alibaba/druid/util/MapComparator.java index 878cf8c67c..3ea301c655 100644 --- a/src/main/java/com/alibaba/druid/util/MapComparator.java +++ b/src/main/java/com/alibaba/druid/util/MapComparator.java @@ -78,15 +78,27 @@ public class MapComparator implements Compar Object v1 = getValueByKey(o1, orderByKey); Object v2 = getValueByKey(o2, orderByKey); - if (v1 == null && v2 == null) return 0; - if (v1 == null) return -1; - if (v2 == null) return 1; + if (v1 == null && v2 == null) { + return 0; + } + if (v1 == null) { + return -1; + } + if (v2 == null) { + return 1; + } - if (v1 instanceof Number) return compare((Number) v1, (Number) v2); + if (v1 instanceof Number) { + return compare((Number) v1, (Number) v2); + } - if (v1 instanceof String) return compare((String) v1, (String) v2); + if (v1 instanceof String) { + return compare((String) v1, (String) v2); + } - if (v1 instanceof Date) return compare((Date) v1, (Date) v2); + if (v1 instanceof Date) { + return compare((Date) v1, (Date) v2); + } return 0; } diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java index 5edb3d7cd0..f3750190e1 100644 --- a/src/main/java/com/alibaba/druid/util/StringUtils.java +++ b/src/main/java/com/alibaba/druid/util/StringUtils.java @@ -61,9 +61,14 @@ public class StringUtils { * @return */ public static Integer stringToInteger(String in) { - if (in == null) return null; + if (in == null) { + return null; + } in = in.trim(); - if (in.length() == 0) return null; + if (in.length() == 0) { + return null; + } + try { return Integer.parseInt(in); } catch (NumberFormatException e) { diff --git a/src/main/java/com/alibaba/druid/util/ThreadLocalRandom.java b/src/main/java/com/alibaba/druid/util/ThreadLocalRandom.java index 5aa1b4ccbd..aab64dc5bc 100644 --- a/src/main/java/com/alibaba/druid/util/ThreadLocalRandom.java +++ b/src/main/java/com/alibaba/druid/util/ThreadLocalRandom.java @@ -103,8 +103,9 @@ public class ThreadLocalRandom extends Random { * @throws UnsupportedOperationException always */ public void setSeed(long seed) { - if (initialized) + if (initialized) { throw new UnsupportedOperationException(); + } rnd = (seed ^ multiplier) & mask; } @@ -124,8 +125,9 @@ public class ThreadLocalRandom extends Random { * @return the next value */ public int nextInt(int least, int bound) { - if (least >= bound) + if (least >= bound) { throw new IllegalArgumentException(); + } return nextInt(bound - least) + least; } @@ -139,8 +141,9 @@ public class ThreadLocalRandom extends Random { * @throws IllegalArgumentException if n is not positive */ public long nextLong(long n) { - if (n <= 0) + if (n <= 0) { throw new IllegalArgumentException("n must be positive"); + } // Divide n by two until small enough for nextInt. On each // iteration (at most 31 of them but usually much less), // randomly choose both whether to include high bit in result @@ -169,8 +172,9 @@ public class ThreadLocalRandom extends Random { * to bound */ public long nextLong(long least, long bound) { - if (least >= bound) + if (least >= bound) { throw new IllegalArgumentException(); + } return nextLong(bound - least) + least; } @@ -184,8 +188,9 @@ public class ThreadLocalRandom extends Random { * @throws IllegalArgumentException if n is not positive */ public double nextDouble(double n) { - if (n <= 0) + if (n <= 0) { throw new IllegalArgumentException("n must be positive"); + } return nextDouble() * n; } @@ -200,8 +205,9 @@ public class ThreadLocalRandom extends Random { * to bound */ public double nextDouble(double least, double bound) { - if (least >= bound) + if (least >= bound) { throw new IllegalArgumentException(); + } return nextDouble() * (bound - least) + least; }