From 0c9bcca58468d16110205686da84f322a33d560f Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Sat, 1 Aug 2015 17:21:09 +1200
Subject: [PATCH] No effective change - code cleanup - BeanPropertyOverride -
 unused override of sql formula

---
 .../server/deploy/BeanProperty.java           |  7 ++--
 .../server/deploy/BeanPropertyOverride.java   | 38 +++++--------------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java
index 621ac198b..6ec77fe07 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java
@@ -322,9 +322,10 @@ public class BeanProperty implements ElPropertyValue {
     this.indexed = source.isIndexed();
     this.indexName = source.getIndexName();
     this.dbColumn = InternString.intern(override.getDbColumn());
-    this.sqlFormulaJoin = InternString.intern(override.getSqlFormulaJoin());
-    this.sqlFormulaSelect = InternString.intern(override.getSqlFormulaSelect());
-    this.formula = sqlFormulaSelect != null;
+    // override with sqlFormula not currently supported
+    this.sqlFormulaJoin = null;
+    this.sqlFormulaSelect = null;
+    this.formula = false;
 
     this.excludedFromHistory = source.excludedFromHistory;
     this.fetchEager = source.fetchEager;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyOverride.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyOverride.java
index 7791f4ad9..5841c16f2 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyOverride.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyOverride.java
@@ -11,35 +11,17 @@ import com.avaje.ebeaninternal.server.lib.util.StringHelper;
  */
 public class BeanPropertyOverride {
 
-	private final String dbColumn;
-		
-	private final String sqlFormulaSelect;
+  private final String dbColumn;
 
-	private final String sqlFormulaJoin;
+  public BeanPropertyOverride(String dbColumn) {
+    this.dbColumn = InternString.intern(dbColumn);
+  }
 
-	public BeanPropertyOverride(String dbColumn) {
-		this(dbColumn, null, null);
-	}
-	
-	public BeanPropertyOverride(String dbColumn, String sqlFormulaSelect, String sqlFormulaJoin) {
-		this.dbColumn = InternString.intern(dbColumn);
-		this.sqlFormulaSelect = InternString.intern(sqlFormulaSelect);
-		this.sqlFormulaJoin = InternString.intern(sqlFormulaJoin);
-	}
+  public String getDbColumn() {
+    return dbColumn;
+  }
 
-	public String getDbColumn() {
-		return dbColumn;
-	}
-
-	public String getSqlFormulaSelect() {
-		return sqlFormulaSelect;
-	}
-	
-	public String getSqlFormulaJoin() {
-		return sqlFormulaJoin;
-	}
-	
-	public String replace(String src, String srcDbColumn){
-	    return StringHelper.replaceString(src, srcDbColumn, dbColumn);
-	}
+  public String replace(String src, String srcDbColumn) {
+    return StringHelper.replaceString(src, srcDbColumn, dbColumn);
+  }
 }