Rename Identifier methods with getXXX

speedment · Sep 28, 2016 · 6554988 · 6554988
1 parent 899de9c
commit 6554988
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 38 deletions.
diff --git a/plugins/json-stream/src/main/java/com/speedment/plugins/json/internal/JsonComponentImpl.java b/plugins/json-stream/src/main/java/com/speedment/plugins/json/internal/JsonComponentImpl.java
@@ -28,9 +28,9 @@
 import java.util.stream.Stream;
 
 import static com.speedment.plugins.json.internal.JsonUtil.jsonField;
+import static java.util.stream.Collectors.toSet;
 import static com.speedment.runtime.util.NullUtil.requireNonNullElements;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toSet;
 
 /**
  *
@@ -56,8 +56,7 @@ public <ENTITY> JsonEncoder<ENTITY> allOf(Manager<ENTITY> manager) {
 
         manager.fields()
             .forEachOrdered(f -> {
-                formatter.put(
-                    jsonField(projectComponent.getProject(), f.identifier()),
+                formatter.put(jsonField(projectComponent.getProject(), f.identifier()),
                     f.getter()::apply
                 );
             });
@@ -75,14 +74,13 @@ public final <ENTITY> JsonEncoder<ENTITY> of(Manager<ENTITY> manager, Field<ENTI
 
         final Set<String> fieldNames = Stream.of(fields)
             .map(Field::identifier)
-            .map(FieldIdentifier::columnName)
+            .map(FieldIdentifier::getColumnName)
             .collect(toSet());
 
         manager.fields()
-            .filter(f -> fieldNames.contains(f.identifier().columnName()))
+            .filter(f -> fieldNames.contains(f.identifier().getColumnName()))
             .forEachOrdered(f
-                -> formatter.put(
-                    jsonField(projectComponent.getProject(), f.identifier()),
+                -> formatter.put(jsonField(projectComponent.getProject(), f.identifier()),
                     f.getter()::apply
                 )
             );

diff --git a/runtime/src/main/java/com/speedment/runtime/config/identifier/FieldIdentifier.java b/runtime/src/main/java/com/speedment/runtime/config/identifier/FieldIdentifier.java
@@ -50,26 +50,26 @@ public interface FieldIdentifier<ENTITY> {
      * 
      * @return  the {@link Dbms} name
      */
-    String dbmsName();
+    String getDbmsName();
 
     /**
      * Returns the database name of the {@link Schema} that this field is in.
      * 
      * @return  the {@link Schema} name
      */
-    String schemaName();
+    String getSchemaName();
 
     /**
      * Returns the database name of the {@link Table} that this field is in.
      * 
      * @return  the {@link Table} name
      */
-    String tableName();
+    String getTableName();
 
     /**
      * Returns the database name of the {@link Column} that this field is in.
      * 
      * @return  the {@link Column} name
      */
-    String columnName();
+    String getColumnName();
 }
