You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2025/07/23 11:43:28 UTC
(empire-db) branch master updated: EMPIREDB-473 EntityType renamed to Entity, DBELResolver extended to ColumnExpr and ColumnExpr[]
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new ebd47b0e EMPIREDB-473 EntityType renamed to Entity, DBELResolver extended to ColumnExpr and ColumnExpr[]
ebd47b0e is described below
commit ebd47b0e520ee94c2184cc447add2d22e687294f
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Wed Jul 23 13:43:25 2025 +0200
EMPIREDB-473
EntityType renamed to Entity, DBELResolver extended to ColumnExpr and ColumnExpr[]
---
.../apache/empire/jakarta/app/DBELResolver.java | 81 +++++++++++++++-------
.../empire/jakarta/utils/TagEncodingHelper.java | 8 +--
.../org/apache/empire/jsf2/app/DBELResolver.java | 73 +++++++++++++------
.../empire/jsf2/utils/TagEncodingHelper.java | 8 +--
.../main/java/org/apache/empire/data/Column.java | 2 +-
.../empire/data/{EntityType.java => Entity.java} | 8 ++-
.../data/{EntityType.java => EntityDomain.java} | 16 ++---
.../java/org/apache/empire/data/EntityType.java | 16 ++---
.../main/java/org/apache/empire/data/Record.java | 2 +-
.../org/apache/empire/data/bean/BeanClass.java | 4 +-
.../org/apache/empire/data/bean/BeanDomain.java | 17 ++++-
.../org/apache/empire/data/bean/BeanProperty.java | 4 +-
.../apache/empire/data/bean/BeanRecordProxy.java | 10 +--
.../org/apache/empire/data/list/DataListEntry.java | 18 ++---
.../main/java/org/apache/empire/db/DBColumn.java | 4 +-
.../main/java/org/apache/empire/db/DBReader.java | 18 ++---
.../java/org/apache/empire/db/DBRecordBase.java | 4 +-
.../main/java/org/apache/empire/db/DBRowSet.java | 14 +++-
.../db/exceptions/NoPrimaryKeyException.java | 6 +-
.../empire/db/exceptions/RecordException.java | 22 +++---
.../db/exceptions/RecordReadOnlyException.java | 2 +-
21 files changed, 213 insertions(+), 124 deletions(-)
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java
index 0e056548..7425e6d2 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java
@@ -22,19 +22,21 @@ import java.beans.FeatureDescriptor;
import java.lang.reflect.Field;
import java.util.Iterator;
-import jakarta.el.ELContext;
-import jakarta.el.ELResolver;
-import jakarta.faces.context.FacesContext;
-
import org.apache.empire.commons.StringUtils;
+import org.apache.empire.data.ColumnExpr;
+import org.apache.empire.data.Entity;
+import org.apache.empire.data.EntityDomain;
import org.apache.empire.data.RecordData;
-import org.apache.empire.db.DBColumnExpr;
import org.apache.empire.db.DBDatabase;
import org.apache.empire.db.DBRowSet;
import org.apache.empire.exceptions.NotSupportedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.faces.context.FacesContext;
+
public class DBELResolver extends ELResolver
{
private static final Logger log = LoggerFactory.getLogger(DBELResolver.class);
@@ -50,7 +52,9 @@ public class DBELResolver extends ELResolver
@Override
public Class<?> getType(ELContext context, Object base, Object property)
{
- if ((base instanceof DBRowSet) ||
+ if ((base instanceof Entity) ||
+ (base instanceof EntityDomain) ||
+ (base instanceof RecordData) ||
(base instanceof DBDatabase) ||
(base==null && property.equals("db")))
log.warn("DBELResolver:getType is not implemented!");
@@ -68,22 +72,41 @@ public class DBELResolver extends ELResolver
public Object getValue(ELContext context, Object base, Object property)
{
// Resolve database, table/view or column
- if (base instanceof DBRowSet)
+ if (base instanceof Entity)
{ // Find matching column
String name = StringUtils.toString(property);
- DBColumnExpr column = ((DBRowSet)base).getColumn(name);
- if (column==null)
- column = findExpressionField(base, name);
- if (column!=null)
+ ColumnExpr column = ((Entity)base).getColumn(name);
+ if (column!=null) {
context.setPropertyResolved(true);
- else
- log.error("ELResolver error: Column '{}' cannot be resolved for table/view '{}'.", name.toUpperCase(), ((DBRowSet)base).getName());
- // done
- return column;
+ return column;
+ }
+ // Find property value
+ Object propValue = getPropertyValue(base, name);
+ if (propValue==null)
+ { // Not found
+ String entityName = (base instanceof DBRowSet) ? ((DBRowSet)base).getName() : base.getClass().getSimpleName();
+ log.error("ELResolver error: Column '{}' cannot be resolved for entity/table/view '{}'.", name.toUpperCase(), entityName);
+ return null;
+ }
+ // check for ColumnExpr
+ if (propValue instanceof ColumnExpr)
+ { // found
+ context.setPropertyResolved(true);
+ return propValue;
+ }
+ // check for ColumnExpr[]
+ if (propValue instanceof ColumnExpr[])
+ { // found an array
+ context.setPropertyResolved(true);
+ return propValue;
+ }
+ // Unknown Type
+ log.error("ELResolver error: Field '{}.{}' is not a ColumnExpr.", base.getClass().getSimpleName(), property);
+ return null;
}
else if (base instanceof DBDatabase)
{ // Lookup RowSet
- String name = StringUtils.toString(property);
+ String name = StringUtils.toString(property);
DBRowSet rset = ((DBDatabase)base).getRowSet(name);
if (rset==null)
rset = ((DBDatabase)base).getRowSetByAlias(name); // 2nd chance
@@ -94,6 +117,17 @@ public class DBELResolver extends ELResolver
// done
return rset;
}
+ else if (base instanceof EntityDomain)
+ { // Lookup EntityType
+ String name = StringUtils.toString(property);
+ Entity entity = ((EntityDomain)base).getEntity(name);
+ if (entity!=null)
+ context.setPropertyResolved(true);
+ else
+ log.error("ELResolver error: Entity '{}' cannot be resolved.", name.toUpperCase());
+ // done
+ return entity;
+ }
else if (base instanceof RecordData)
{ // Lookup RowSet
String field= StringUtils.toString(property);
@@ -124,7 +158,10 @@ public class DBELResolver extends ELResolver
return null;
}
- public static DBColumnExpr findExpressionField(Object rowset, String property)
+ /**
+ * Simply return the value of the field
+ */
+ protected Object getPropertyValue(Object rowset, String property)
{
Class<?> c = rowset.getClass();
try
@@ -138,12 +175,7 @@ public class DBELResolver extends ELResolver
log.error("ELResolver error: Field '{}.{}' is null.", c.getSimpleName(), property);
return null;
}
- if (!(v instanceof DBColumnExpr))
- { // invalid data type
- log.error("ELResolver error: Field '{}.{}' is not a DBColumnExpr.", c.getSimpleName(), property);
- return null;
- }
- return ((DBColumnExpr)v);
+ return v;
}
catch (SecurityException e)
{
@@ -170,7 +202,8 @@ public class DBELResolver extends ELResolver
public boolean isReadOnly(ELContext context, Object base, Object property)
{
// is it our's?
- if ((base instanceof DBRowSet) ||
+ if ((base instanceof Entity) ||
+ (base instanceof EntityDomain) ||
(base instanceof DBDatabase) ||
(base==null && property.equals("db")))
{ // read only
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
index 9da45a45..fa010462 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
@@ -38,7 +38,7 @@ import org.apache.empire.commons.Unwrappable;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
import org.apache.empire.data.DataType;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.data.Record;
import org.apache.empire.data.RecordData;
import org.apache.empire.db.DBDatabase;
@@ -126,10 +126,10 @@ public class TagEncodingHelper implements NamingContainer
}
@Override
- public EntityType getEntityType()
+ public Entity getEntity()
{
Column column = getUpdateColumn();
- return (column!=null ? column.getEntityType() : null);
+ return (column!=null ? column.getEntity() : null);
}
@Override
@@ -695,7 +695,7 @@ public class TagEncodingHelper implements NamingContainer
if (column==null)
return StringUtils.NULL;
// Find Entity
- EntityType entity = column.getEntityType();
+ Entity entity = column.getEntity();
if (entity!=null)
return StringUtils.concat(entity.getEntityName(), "_", column.getName());
// No Entity
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
index c341810f..62a5925a 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
@@ -27,8 +27,10 @@ import javax.el.ELResolver;
import javax.faces.context.FacesContext;
import org.apache.empire.commons.StringUtils;
+import org.apache.empire.data.ColumnExpr;
+import org.apache.empire.data.Entity;
+import org.apache.empire.data.EntityDomain;
import org.apache.empire.data.RecordData;
-import org.apache.empire.db.DBColumnExpr;
import org.apache.empire.db.DBDatabase;
import org.apache.empire.db.DBRowSet;
import org.apache.empire.exceptions.NotSupportedException;
@@ -50,7 +52,9 @@ public class DBELResolver extends ELResolver
@Override
public Class<?> getType(ELContext context, Object base, Object property)
{
- if ((base instanceof DBRowSet) ||
+ if ((base instanceof Entity) ||
+ (base instanceof EntityDomain) ||
+ (base instanceof RecordData) ||
(base instanceof DBDatabase) ||
(base==null && property.equals("db")))
log.warn("DBELResolver:getType is not implemented!");
@@ -68,22 +72,41 @@ public class DBELResolver extends ELResolver
public Object getValue(ELContext context, Object base, Object property)
{
// Resolve database, table/view or column
- if (base instanceof DBRowSet)
+ if (base instanceof Entity)
{ // Find matching column
String name = StringUtils.toString(property);
- DBColumnExpr column = ((DBRowSet)base).getColumn(name);
- if (column==null)
- column = findExpressionField(base, name);
- if (column!=null)
+ ColumnExpr column = ((Entity)base).getColumn(name);
+ if (column!=null) {
context.setPropertyResolved(true);
- else
- log.error("ELResolver error: Column '{}' cannot be resolved for table/view '{}'.", name.toUpperCase(), ((DBRowSet)base).getName());
- // done
- return column;
+ return column;
+ }
+ // Find property value
+ Object propValue = getPropertyValue(base, name);
+ if (propValue==null)
+ { // Not found
+ String entityName = (base instanceof DBRowSet) ? ((DBRowSet)base).getName() : base.getClass().getSimpleName();
+ log.error("ELResolver error: Column '{}' cannot be resolved for entity/table/view '{}'.", name.toUpperCase(), entityName);
+ return null;
+ }
+ // check for ColumnExpr
+ if (propValue instanceof ColumnExpr)
+ { // found
+ context.setPropertyResolved(true);
+ return propValue;
+ }
+ // check for ColumnExpr[]
+ if (propValue instanceof ColumnExpr[])
+ { // found an array
+ context.setPropertyResolved(true);
+ return propValue;
+ }
+ // Unknown Type
+ log.error("ELResolver error: Field '{}.{}' is not a ColumnExpr.", base.getClass().getSimpleName(), property);
+ return null;
}
else if (base instanceof DBDatabase)
{ // Lookup RowSet
- String name = StringUtils.toString(property);
+ String name = StringUtils.toString(property);
DBRowSet rset = ((DBDatabase)base).getRowSet(name);
if (rset==null)
rset = ((DBDatabase)base).getRowSetByAlias(name); // 2nd chance
@@ -94,6 +117,17 @@ public class DBELResolver extends ELResolver
// done
return rset;
}
+ else if (base instanceof EntityDomain)
+ { // Lookup EntityType
+ String name = StringUtils.toString(property);
+ Entity entity = ((EntityDomain)base).getEntity(name);
+ if (entity!=null)
+ context.setPropertyResolved(true);
+ else
+ log.error("ELResolver error: Entity '{}' cannot be resolved.", name.toUpperCase());
+ // done
+ return entity;
+ }
else if (base instanceof RecordData)
{ // Lookup RowSet
String field= StringUtils.toString(property);
@@ -124,7 +158,10 @@ public class DBELResolver extends ELResolver
return null;
}
- public static DBColumnExpr findExpressionField(Object rowset, String property)
+ /**
+ * Simply return the value of the field
+ */
+ protected Object getPropertyValue(Object rowset, String property)
{
Class<?> c = rowset.getClass();
try
@@ -138,12 +175,7 @@ public class DBELResolver extends ELResolver
log.error("ELResolver error: Field '{}.{}' is null.", c.getSimpleName(), property);
return null;
}
- if (!(v instanceof DBColumnExpr))
- { // invalid data type
- log.error("ELResolver error: Field '{}.{}' is not a DBColumnExpr.", c.getSimpleName(), property);
- return null;
- }
- return ((DBColumnExpr)v);
+ return v;
}
catch (SecurityException e)
{
@@ -170,7 +202,8 @@ public class DBELResolver extends ELResolver
public boolean isReadOnly(ELContext context, Object base, Object property)
{
// is it our's?
- if ((base instanceof DBRowSet) ||
+ if ((base instanceof Entity) ||
+ (base instanceof EntityDomain) ||
(base instanceof DBDatabase) ||
(base==null && property.equals("db")))
{ // read only
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index 5a0d1d43..05e0c778 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -51,7 +51,7 @@ import org.apache.empire.commons.Unwrappable;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
import org.apache.empire.data.DataType;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.data.Record;
import org.apache.empire.data.RecordData;
import org.apache.empire.db.DBDatabase;
@@ -126,10 +126,10 @@ public class TagEncodingHelper implements NamingContainer
}
@Override
- public EntityType getEntityType()
+ public Entity getEntity()
{
Column column = getUpdateColumn();
- return (column!=null ? column.getEntityType() : null);
+ return (column!=null ? column.getEntity() : null);
}
@Override
@@ -695,7 +695,7 @@ public class TagEncodingHelper implements NamingContainer
if (column==null)
return StringUtils.NULL;
// Find Entity
- EntityType entity = column.getEntityType();
+ Entity entity = column.getEntity();
if (entity!=null)
return StringUtils.concat(entity.getEntityName(), "_", column.getName());
// No Entity
diff --git a/empire-db/src/main/java/org/apache/empire/data/Column.java b/empire-db/src/main/java/org/apache/empire/data/Column.java
index 625f8920..495b3725 100644
--- a/empire-db/src/main/java/org/apache/empire/data/Column.java
+++ b/empire-db/src/main/java/org/apache/empire/data/Column.java
@@ -56,7 +56,7 @@ public interface Column extends ColumnExpr
* Returns the EntityType that this Column belongs to
* @return the EntityType if any
*/
- EntityType getEntityType();
+ Entity getEntity();
/**
* Returns the maximum size a value for this column is allowed to have.
diff --git a/empire-db/src/main/java/org/apache/empire/data/EntityType.java b/empire-db/src/main/java/org/apache/empire/data/Entity.java
similarity index 88%
copy from empire-db/src/main/java/org/apache/empire/data/EntityType.java
copy to empire-db/src/main/java/org/apache/empire/data/Entity.java
index 5a165244..79f003cc 100644
--- a/empire-db/src/main/java/org/apache/empire/data/EntityType.java
+++ b/empire-db/src/main/java/org/apache/empire/data/Entity.java
@@ -20,11 +20,17 @@ package org.apache.empire.data;
import java.util.List;
-public interface EntityType
+/**
+ * EntityType
+ * Defines an entity such as a table or view
+ */
+public interface Entity
{
String getEntityName();
List<? extends Column> getColumns();
+
+ Column getColumn(String name);
Column[] getKeyColumns();
diff --git a/empire-db/src/main/java/org/apache/empire/data/EntityType.java b/empire-db/src/main/java/org/apache/empire/data/EntityDomain.java
similarity index 81%
copy from empire-db/src/main/java/org/apache/empire/data/EntityType.java
copy to empire-db/src/main/java/org/apache/empire/data/EntityDomain.java
index 5a165244..76b65bd8 100644
--- a/empire-db/src/main/java/org/apache/empire/data/EntityType.java
+++ b/empire-db/src/main/java/org/apache/empire/data/EntityDomain.java
@@ -18,15 +18,11 @@
*/
package org.apache.empire.data;
-import java.util.List;
-
-public interface EntityType
+/**
+ * EntityDomain
+ * Holder for Entity objects
+ */
+public interface EntityDomain
{
- String getEntityName();
-
- List<? extends Column> getColumns();
-
- Column[] getKeyColumns();
-
- Class<?> getBeanType();
+ Entity getEntity(String name);
}
diff --git a/empire-db/src/main/java/org/apache/empire/data/EntityType.java b/empire-db/src/main/java/org/apache/empire/data/EntityType.java
index 5a165244..d2d7f2d1 100644
--- a/empire-db/src/main/java/org/apache/empire/data/EntityType.java
+++ b/empire-db/src/main/java/org/apache/empire/data/EntityType.java
@@ -18,15 +18,13 @@
*/
package org.apache.empire.data;
-import java.util.List;
-
-public interface EntityType
+/**
+ * EntityType has been renamed to just "Entity"
+ * Provided for backward compatibility only
+ * Will be removed in future versions!
+ */
+@Deprecated
+public interface EntityType extends Entity
{
- String getEntityName();
- List<? extends Column> getColumns();
-
- Column[] getKeyColumns();
-
- Class<?> getBeanType();
}
diff --git a/empire-db/src/main/java/org/apache/empire/data/Record.java b/empire-db/src/main/java/org/apache/empire/data/Record.java
index 1e6f7abe..c2cc24bf 100644
--- a/empire-db/src/main/java/org/apache/empire/data/Record.java
+++ b/empire-db/src/main/java/org/apache/empire/data/Record.java
@@ -106,7 +106,7 @@ public interface Record extends RecordData
* Returns the entity this Record belongs to
* @return the entity
*/
- EntityType getEntityType();
+ Entity getEntity();
/**
* returns true if the field is visible to the client.
diff --git a/empire-db/src/main/java/org/apache/empire/data/bean/BeanClass.java b/empire-db/src/main/java/org/apache/empire/data/bean/BeanClass.java
index df7ff20b..4bdbc60e 100644
--- a/empire-db/src/main/java/org/apache/empire/data/bean/BeanClass.java
+++ b/empire-db/src/main/java/org/apache/empire/data/bean/BeanClass.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.empire.data.Column;
import org.apache.empire.data.DataType;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
/**
* BeanObject
@@ -33,7 +33,7 @@ import org.apache.empire.data.EntityType;
* A metadata definition consists primarily of the class name and a list of properties.
* @author Rainer
*/
-public abstract class BeanClass implements EntityType
+public abstract class BeanClass implements Entity
{
private final String name;
private final List<BeanProperty> properties = new ArrayList<BeanProperty>();
diff --git a/empire-db/src/main/java/org/apache/empire/data/bean/BeanDomain.java b/empire-db/src/main/java/org/apache/empire/data/bean/BeanDomain.java
index a3964b1f..a1f439eb 100644
--- a/empire-db/src/main/java/org/apache/empire/data/bean/BeanDomain.java
+++ b/empire-db/src/main/java/org/apache/empire/data/bean/BeanDomain.java
@@ -22,6 +22,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.empire.commons.StringUtils;
+import org.apache.empire.data.EntityDomain;
+
/**
* BeanDomain
* This class defines Metadata for a domain of java classes.
@@ -30,7 +33,7 @@ import java.util.List;
* A metadata definition consists primarily of the domain name and a list of classes.
* @author Rainer
*/
-public abstract class BeanDomain
+public abstract class BeanDomain implements EntityDomain
{
private final String name;
private final List<BeanClass> classes = new ArrayList<BeanClass>();
@@ -39,7 +42,7 @@ public abstract class BeanDomain
{
this.name = name;
}
-
+
protected void addClass(BeanClass beanClass)
{
classes.add(beanClass);
@@ -56,4 +59,14 @@ public abstract class BeanDomain
return Collections.unmodifiableList(this.classes);
}
+ @Override
+ public BeanClass getEntity(String name)
+ {
+ for (BeanClass bc : classes)
+ if (StringUtils.compareEqual(name, bc.getEntityName()))
+ return bc; // found
+ // not found
+ return null;
+ }
+
}
diff --git a/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java b/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java
index e483930f..1b49f2ba 100644
--- a/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java
+++ b/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java
@@ -26,7 +26,7 @@ import org.apache.empire.commons.ObjectUtils;
import org.apache.empire.commons.Options;
import org.apache.empire.data.Column;
import org.apache.empire.data.DataType;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.db.exceptions.FieldNotNullException;
/**
@@ -96,7 +96,7 @@ public class BeanProperty implements Column
}
@Override
- public EntityType getEntityType()
+ public Entity getEntity()
{
return beanClass;
}
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 8b3a204f..8cac1a7f 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
@@ -26,7 +26,7 @@ import org.apache.empire.commons.ObjectUtils;
import org.apache.empire.commons.Options;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.data.Record;
import org.apache.empire.exceptions.InvalidArgumentException;
import org.apache.empire.exceptions.ItemNotFoundException;
@@ -47,14 +47,14 @@ public class BeanRecordProxy<T> implements Record
{
protected static final Logger log = LoggerFactory.getLogger(BeanRecordProxy.class);
- protected final EntityType entity;
+ protected final Entity entity;
protected final List<Column> columns;
protected final Column[] keyColumns;
protected T data;
protected boolean[] modified;
- public BeanRecordProxy(T data, List<Column> columns, Column[] keyColumns, EntityType entity)
+ public BeanRecordProxy(T data, List<Column> columns, Column[] keyColumns, Entity entity)
{
this.data = data;
this.columns = columns;
@@ -62,7 +62,7 @@ public class BeanRecordProxy<T> implements Record
this.entity = entity;
}
- public BeanRecordProxy(List<Column> columns, Column[] keyColumns, EntityType entity)
+ public BeanRecordProxy(List<Column> columns, Column[] keyColumns, Entity entity)
{
this(null, columns, keyColumns, entity);
}
@@ -203,7 +203,7 @@ public class BeanRecordProxy<T> implements Record
}
@Override
- public EntityType getEntityType()
+ public Entity getEntity()
{
return this.entity;
}
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 29d12ad3..b11beb65 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
@@ -30,7 +30,7 @@ import org.apache.empire.commons.BeanPropertyUtils;
import org.apache.empire.commons.ObjectUtils;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.data.RecordData;
import org.apache.empire.db.DBRecordBase;
import org.apache.empire.db.exceptions.NoPrimaryKeyException;
@@ -73,14 +73,14 @@ public class DataListEntry implements RecordData, Serializable
/**
* Returns the record key for a type of entity
- * @param entityType the entity type or rowset for which to get key
+ * @param entity the entity type or rowset for which to get key
* @return the record key
*/
- public Object[] getRecordKey(EntityType entityType)
+ public Object[] getRecordKey(Entity entity)
{
- Column[] keyColumns = entityType.getKeyColumns();
+ Column[] keyColumns = entity.getKeyColumns();
if (keyColumns==null || keyColumns.length==0)
- throw new NoPrimaryKeyException(entityType);
+ throw new NoPrimaryKeyException(entity);
// Collect key
Object[] key = new Object[keyColumns.length];
for (int i=0; i<key.length; i++)
@@ -90,15 +90,15 @@ public class DataListEntry implements RecordData, Serializable
/**
* Returns the record id for a type of entity which has a single numeric primary key
- * @param entityType the entity type or rowset for which to get key
+ * @param entity the entity type or rowset for which to get key
* @return the record id
* @throws InvalidArgumentException if the entity has not a single numeric primary key
*/
- public long getRecordId(EntityType entityType)
+ public long getRecordId(Entity entity)
{
- Column[] keyColumns = entityType.getKeyColumns();
+ Column[] keyColumns = entity.getKeyColumns();
if (keyColumns==null || keyColumns.length!=1)
- throw new InvalidArgumentException("entityType", entityType.getEntityName());
+ throw new InvalidArgumentException("entity", entity.getEntityName());
// return id
return ObjectUtils.getLong(get(keyColumns[0]));
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
index 23e870c7..390aa4db 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
@@ -26,7 +26,7 @@ import org.apache.empire.commons.Options;
import org.apache.empire.commons.StringUtils;
import org.apache.empire.data.Column;
import org.apache.empire.data.DataType;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.db.exceptions.DatabaseNotOpenException;
import org.apache.empire.db.expr.column.DBAliasExpr;
import org.apache.empire.db.expr.column.DBValueExpr;
@@ -284,7 +284,7 @@ public abstract class DBColumn extends DBColumnExpr
* Same as getRowSet()
*/
@Override
- public EntityType getEntityType()
+ public Entity getEntity()
{
return rowset;
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBReader.java b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
index cef1a4ba..2be14c44 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBReader.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
@@ -34,7 +34,7 @@ import org.apache.empire.commons.ObjectUtils;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
import org.apache.empire.data.DataType;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.db.exceptions.EmpireSQLException;
import org.apache.empire.db.exceptions.NoPrimaryKeyException;
import org.apache.empire.db.exceptions.QueryNoResultException;
@@ -415,14 +415,14 @@ public class DBReader extends DBRecordData implements Closeable
/**
* Returns the record key for a type of entity
- * @param entityType the entity type or rowset for which to get key
+ * @param entity the entity type or rowset for which to get key
* @return the record key
*/
- public Object[] getRecordKey(EntityType entityType)
+ public Object[] getRecordKey(Entity entity)
{
- Column[] keyColumns = entityType.getKeyColumns();
+ Column[] keyColumns = entity.getKeyColumns();
if (keyColumns==null || keyColumns.length==0)
- throw new NoPrimaryKeyException(entityType);
+ throw new NoPrimaryKeyException(entity);
// Collect key
Object[] key = new Object[keyColumns.length];
for (int i=0; i<key.length; i++)
@@ -432,15 +432,15 @@ public class DBReader extends DBRecordData implements Closeable
/**
* Returns the record id for a type of entity which has a single numeric primary key
- * @param entityType the entity type or rowset for which to get key
+ * @param entity the entity type or rowset for which to get key
* @return the record id
* @throws InvalidArgumentException if the entity has not a single numeric primary key
*/
- public long getRecordId(EntityType entityType)
+ public long getRecordId(Entity entity)
{
- Column[] keyColumns = entityType.getKeyColumns();
+ Column[] keyColumns = entity.getKeyColumns();
if (keyColumns==null || keyColumns.length!=1)
- throw new InvalidArgumentException("entityType", entityType.getEntityName());
+ throw new InvalidArgumentException("entity", entity.getEntityName());
// return id
return this.getLong(keyColumns[0]);
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java b/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
index 218607f5..b772c327 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
@@ -32,7 +32,7 @@ import org.apache.empire.commons.Options;
import org.apache.empire.commons.StringUtils;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.data.Record;
import org.apache.empire.db.context.DBRollbackHandler;
import org.apache.empire.db.exceptions.FieldReadOnlyException;
@@ -288,7 +288,7 @@ public abstract class DBRecordBase extends DBRecordData implements Record, Clone
* @return true if this record is a new record
*/
@Override
- public EntityType getEntityType()
+ public Entity getEntity()
{
return getRowSet();
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java b/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
index 6e23adb6..e5d479aa 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
@@ -35,7 +35,7 @@ import org.apache.empire.commons.StringUtils;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
import org.apache.empire.data.DataType;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.data.Record;
import org.apache.empire.db.DBRelation.DBCascadeAction;
import org.apache.empire.db.DBRelation.DBReference;
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
* DBView and DBQuery classes this class contains all the columns of the
* tables, views or queries
*/
-public abstract class DBRowSet extends DBExpr implements EntityType
+public abstract class DBRowSet extends DBExpr implements Entity
{
// *Deprecated* private static final long serialVersionUID = 1L;
@@ -436,6 +436,15 @@ public abstract class DBRowSet extends DBExpr implements EntityType
{
return db;
}
+
+ /**
+ * Returns the number of columns in this rowset
+ * @return the column count
+ */
+ public int getColumnCount()
+ {
+ return columns.size();
+ }
/**
* Returns a list of all columns of this rowset (e.g. for cmd.select()).
@@ -502,6 +511,7 @@ public abstract class DBRowSet extends DBExpr implements EntityType
* @param name the name of the column to look for
* @return the column Expression at position
*/
+ @Override
public DBColumn getColumn(String name)
{
for (int i = 0; i < columns.size(); i++)
diff --git a/empire-db/src/main/java/org/apache/empire/db/exceptions/NoPrimaryKeyException.java b/empire-db/src/main/java/org/apache/empire/db/exceptions/NoPrimaryKeyException.java
index 6e2277a5..bf42b984 100644
--- a/empire-db/src/main/java/org/apache/empire/db/exceptions/NoPrimaryKeyException.java
+++ b/empire-db/src/main/java/org/apache/empire/db/exceptions/NoPrimaryKeyException.java
@@ -20,7 +20,7 @@ package org.apache.empire.db.exceptions;
import org.apache.empire.commons.ErrorType;
import org.apache.empire.commons.StringUtils;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.db.DBRowSet;
import org.apache.empire.exceptions.EmpireException;
@@ -35,8 +35,8 @@ public class NoPrimaryKeyException extends EmpireException
super(errorType, new String[] { StringUtils.coalesce(rowset.getName(), rowset.getAlias()) });
}
- public NoPrimaryKeyException(EntityType entityType)
+ public NoPrimaryKeyException(Entity entity)
{
- super(errorType, new String[] { entityType.getEntityName() });
+ super(errorType, new String[] { entity.getEntityName() });
}
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordException.java b/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordException.java
index c4bc419b..27ab88c3 100644
--- a/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordException.java
+++ b/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordException.java
@@ -21,7 +21,7 @@ package org.apache.empire.db.exceptions;
import org.apache.empire.commons.ErrorType;
import org.apache.empire.commons.ObjectUtils;
import org.apache.empire.commons.StringUtils;
-import org.apache.empire.data.EntityType;
+import org.apache.empire.data.Entity;
import org.apache.empire.data.Record;
import org.apache.empire.db.DBRowSet;
import org.apache.empire.exceptions.EmpireException;
@@ -43,10 +43,10 @@ public abstract class RecordException extends EmpireException
}
}
- protected static EntityType getEntityType(Record record)
+ protected static Entity getEntity(Record record)
{
try {
- return record.getEntityType();
+ return record.getEntity();
} catch(Exception e) {
return null;
}
@@ -57,7 +57,7 @@ public abstract class RecordException extends EmpireException
return (key!=null ? StringUtils.arrayToString(key, StringUtils.LIST_TEMPLATE) : "[]");
}
- protected static String entityName(EntityType entity)
+ protected static String entityName(Entity entity)
{
return (entity!=null ? entity.getEntityName() : "{Null}");
}
@@ -67,30 +67,30 @@ public abstract class RecordException extends EmpireException
return (rowset!=null ? StringUtils.coalesce(rowset.getName(), rowset.getAlias()) : "{Null}");
}
- private transient final EntityType entityType;
+ private transient final Entity entity;
private transient final Object[] key;
- public RecordException(EntityType entityType, Object[] key, final ErrorType errType, final String[] params, final Throwable cause)
+ public RecordException(Entity entity, Object[] key, final ErrorType errType, final String[] params, final Throwable cause)
{
super(errType, params, cause);
// save type and params for custom message formatting
- this.entityType = entityType;
+ this.entity = entity;
this.key = key;
}
- public RecordException(EntityType entity, Object[] key, final ErrorType errType, final String[] params)
+ public RecordException(Entity entity, Object[] key, final ErrorType errType, final String[] params)
{
this(entity, key, errType, params, null);
}
public RecordException(final Record record, final ErrorType errType, final String[] params)
{
- this(getEntityType(record), getKey(record), errType, params, null);
+ this(getEntity(record), getKey(record), errType, params, null);
}
- public EntityType getEntityType()
+ public Entity getEntity()
{
- return entityType;
+ return entity;
}
public Object[] getKey()
diff --git a/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordReadOnlyException.java b/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordReadOnlyException.java
index eb345f48..6c27652d 100644
--- a/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordReadOnlyException.java
+++ b/empire-db/src/main/java/org/apache/empire/db/exceptions/RecordReadOnlyException.java
@@ -29,6 +29,6 @@ public class RecordReadOnlyException extends RecordException
public RecordReadOnlyException(DBRecordBase record)
{
- super(record, errorType, new String[] { keyToString(getKey(record)), entityName(getEntityType(record)) });
+ super(record, errorType, new String[] { keyToString(getKey(record)), entityName(getEntity(record)) });
}
}