Cleanup Code for the doma-core module

doma-core/src/main/java/org/seasar/doma/Entity.java

@@ -86,7 +86,6 @@
    *
    * @return the entity listener class
    */
-  @SuppressWarnings("rawtypes")
   Class<? extends EntityListener> listener() default NullEntityListener.class;
 
   /**

doma-core/src/main/java/org/seasar/doma/internal/Artifact.java

@@ -17,9 +17,9 @@ public static String getVersion() {
     return VERSION;
   }
 
-  public static void validateVersion(String generationtimeVersion) {
-    if (!VERSION.equals(generationtimeVersion)) {
-      throw new DomaException(Message.DOMA0003, VERSION, generationtimeVersion);
+  public static void validateVersion(String compileTimeVersion) {
+    if (!VERSION.equals(compileTimeVersion)) {
+      throw new DomaException(Message.DOMA0003, VERSION, compileTimeVersion);
     }
   }
 }

doma-core/src/main/java/org/seasar/doma/internal/ClassName.java

@@ -1,13 +1,14 @@
 package org.seasar.doma.internal;
 
+import java.util.Objects;
 import org.seasar.doma.internal.util.ClassUtil;
 
 public class ClassName implements CharSequence {
 
   private final String qualifiedName;
 
   public ClassName(String qualifiedName) {
-    this.qualifiedName = qualifiedName;
+    this.qualifiedName = Objects.requireNonNull(qualifiedName);
   }
 
   public String getPackageName() {
@@ -33,6 +34,7 @@ public CharSequence subSequence(int start, int end) {
     return qualifiedName.subSequence(start, end);
   }
 
+  @SuppressWarnings("NullableProblems")
   @Override
   public String toString() {
     return qualifiedName;

doma-core/src/main/java/org/seasar/doma/internal/Constants.java

@@ -1,12 +1,13 @@
 package org.seasar.doma.internal;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 public final class Constants {
 
   public static final String ROWNUMBER_COLUMN_NAME = "doma_rownumber_";
 
-  public static final Charset UTF_8 = Charset.forName("UTF-8");
+  public static final Charset UTF_8 = StandardCharsets.UTF_8;
 
   public static final String SQL_PATH_PREFIX = "META-INF/";
 

doma-core/src/main/java/org/seasar/doma/internal/expr/EvaluationResult.java

@@ -24,7 +24,7 @@ public Object getValue() {
 
   public boolean getBooleanValue() {
     if (value instanceof Boolean) {
-      return ((Boolean) value).booleanValue();
+      return (Boolean) value;
     }
     return false;
   }

doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java

@@ -77,15 +77,15 @@ public ExpressionEvaluator() {
   }
 
   public ExpressionEvaluator(ExpressionFunctions expressionFunctions, ClassHelper classHelper) {
-    this(Collections.<String, Value>emptyMap(), expressionFunctions, classHelper);
+    this(Collections.emptyMap(), expressionFunctions, classHelper);
   }
 
   public ExpressionEvaluator(
       Map<String, Value> variableValues,
       ExpressionFunctions expressionFunctions,
       ClassHelper classHelper) {
     assertNotNull(variableValues, expressionFunctions, classHelper);
-    this.variableValues = new HashMap<String, Value>(variableValues);
+    this.variableValues = new HashMap<>(variableValues);
     this.expressionFunctions = expressionFunctions;
     this.classHelper = classHelper;
   }
@@ -100,9 +100,9 @@ public Value removeValue(String variableName) {
     return variableValues.remove(variableName);
   }
 
-  public void add(String varialbeName, Value value) {
-    assertNotNull(varialbeName, value);
-    variableValues.put(varialbeName, value);
+  public void add(String variableName, Value value) {
+    assertNotNull(variableName, value);
+    variableValues.put(variableName, value);
   }
 
   public EvaluationResult evaluate(ExpressionNode node) {
@@ -253,21 +253,21 @@ public EvaluationResult visitAddOperatorNode(AddOperatorNode node, Void p) {
 
     Number leftNumber = createNumber(node, leftNode, leftResult);
     if (leftNumber == null) {
-      throwNotNumberException(node, leftNode, leftResult);
+      throw newNotNumberException(node, leftNode, leftResult);
     }
     Number rightNumber = createNumber(node, rightNode, rightResult);
     if (rightNumber == null) {
-      throwNotNumberException(node, rightNode, rightResult);
+      throw newNotNumberException(node, rightNode, rightResult);
     }
     return leftNumber.add(rightNumber);
   }
 
   protected Text createText(
-      OperatorNode operatoNode, ExpressionNode operandNode, EvaluationResult evaluationResult) {
+      OperatorNode operatorNode, ExpressionNode operandNode, EvaluationResult evaluationResult) {
     if (!Text.isAcceptable(evaluationResult.getValueClass())) {
       return null;
     }
-    return new Text(operatoNode, evaluationResult.getValue(), evaluationResult.getValueClass());
+    return new Text(operatorNode, evaluationResult.getValue(), evaluationResult.getValueClass());
   }
 
   protected void throwNotTextException(
@@ -290,11 +290,11 @@ public EvaluationResult visitSubtractOperatorNode(SubtractOperatorNode node, Voi
     EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p);
     Number leftNumber = createNumber(node, leftNode, leftResult);
     if (leftNumber == null) {
-      throwNotNumberException(node, leftNode, leftResult);
+      throw newNotNumberException(node, leftNode, leftResult);
     }
     Number rightNumber = createNumber(node, rightNode, rightResult);
     if (rightNumber == null) {
-      throwNotNumberException(node, rightNode, rightResult);
+      throw newNotNumberException(node, rightNode, rightResult);
     }
     return leftNumber.subtract(rightNumber);
   }
@@ -307,11 +307,11 @@ public EvaluationResult visitMultiplyOperatorNode(MultiplyOperatorNode node, Voi
     EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p);
     Number leftNumber = createNumber(node, leftNode, leftResult);
     if (leftNumber == null) {
-      throwNotNumberException(node, leftNode, leftResult);
+      throw newNotNumberException(node, leftNode, leftResult);
     }
     Number rightNumber = createNumber(node, rightNode, rightResult);
     if (rightNumber == null) {
-      throwNotNumberException(node, rightNode, rightResult);
+      throw newNotNumberException(node, rightNode, rightResult);
     }
     return leftNumber.multiply(rightNumber);
   }
@@ -324,11 +324,11 @@ public EvaluationResult visitDivideOperatorNode(DivideOperatorNode node, Void p)
     EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p);
     Number leftNumber = createNumber(node, leftNode, leftResult);
     if (leftNumber == null) {
-      throwNotNumberException(node, leftNode, leftResult);
+      throw newNotNumberException(node, leftNode, leftResult);
     }
     Number rightNumber = createNumber(node, rightNode, rightResult);
     if (rightNumber == null) {
-      throwNotNumberException(node, rightNode, rightResult);
+      throw newNotNumberException(node, rightNode, rightResult);
     }
     return leftNumber.divide(rightNumber);
   }
@@ -341,31 +341,31 @@ public EvaluationResult visitModOperatorNode(ModOperatorNode node, Void p) {
     EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p);
     Number leftNumber = createNumber(node, leftNode, leftResult);
     if (leftNumber == null) {
-      throwNotNumberException(node, leftNode, leftResult);
+      throw newNotNumberException(node, leftNode, leftResult);
     }
     Number rightNumber = createNumber(node, rightNode, rightResult);
     if (rightNumber == null) {
-      throwNotNumberException(node, rightNode, rightResult);
+      throw newNotNumberException(node, rightNode, rightResult);
     }
     return leftNumber.mod(rightNumber);
   }
 
   protected Number createNumber(
-      ArithmeticOperatorNode operatoNode,
+      ArithmeticOperatorNode operatorNode,
       ExpressionNode operandNode,
       EvaluationResult evaluationResult) {
     if (!Number.isAcceptable(evaluationResult.getValueClass())) {
       return null;
     }
-    return new Number(operatoNode, evaluationResult.getValue(), evaluationResult.getValueClass());
+    return new Number(operatorNode, evaluationResult.getValue(), evaluationResult.getValueClass());
   }
 
-  protected void throwNotNumberException(
+  protected ExpressionException newNotNumberException(
       ArithmeticOperatorNode operatorNode,
       ExpressionNode operandNode,
       EvaluationResult evaluationResult) {
     ExpressionLocation location = operandNode.getLocation();
-    throw new ExpressionException(
+    return new ExpressionException(
         Message.DOMA3013,
         location.getExpression(),
         location.getPosition(),
@@ -449,7 +449,7 @@ protected Constructor<?> findConstructor(
 
   protected EvaluationResult invokeConstructor(
       ExpressionLocation location, Class<?> clazz, Constructor<?> constructor, Object... params) {
-    Object value = null;
+    Object value;
     try {
       value = ConstructorUtil.newInstance(constructor, params);
     } catch (WrapException e) {
@@ -531,7 +531,7 @@ protected Method findMethod(
 
   protected Method findMethodFromInterfaces(
       String methodName, Object target, Class<?> targetClass, Class<?>[] paramTypes) {
-    LinkedList<Method> methods = new LinkedList<Method>();
+    LinkedList<Method> methods = new LinkedList<>();
     for (Class<?> clazz = targetClass;
         clazz != null && clazz != Object.class;
         clazz = clazz.getSuperclass()) {
@@ -548,7 +548,7 @@ protected Method findMethodFromInterfaces(
 
   protected Method findMethodFromClasses(
       String methodName, Object target, Class<?> targetClass, Class<?>[] paramTypes) {
-    LinkedList<Method> methods = new LinkedList<Method>();
+    LinkedList<Method> methods = new LinkedList<>();
     for (Class<?> clazz = targetClass;
         clazz != null && clazz != Object.class;
         clazz = clazz.getSuperclass()) {
@@ -561,26 +561,27 @@ protected Method findMethodFromClasses(
     return findSuiteMethod(methods, target, targetClass, paramTypes);
   }
 
+  @SuppressWarnings("CStyleArrayDeclaration")
   protected Method findSuiteMethod(
       List<Method> methods, Object target, Class<?> targetClass, Class<?>[] argTypes) {
     CandidateMethod candidate = null;
     outer:
     for (Method method : methods) {
       Class<?> paramTypes[] = method.getParameterTypes();
       if (paramTypes.length == argTypes.length) {
-        int degreeOfcoincidence = 0;
+        int degreeOfCoincidence = 0;
         for (int i = 0; i < paramTypes.length; i++) {
           int difference = calculateHierarchyDifference(paramTypes[i], argTypes[i], 0);
           if (difference == -1) {
             continue outer;
           }
-          degreeOfcoincidence += difference;
+          degreeOfCoincidence += difference;
         }
-        if (degreeOfcoincidence == 0) {
+        if (degreeOfCoincidence == 0) {
           return method;
         }
-        if (candidate == null || degreeOfcoincidence < candidate.degreeOfcoincidence) {
-          candidate = new CandidateMethod(degreeOfcoincidence, method);
+        if (candidate == null || degreeOfCoincidence < candidate.degreeOfCoincidence) {
+          candidate = new CandidateMethod(degreeOfCoincidence, method);
         }
       }
     }
@@ -762,11 +763,11 @@ protected EvaluationResult createEvaluationResult(
       return new EvaluationResult(nullable, Integer.class);
     } else if (value instanceof OptionalLong) {
       OptionalLong optional = (OptionalLong) value;
-      Long nullable = optional.isPresent() ? Long.valueOf(optional.getAsLong()) : null;
+      Long nullable = optional.isPresent() ? optional.getAsLong() : null;
       return new EvaluationResult(nullable, Long.class);
     } else if (value instanceof OptionalDouble) {
       OptionalDouble optional = (OptionalDouble) value;
-      Double nullable = optional.isPresent() ? Double.valueOf(optional.getAsDouble()) : null;
+      Double nullable = optional.isPresent() ? optional.getAsDouble() : null;
       return new EvaluationResult(nullable, Double.class);
     }
     if (target != null) {
@@ -831,7 +832,7 @@ protected EvaluationResult concat(Text other) {
 
   protected static class Number {
 
-    protected static final Map<Class<?>, Integer> priorityMap = new HashMap<Class<?>, Integer>();
+    protected static final Map<Class<?>, Integer> priorityMap = new HashMap<>();
 
     static {
       priorityMap.put(BigDecimal.class, 80);
@@ -954,6 +955,7 @@ protected EvaluationResult multiply(Number other) {
     protected EvaluationResult divide(Number other) {
       BigDecimal newValue = null;
       try {
+        //noinspection BigDecimalMethodWithoutRoundingCalled
         newValue = numberValue.divide(other.numberValue);
       } catch (ArithmeticException e) {
         handleArithmeticException(e);
@@ -993,7 +995,7 @@ protected class ParameterCollector
       implements ExpressionNodeVisitor<Void, List<EvaluationResult>> {
 
     public ParameterCollection collect(ExpressionNode node) {
-      List<EvaluationResult> evaluationResults = new ArrayList<EvaluationResult>();
+      List<EvaluationResult> evaluationResults = new ArrayList<>();
       node.accept(this, evaluationResults);
       return new ParameterCollection(evaluationResults);
     }
@@ -1186,11 +1188,11 @@ public Class<?>[] getParamTypes() {
   }
 
   protected static class CandidateMethod {
-    final int degreeOfcoincidence;
+    final int degreeOfCoincidence;
     final Method method;
 
-    CandidateMethod(int degreeOfcoincidence, Method method) {
-      this.degreeOfcoincidence = degreeOfcoincidence;
+    CandidateMethod(int degreeOfCoincidence, Method method) {
+      this.degreeOfCoincidence = degreeOfCoincidence;
       this.method = method;
     }
   }

doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java

@@ -39,9 +39,9 @@
 
 public class ExpressionParser {
 
-  protected final Deque<ExpressionNode> expressionNodes = new LinkedList<ExpressionNode>();
+  protected final Deque<ExpressionNode> expressionNodes = new LinkedList<>();
 
-  protected final Deque<OperatorNode> operatorNodes = new LinkedList<OperatorNode>();
+  protected final Deque<OperatorNode> operatorNodes = new LinkedList<>();
 
   protected final ExpressionReducer expressionReducer = new ExpressionReducer();
 
@@ -255,6 +255,7 @@ public ExpressionNode parse() {
                 Message.DOMA3011, location.getExpression(), location.getPosition(), token);
           }
         case EOE:
+          //noinspection DuplicateBranchesInSwitch
           {
             break outer;
           }
@@ -412,7 +413,7 @@ protected void parseStaticFieldOperand() {
 
   protected void parseNewOperand() {
     StringBuilder buf = new StringBuilder();
-    for (; tokenizer.next() != OPENED_PARENS; ) {
+    while (tokenizer.next() != OPENED_PARENS) {
       if (tokenType != WHITESPACE) {
         buf.append(tokenizer.getToken());
       }
@@ -423,22 +424,19 @@ protected void parseNewOperand() {
   }
 
   protected void parseOperator(OperatorNode currentNode) {
-    if (operatorNodes.peek() == null) {
-      operatorNodes.push(currentNode);
-    } else {
-      if (currentNode.getPriority() > operatorNodes.peek().getPriority()) {
-        operatorNodes.push(currentNode);
-      } else {
+    OperatorNode first = operatorNodes.peek();
+    if (first != null) {
+      if (currentNode.getPriority() <= first.getPriority()) {
         for (Iterator<OperatorNode> it = operatorNodes.iterator(); it.hasNext(); ) {
           OperatorNode operatorNode = it.next();
           if (operatorNode.getPriority() > currentNode.getPriority()) {
             reduce(operatorNode);
             it.remove();
           }
         }
-        operatorNodes.push(currentNode);
       }
     }
+    operatorNodes.push(currentNode);
   }
 
   protected void reduceAll() {

doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenType.java

@@ -75,5 +75,5 @@ public enum ExpressionTokenType {
 
   OTHER,
 
-  EOE;
+  EOE
 }