diff --git a/runtime/src/main/java/com/speedment/runtime/db/DatabaseNamingConvention.java b/runtime/src/main/java/com/speedment/runtime/db/DatabaseNamingConvention.java
@@ -70,7 +70,7 @@ public interface DatabaseNamingConvention {
      * @return the full name
      */
     default String fullNameOf(FieldIdentifier<?> fieldIdentifier) {
-        return fullNameOf(fieldIdentifier.schemaName(), fieldIdentifier.tableName(), fieldIdentifier.columnName());
+        return fullNameOf(fieldIdentifier.getSchemaName(), fieldIdentifier.getTableName(), fieldIdentifier.getColumnName());
     }
 
     /**

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromByte.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromByte.java
@@ -46,7 +46,7 @@ public FK_ENTITY apply(ENTITY entity) {
             .orElseThrow(() -> new SpeedmentException(
                 "Error! Could not find any " + 
                 getTargetManager().getEntityClass().getSimpleName() + 
-                " with '" + getTargetField().identifier().columnName() + 
+                " with '" + getTargetField().identifier().getColumnName() + 
                 "' = '" + value + "'."
             ));
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromChar.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromChar.java
@@ -46,7 +46,7 @@ public FK_ENTITY apply(ENTITY entity) {
             .orElseThrow(() -> new SpeedmentException(
                 "Error! Could not find any " + 
                 getTargetManager().getEntityClass().getSimpleName() + 
-                " with '" + getTargetField().identifier().columnName() + 
+                " with '" + getTargetField().identifier().getColumnName() + 
                 "' = '" + value + "'."
             ));
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromDouble.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromDouble.java
@@ -46,7 +46,7 @@ public FK_ENTITY apply(ENTITY entity) {
             .orElseThrow(() -> new SpeedmentException(
                 "Error! Could not find any " + 
                 getTargetManager().getEntityClass().getSimpleName() + 
-                " with '" + getTargetField().identifier().columnName() + 
+                " with '" + getTargetField().identifier().getColumnName() + 
                 "' = '" + value + "'."
             ));
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromFloat.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromFloat.java
@@ -46,7 +46,7 @@ public FK_ENTITY apply(ENTITY entity) {
             .orElseThrow(() -> new SpeedmentException(
                 "Error! Could not find any " + 
                 getTargetManager().getEntityClass().getSimpleName() + 
-                " with '" + getTargetField().identifier().columnName() + 
+                " with '" + getTargetField().identifier().getColumnName() + 
                 "' = '" + value + "'."
             ));
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromInt.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromInt.java
@@ -46,7 +46,7 @@ public FK_ENTITY apply(ENTITY entity) {
             .orElseThrow(() -> new SpeedmentException(
                 "Error! Could not find any " + 
                 getTargetManager().getEntityClass().getSimpleName() + 
-                " with '" + getTargetField().identifier().columnName() + 
+                " with '" + getTargetField().identifier().getColumnName() + 
                 "' = '" + value + "'."
             ));
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromLong.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromLong.java
@@ -46,7 +46,7 @@ public FK_ENTITY apply(ENTITY entity) {
             .orElseThrow(() -> new SpeedmentException(
                 "Error! Could not find any " + 
                 getTargetManager().getEntityClass().getSimpleName() + 
-                " with '" + getTargetField().identifier().columnName() + 
+                " with '" + getTargetField().identifier().getColumnName() + 
                 "' = '" + value + "'."
             ));
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromReference.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromReference.java
@@ -51,7 +51,7 @@ public FK_ENTITY apply(ENTITY entity) {
                 .orElseThrow(() -> new SpeedmentException(
                     "Error! Could not find any " + 
                     getTargetManager().getEntityClass().getSimpleName() + 
-                    " with '" + getTargetField().identifier().columnName() + 
+                    " with '" + getTargetField().identifier().getColumnName() + 
                     "' = '" + value + "'."
                 ));
         }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromShort.java b/runtime/src/main/java/com/speedment/runtime/internal/field/finder/FindFromShort.java
@@ -46,7 +46,7 @@ public FK_ENTITY apply(ENTITY entity) {
             .orElseThrow(() -> new SpeedmentException(
                 "Error! Could not find any " + 
                 getTargetManager().getEntityClass().getSimpleName() + 
-                " with '" + getTargetField().identifier().columnName() + 
+                " with '" + getTargetField().identifier().getColumnName() + 
                 "' = '" + value + "'."
             ));
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/manager/JdbcManagerSupportImpl.java b/runtime/src/main/java/com/speedment/runtime/internal/manager/JdbcManagerSupportImpl.java
@@ -66,11 +66,12 @@
 import static com.speedment.runtime.internal.util.document.DocumentDbUtil.*;
 import static com.speedment.runtime.internal.util.document.DocumentUtil.Name.DATABASE_NAME;
 import com.speedment.runtime.manager.JdbcManagerSupport;
-import static com.speedment.runtime.util.NullUtil.requireNonNulls;
-import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.*;
 
+import static com.speedment.runtime.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+
 /**
  *
  * @author  Emil Forslund
@@ -136,7 +137,7 @@ public JdbcManagerSupportImpl(
                 .map(c -> c.getParent())
                 .map(t -> isSame(table, t.get()))
                 .orElse(false)
-            ).collect(toMap(f -> f.identifier().columnName(), identity()));
+            ).collect(toMap(f -> f.identifier().getColumnName(), identity()));
     }
 
     @Override

diff --git a/.../src/main/java/com/speedment/runtime/internal/manager/sql/AbstractFieldPredicateView.java b/.../src/main/java/com/speedment/runtime/internal/manager/sql/AbstractFieldPredicateView.java
@@ -137,7 +137,7 @@ protected <ENTITY> SqlPredicateFragment render(ManagerSupport<ENTITY> manager, F
                 return isNotEmpty(cn);
             default:
                 throw new UnsupportedOperationException(
-                    "Unknown PredicateType  " + pt.name() + ". Column name:" + model.getField().identifier().columnName()
+                    "Unknown PredicateType  " + pt.name() + ". Column name:" + model.getField().identifier().getColumnName()
                 );
         }
     }

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/util/document/DocumentDbUtil.java b/runtime/src/main/java/com/speedment/runtime/internal/util/document/DocumentDbUtil.java
@@ -260,19 +260,19 @@ public static boolean isUnique(Column column) throws SpeedmentException {
     }
 
     public static Optional<? extends Column> referencedColumnIfPresent(Project project, FieldIdentifier<?> identifier) {
-        return referencedColumnIfPresent(project, identifier.dbmsName(), identifier.schemaName(), identifier.tableName(), identifier.columnName());
+        return referencedColumnIfPresent(project, identifier.getDbmsName(), identifier.getSchemaName(), identifier.getTableName(), identifier.getColumnName());
     }
 
     public static Optional<? extends Table> referencedTableIfPresent(Project project, FieldIdentifier<?> identifier) {
-        return referencedTableIfPresent(project, identifier.dbmsName(), identifier.schemaName(), identifier.tableName());
+        return referencedTableIfPresent(project, identifier.getDbmsName(), identifier.getSchemaName(), identifier.getTableName());
     }
 
     public static Optional<? extends Schema> referencedSchemaIfPresent(Project project, FieldIdentifier<?> identifier) {
-        return referencedSchemaIfPresent(project, identifier.dbmsName(), identifier.schemaName());
+        return referencedSchemaIfPresent(project, identifier.getDbmsName(), identifier.getSchemaName());
     }
 
     public static Optional<? extends Dbms> referencedDbmsIfPresent(Project project, FieldIdentifier<?> identifier) {
-        return referencedDbmsIfPresent(project, identifier.dbmsName());
+        return referencedDbmsIfPresent(project, identifier.getDbmsName());
     }
 
     public static Optional<? extends Column> referencedColumnIfPresent(Project project, String dbmsName, String schemaName, String tableName, String columnName) {
@@ -301,19 +301,19 @@ public static Optional<? extends Dbms> referencedDbmsIfPresent(Project project,
     }
 
     public static Column referencedColumn(Project project, FieldIdentifier<?> identifier) {
-        return referencedColumn(project, identifier.dbmsName(), identifier.schemaName(), identifier.tableName(), identifier.columnName());
+        return referencedColumn(project, identifier.getDbmsName(), identifier.getSchemaName(), identifier.getTableName(), identifier.getColumnName());
     }
 
     public static Table referencedTable(Project project, FieldIdentifier<?> identifier) {
-        return referencedTable(project, identifier.dbmsName(), identifier.schemaName(), identifier.tableName());
+        return referencedTable(project, identifier.getDbmsName(), identifier.getSchemaName(), identifier.getTableName());
     }
 
     public static Schema referencedSchema(Project project, FieldIdentifier<?> identifier) {
-        return referencedSchema(project, identifier.dbmsName(), identifier.schemaName());
+        return referencedSchema(project, identifier.getDbmsName(), identifier.getSchemaName());
     }
 
     public static Dbms referencedDbms(Project project, FieldIdentifier<?> identifier) {
-        return referencedDbms(project, identifier.dbmsName());
+        return referencedDbms(project, identifier.getDbmsName());
     }
 
     public static Column referencedColumn(Project project, String dbmsName, String schemaName, String tableName, String columnName) {

diff --git a/runtime/src/test/java/com/speedment/runtime/internal/field/Entity.java b/runtime/src/test/java/com/speedment/runtime/internal/field/Entity.java
@@ -37,22 +37,22 @@ enum Identifier implements FieldIdentifier<Entity> {
         }
 
         @Override
-        public String columnName() {
+        public String getColumnName() {
             return columnName;
         }
 
         @Override
-        public String dbmsName() {
+        public String getDbmsName() {
             return "my_dbms";
         }
 
         @Override
-        public String schemaName() {
+        public String getSchemaName() {
             return "my_schema";
         }
 
         @Override
-        public String tableName() {
+        public String getTableName() {
             return "my_table";
         }
     }

diff --git a/runtime/src/test/java/com/speedment/runtime/internal/field/FieldTest.java b/runtime/src/test/java/com/speedment/runtime/internal/field/FieldTest.java
@@ -30,8 +30,8 @@ public class FieldTest extends BaseFieldTest {
 
     @Test
     public void testField() throws Exception {
-        assertEquals("id", ID.identifier().columnName());
-        assertEquals("name", NAME.identifier().columnName());
+        assertEquals("id", ID.identifier().getColumnName());
+        assertEquals("name", NAME.identifier().getColumnName());
     }
 
 }