From bd99badb2899fed90f2110afd3f77c3cd7aa950b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 2 Feb 2015 21:43:08 +1300
Subject: [PATCH] No effective change - code cleanup of BindableProperty to
 remove unused parameter (property name)

---
 .../server/deploy/id/ImportedIdEmbedded.java           |  4 ++--
 .../server/deploy/id/ImportedIdMultiple.java           |  2 +-
 .../server/deploy/id/ImportedIdSimple.java             |  2 +-
 .../ebeaninternal/server/persist/dml/DmlHandler.java   | 10 +++++-----
 .../persist/dmlbind/BindableEncryptedProperty.java     |  2 +-
 .../server/persist/dmlbind/BindableIdEmbedded.java     |  2 +-
 .../server/persist/dmlbind/BindableIdMap.java          |  2 +-
 .../server/persist/dmlbind/BindableIdScalar.java       |  2 +-
 .../server/persist/dmlbind/BindableProperty.java       |  4 ++--
 .../dmlbind/BindablePropertyInsertGenerated.java       |  2 +-
 .../dmlbind/BindablePropertyUpdateGenerated.java       |  2 +-
 .../server/persist/dmlbind/BindableRequest.java        |  4 ++--
 .../com/avaje/tests/model/types/SomeNewTypesBean.java  |  5 +++++
 13 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
