From 204b9ca6e51a0b7c70170b4b304d84cbcf9c0f9e Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Sat, 1 Aug 2015 17:54:06 +1200
Subject: [PATCH] No effective change - code cleanup - return void (unused
 return values), remove unused methods

---
 .../server/cache/CachedBeanDataToBean.java            | 11 ++++-------
 .../server/expression/DefaultExampleExpression.java   |  7 -------
 .../server/type/CtCompoundPropertyElAdapter.java      |  4 ----
 .../ebeaninternal/util/DefaultExpressionRequest.java  |  4 ----
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataToBean.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataToBean.java
index 4bbd3e212..c60d2ebfd 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataToBean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataToBean.java
@@ -9,17 +9,16 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 public class CachedBeanDataToBean {
 
 
-  public static boolean load(BeanDescriptor<?> desc, EntityBean bean, CachedBeanData cacheBeanData) {
-    
+  public static void load(BeanDescriptor<?> desc, EntityBean bean, CachedBeanData cacheBeanData) {
+
     EntityBeanIntercept ebi = bean._ebean_getIntercept();
 
-    
     BeanProperty idProperty = desc.getIdProperty();
     if (idProperty != null) {
       // load the id property
       loadProperty(bean, cacheBeanData, ebi, idProperty);
     }
-    
+
     // load the non-many properties
     BeanProperty[] props = desc.propertiesNonMany();
     for (int i = 0; i < props.length; i++) {
@@ -32,12 +31,10 @@ public class CachedBeanDataToBean {
     }
 
     ebi.setLoadedLazy();
-
-    return true;
   }
 
   private static void loadProperty(EntityBean bean, CachedBeanData cacheBeanData, EntityBeanIntercept ebi, BeanProperty prop) {
-   
+
     int propertyIndex = prop.getPropertyIndex();
     if (cacheBeanData.isLoaded(propertyIndex)) {
       if (ebi.isLoadedProperty(propertyIndex)) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java
index 36f293d0d..b6c1c3e77 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -121,13 +121,6 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
     return this;
   }
 
-  /**
-   * This will return null for this example expression.
-   */
-  public String getPropertyName() {
-    return null;
-  }
-
   /**
    * Adds bind values to the request.
    */
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java
index 4dedf9d8e..4d1081bec 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java
@@ -69,10 +69,6 @@ public class CtCompoundPropertyElAdapter implements ElPropertyValue {
         return null;
     }
 
-    public StringFormatter getStringFormatter() {
-        return null;
-    }
-
     public StringParser getStringParser() {
         return null;
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionRequest.java b/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionRequest.java
index 7322ba60a..10e469a09 100644
--- a/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionRequest.java
+++ b/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionRequest.java
@@ -73,10 +73,6 @@ public class DefaultExpressionRequest implements SpiExpressionRequest {
     bindValues.add(bindValue);
   }
 
-  public boolean includeProperty(String propertyName) {
-    return true;
-  }
-
   public String getSql() {
     return sb.toString();
   }