[empire-db] branch version3 updated: EMPIREDB-362 Interface cleanup (3) small fix

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch version3
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/version3 by this push:
     new ed1a9f2  EMPIREDB-362 Interface cleanup (3) small fix
ed1a9f2 is described below

commit ed1a9f285cd895ca74a4c0a971b874f21ac9613b
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Sun Feb 13 19:56:36 2022 +0100

    EMPIREDB-362 Interface cleanup (3) small fix
---
 .../java/org/apache/empire/data/RecordData.java    |  9 -----
 .../apache/empire/data/bean/BeanRecordProxy.java   |  1 -
 .../org/apache/empire/data/list/DataListEntry.java | 44 +++++++++++++---------
 .../java/org/apache/empire/db/DBRecordData.java    |  1 -
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/empire-db/src/main/java/org/apache/empire/data/RecordData.java 
b/empire-db/src/main/java/org/apache/empire/data/RecordData.java
index 13b1278..e42cf06 100644
--- a/empire-db/src/main/java/org/apache/empire/data/RecordData.java
+++ b/empire-db/src/main/java/org/apache/empire/data/RecordData.java
@@ -100,13 +100,4 @@ public interface RecordData
      */
     int setBeanProperties(Object bean, Collection<? extends ColumnExpr> 
ignoreList);
 
-    /**
-     * copies all field values into a static Java Bean.
-     * <P>
-     * In order to map column names to property names 
-     * the property name is detected by ColumnExpr.getBeanPropertyName()     
-     * @param bean the Java Bean for which to set the properties
-     */
-    int setBeanProperties(Object bean);
-
 }
diff --git 
a/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java 
b/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
index 513218c..a4a5134 100644
--- a/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
+++ b/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
@@ -315,7 +315,6 @@ public class BeanRecordProxy<T> implements Record
 
     // --------------- Bean support ------------------
 
-    @Override
     public int setBeanProperties(Object bean)
     {
         return setBeanProperties(bean, null);
diff --git 
a/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java 
b/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java
index cc21c4f..20c25a2 100644
--- a/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java
+++ b/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java
@@ -173,6 +173,15 @@ public class DataListEntry implements RecordData, 
Serializable
     {
         return getValue(indexOf(column));
     }
+    
+    /**
+     * @Deprecated Renamed to get(...)   
+     */
+    @Deprecated
+    public Object getValue(ColumnExpr column)
+    {
+        return get(column);
+    }
 
     public final <T> T get(Column column, Class<T> returnType)
     {
@@ -198,24 +207,6 @@ public class DataListEntry implements RecordData, 
Serializable
         return ObjectUtils.isEmpty(getValue(index));
     }
     
-    @Override
-    public final boolean isNull(ColumnExpr column)
-    {
-        return isNull(indexOf(column));
-    }
-    
-    @Override
-    public int setBeanProperties(Object bean, Collection<? extends ColumnExpr> 
ignoreList)
-    {
-        throw new NotImplementedException(this, "setBeanProperties");
-    }
-    
-    @Override
-    public int setBeanProperties(Object bean)
-    {
-        return setBeanProperties(bean, null);
-    }
-    
     /*
      * Conversion functions
      */
@@ -301,6 +292,23 @@ public class DataListEntry implements RecordData, 
Serializable
         return getDate(indexOf(column));
     }
     
+    @Override
+    public final boolean isNull(ColumnExpr column)
+    {
+        return isNull(indexOf(column));
+    }
+    
+    @Override
+    public int setBeanProperties(Object bean, Collection<? extends ColumnExpr> 
ignoreList)
+    {
+        throw new NotImplementedException(this, "setBeanProperties");
+    }
+    
+    public int setBeanProperties(Object bean)
+    {
+        return setBeanProperties(bean, null);
+    }
+    
     /*
      * Miscellaneous functions
      */
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java 
b/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
index c14ebc8..f7cb9ee 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
@@ -544,7 +544,6 @@ public abstract class DBRecordData extends DBObject
      * 
      * @return the number of bean properties set on the supplied bean
      */
-    @Override
     public final int setBeanProperties(Object bean)
     {
         return setBeanProperties(bean, null);