index 897c4dedc..64a80db4a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
@@ -107,7 +107,7 @@ public class ImportedIdEmbedded implements ImportedId {
 		if (embeddedId == null){
 			for (int i = 0; i < imported.length; i++) {
 			    if (imported[i].owner.isUpdateable()) {
-			        request.bind(null, imported[i].foreignProperty, imported[i].localDbColumn);
+			        request.bind(null, imported[i].foreignProperty);
 			    }
 			}
 			
@@ -116,7 +116,7 @@ public class ImportedIdEmbedded implements ImportedId {
 			for (int i = 0; i < imported.length; i++) {
 			    if (imported[i].owner.isUpdateable()) {
     				Object scalarValue = imported[i].foreignProperty.getValue(embedded);
-    				request.bind(scalarValue, imported[i].foreignProperty, imported[i].localDbColumn);
+    				request.bind(scalarValue, imported[i].foreignProperty);
 			    }
 			}
 		}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java
index 78c8ef4f2..a741a490c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java
@@ -77,7 +77,7 @@ public class ImportedIdMultiple implements ImportedId {
 		for (int i = 0; i < imported.length; i++) {
 		    if (imported[i].owner.isUpdateable()) {
     			Object scalarValue = imported[i].foreignProperty.getValue(bean);
-    			request.bind(scalarValue, imported[i].foreignProperty, imported[i].localDbColumn);
+    			request.bind(scalarValue, imported[i].foreignProperty);
 		    }
 		}
 		// hmmm, not worrying about this just yet
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 9fe3dfcab..272279b35 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -135,7 +135,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 		if (bean != null){
 			value = getIdValue(bean);
 		}
-		request.bind(value, foreignProperty, localDbColumn);
+		request.bind(value, foreignProperty);
 		return value;
 	}
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java
index 10656e8aa..016b3bf8f 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -176,18 +176,18 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * Bind the value to the preparedStatement.
    */
-  public Object bind(Object value, BeanProperty prop, String propName) throws SQLException {
-    return bindInternal(logLevelSql, value, prop, propName);
+  public Object bind(Object value, BeanProperty prop) throws SQLException {
+    return bindInternal(logLevelSql, value, prop);
   }
 
   /**
    * Bind the value to the preparedStatement without logging.
    */
-  public Object bindNoLog(Object value, BeanProperty prop, String propName) throws SQLException {
-    return bindInternal(false, value, prop, propName);
+  public Object bindNoLog(Object value, BeanProperty prop) throws SQLException {
+    return bindInternal(false, value, prop);
   }
 
-  private Object bindInternal(boolean log, Object value, BeanProperty prop, String propName) throws SQLException {
+  private Object bindInternal(boolean log, Object value, BeanProperty prop) throws SQLException {
 
     if (log) {
       if (prop.isLob()) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java
index e3bbf3a36..f32212d7f 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java
@@ -58,7 +58,7 @@ public class BindableEncryptedProperty implements Bindable {
             // H2 encrypt function ... different parameter order
             request.bindNoLog(encryptKeyValue, Types.VARCHAR, prop.getName() + "=****");                        
         }
-        request.bindNoLog(value, prop, prop.getName());
+        request.bindNoLog(value, prop);
         
         if (bindEncryptDataFirst){
             // MySql, Postgres, Oracle
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java
index d816852cf..17db1a309 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java
@@ -62,7 +62,7 @@ public final class BindableIdEmbedded implements BindableId {
     for (int i = 0; i < props.length; i++) {
 
       Object value = props[i].getValue(idValue);
-      request.bind(value, props[i], props[i].getDbColumn());
+      request.bind(value, props[i]);
     }
 
     request.setIdValue(idValue);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdMap.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdMap.java
index 58501502d..b824020b6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdMap.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdMap.java
@@ -64,7 +64,7 @@ public final class BindableIdMap implements BindableId {
     for (int i = 0; i < uids.length; i++) {
       Object value = uids[i].getValue(bean);
 
-      request.bind(value, uids[i], uids[i].getName());
+      request.bind(value, uids[i]);
 
       // putting logicalType into map rather than
       // the dbType (which may have been converted).
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java
index 50cc8890a..5da2cd89b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java
@@ -61,7 +61,7 @@ public final class BindableIdScalar implements BindableId {
 
     Object value = uidProp.getValue(bean);
 
-    request.bind(value, uidProp, uidProp.getName());
+    request.bind(value, uidProp);
 
     // used for summary logging
     request.setIdValue(value);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java
index 3b84078d0..98f12be16 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java
@@ -42,7 +42,7 @@ public class BindableProperty implements Bindable {
     if (bean != null) {
       value = prop.getValue(bean);
     }
-    request.bind(value, prop, prop.getName());
+    request.bind(value, prop);
   }
 
   /**
@@ -54,6 +54,6 @@ public class BindableProperty implements Bindable {
     if (bean != null) {
       value = prop.getValueObject(bean);
     }
-    request.bind(value, prop, prop.getName());
+    request.bind(value, prop);
   }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java
index d1282cdef..86c3da57c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java
@@ -32,7 +32,7 @@ public class BindablePropertyInsertGenerated extends BindableProperty {
 			//prop.setValueIntercept(bean, value);
 			prop.setValue(bean, value);
 		}
-    request.bind(value, prop, prop.getName());
+    request.bind(value, prop);
   }
 
 	/**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java
index 0a3d057c1..080bfdc67 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java
@@ -40,7 +40,7 @@ public class BindablePropertyUpdateGenerated extends BindableProperty {
       Object value = gen.getUpdateValue(prop, bean);
         
       // generated value should be the correct type
-        request.bind(value, prop, prop.getName());
+        request.bind(value, prop);
         
         // only register the update value if it was included
         // in the bean in the first place
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java
index ea4251bee..bb9b4e0d1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java
@@ -27,7 +27,7 @@ public interface BindableRequest {
    * logicalType to dbType.
    * </p>
    */
-  public Object bind(Object value, BeanProperty prop, String propName) throws SQLException;
+  public Object bind(Object value, BeanProperty prop) throws SQLException;
 
   /**
    * Bind a raw value. Used to bind the discriminator column.
@@ -42,7 +42,7 @@ public interface BindableRequest {
   /**
    * Bind the value to the preparedStatement without logging.
    */
-  public Object bindNoLog(Object value, BeanProperty prop, String propName) throws SQLException;
+  public Object bindNoLog(Object value, BeanProperty prop) throws SQLException;
 
 
   /**
diff --git a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java
index 2267f3bca..17a218c2e 100644
--- a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java
+++ b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java
@@ -1,5 +1,6 @@
 package com.avaje.tests.model.types;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
@@ -14,12 +15,16 @@ public class SomeNewTypesBean {
   @Version
   Long version;
 
+  @Column(name = "dow")
   DayOfWeek dayOfWeek;
 
+  @Column(name = "mth")
   Month month;
 
+  @Column(name = "yr")
   Year year;
 
+  @Column(name = "yr_mth")
   YearMonth yearMonth;
 
   LocalDate localDate;