Merge pull request #430 from domaframework/polish

Polish

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/MappedResultProvider.java

@@ -35,11 +35,11 @@ public RESULT get(ResultSet resultSet) throws SQLException {
 
           @Override
           public <ENTITY> ENTITY get(EntityMetamodel<ENTITY> entityMetamodel) {
-            List<PropertyMetamodel<?>> propertyDefs = entityMetamodel.allPropertyMetamodels();
-            Map<String, Property<ENTITY, ?>> states = new HashMap<>(propertyDefs.size());
-            List<Object> rawValues = new ArrayList<>(propertyDefs.size());
-            for (PropertyMetamodel<?> propertyDef : propertyDefs) {
-              EntityPropertyType<?, ?> propertyType = propertyDef.asType();
+            List<PropertyMetamodel<?>> propertyMetamodels = entityMetamodel.allPropertyMetamodels();
+            Map<String, Property<ENTITY, ?>> states = new HashMap<>(propertyMetamodels.size());
+            List<Object> rawValues = new ArrayList<>(propertyMetamodels.size());
+            for (PropertyMetamodel<?> propertyMetamodel : propertyMetamodels) {
+              EntityPropertyType<?, ?> propertyType = propertyMetamodel.asType();
               Property<ENTITY, ?> property = (Property<ENTITY, ?>) propertyType.createProperty();
               try {
                 Object rawValue = fetchSupport.fetch(resultSet, property, index++);
@@ -61,8 +61,8 @@ public <ENTITY> ENTITY get(EntityMetamodel<ENTITY> entityMetamodel) {
           }
 
           @Override
-          public <PROPERTY> PROPERTY get(PropertyMetamodel<PROPERTY> propertyDef) {
-            Property<?, ?> property = propertyDef.asType().createProperty();
+          public <PROPERTY> PROPERTY get(PropertyMetamodel<PROPERTY> propertyMetamodel) {
+            Property<?, ?> property = propertyMetamodel.asType().createProperty();
             try {
               fetchSupport.fetch(resultSet, property, index++);
             } catch (SQLException e) {

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/ArithmeticExpression.java

@@ -47,8 +47,8 @@ public int hashCode() {
 
   class Add<PROPERTY> extends AbstractArithmeticExpression<PROPERTY> {
 
-    public Add(PropertyMetamodel<?> propertyDef, Operand left, Operand right) {
-      super(propertyDef, left, right);
+    public Add(PropertyMetamodel<?> propertyMetamodel, Operand left, Operand right) {
+      super(propertyMetamodel, left, right);
     }
 
     @Override
@@ -67,8 +67,8 @@ public void accept(PropertyMetamodel.Visitor visitor) {
 
   class Sub<PROPERTY> extends AbstractArithmeticExpression<PROPERTY> {
 
-    public Sub(PropertyMetamodel<?> propertyDef, Operand left, Operand right) {
-      super(propertyDef, left, right);
+    public Sub(PropertyMetamodel<?> propertyMetamodel, Operand left, Operand right) {
+      super(propertyMetamodel, left, right);
     }
 
     @Override
@@ -87,8 +87,8 @@ public void accept(PropertyMetamodel.Visitor visitor) {
 
   class Mul<PROPERTY> extends AbstractArithmeticExpression<PROPERTY> {
 
-    public Mul(PropertyMetamodel<?> propertyDef, Operand left, Operand right) {
-      super(propertyDef, left, right);
+    public Mul(PropertyMetamodel<?> propertyMetamodel, Operand left, Operand right) {
+      super(propertyMetamodel, left, right);
     }
 
     @Override
@@ -107,8 +107,8 @@ public void accept(PropertyMetamodel.Visitor visitor) {
 
   class Div<PROPERTY> extends AbstractArithmeticExpression<PROPERTY> {
 
-    public Div(PropertyMetamodel<?> propertyDef, Operand left, Operand right) {
-      super(propertyDef, left, right);
+    public Div(PropertyMetamodel<?> propertyMetamodel, Operand left, Operand right) {
+      super(propertyMetamodel, left, right);
     }
 
     @Override
@@ -127,8 +127,8 @@ public void accept(PropertyMetamodel.Visitor visitor) {
 
   class Mod<PROPERTY> extends AbstractArithmeticExpression<PROPERTY> {
 
-    public Mod(PropertyMetamodel<?> propertyDef, Operand left, Operand right) {
-      super(propertyDef, left, right);
+    public Mod(PropertyMetamodel<?> propertyMetamodel, Operand left, Operand right) {
+      super(propertyMetamodel, left, right);
     }
 
     @Override
@@ -154,6 +154,6 @@ interface Visitor {
 
     void visit(Div<?> div);
 
-    void visit(Mod<?> div);
+    void visit(Mod<?> mod);
   }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/StringExpression.java

@@ -47,8 +47,8 @@ public int hashCode() {
 
   class Concat<PROPERTY> extends AbstractStringExpression<PROPERTY> {
 
-    public Concat(PropertyMetamodel<?> propertyDef, Operand left, Operand right) {
-      super(propertyDef, left, right);
+    public Concat(PropertyMetamodel<?> propertyMetamodel, Operand left, Operand right) {
+      super(propertyMetamodel, left, right);
     }
 
     @Override

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Row.java

@@ -49,20 +49,20 @@ void entityDef_notFound() {
   }
 
   @Test
-  void propertyDef() {
+  void propertyMetamodel() {
     AliasManager manager = new AliasManager(new ContextImpl(Arrays.asList(e, d)));
     Assertions.assertEquals("t0_", manager.getAlias(e.name));
     Assertions.assertEquals("t1_", manager.getAlias(d.name));
   }
 
   @Test
-  void propertyDef_notFound() {
+  void propertyMetamodel_notFound() {
     AliasManager manager = new AliasManager(new ContextImpl(Arrays.asList(e, d)));
     Assertions.assertNull(manager.getAlias(e2.name));
   }
 
   @Test
-  void entityDef_parent() {
+  void entityMetamodel_parent() {
     AliasManager parent = new AliasManager(new ContextImpl(Arrays.asList(e, d)));
     AliasManager child = new AliasManager(new ContextImpl(Arrays.asList(e2, d2)), parent);
     Assertions.assertEquals("t0_", child.getAlias(e));
@@ -72,7 +72,7 @@ void entityDef_parent() {
   }
 
   @Test
-  void propertyDef_parent() {
+  void propertyMetamodel_parent() {
     AliasManager parent = new AliasManager(new ContextImpl(Arrays.asList(e, d)));
     AliasManager child = new AliasManager(new ContextImpl(Arrays.asList(e2, d2)), parent);
     Assertions.assertEquals("t0_", child.getAlias(e.name));

doma-core/src/test/java/org/seasar/doma/jdbc/criteria/query/AliasManagerTest.java

@@ -43,7 +43,7 @@ private void printClass() {
 
   private void printFields() {
     printAllPropertyModelFields();
-    printPropertyDefFields();
+    printPropertyMetamodelFields();
   }
 
   private void printAllPropertyModelFields() {
@@ -53,7 +53,7 @@ private void printAllPropertyModelFields() {
     print("%n");
   }
 
-  private void printPropertyDefFields() {
+  private void printPropertyMetamodelFields() {
     UnwrapOptionalVisitor visitor = new UnwrapOptionalVisitor();
     for (EmbeddablePropertyMeta p : embeddableMeta.getEmbeddablePropertyMetas()) {
       Pair<CtType, TypeMirror> pair = p.getCtType().accept(visitor, null);

doma-processor/src/main/java/org/seasar/doma/internal/apt/generator/EmbeddableMetamodelGenerator.java

@@ -69,7 +69,7 @@ private void printFields() {
     printQualifiedTableNameField();
     printEntityTypeField();
     printAllPropertyMetamodelsFields();
-    printPropertyDefFields();
+    printPropertyMetamodelFields();
   }
 
   private void printEntityTypeField() {
@@ -123,7 +123,7 @@ private void printOneArgConstructor() {
     print("%n");
   }
 
-  private void printPropertyDefFields() {
+  private void printPropertyMetamodelFields() {
     UnwrapOptionalVisitor visitor = new UnwrapOptionalVisitor();
     for (EntityPropertyMeta p : entityMeta.getAllPropertyMetas()) {
       if (p.isEmbedded()) {