Author: cbrisson
Date: Mon Apr 22 09:23:56 2019
New Revision: 1857940
URL: http://svn.apache.org/viewvc?rev=1857940&view=rev
Log:
[tools/model] Review some methods access level, add an Entity.hasPrimaryKey()
method
Modified:
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/filter/ColumnMapper.java
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/AttributeHolder.java
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseEntity.java
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseModel.java
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/InstanceProducer.java
Modified:
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/filter/ColumnMapper.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/filter/ColumnMapper.java?rev=1857940&r1=1857939&r2=1857940&view=diff
==============================================================================
---
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/filter/ColumnMapper.java
(original)
+++
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/filter/ColumnMapper.java
Mon Apr 22 09:23:56 2019
@@ -62,8 +62,7 @@ public abstract class ColumnMapper<T ext
setDefaultColumnLeaf(mappingEntry.getLeaf());
}
}
-
-
+
/* needed ?
public List<MappingEntry> getColumnsMapping(String table)
{
Modified:
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/AttributeHolder.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/AttributeHolder.java?rev=1857940&r1=1857939&r2=1857940&view=diff
==============================================================================
---
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/AttributeHolder.java
(original)
+++
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/AttributeHolder.java
Mon Apr 22 09:23:56 2019
@@ -35,6 +35,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
import java.util.NavigableMap;
+import java.util.Optional;
import java.util.TreeMap;
public abstract class AttributeHolder implements Serializable
@@ -58,22 +59,26 @@ public abstract class AttributeHolder im
public ScalarAttribute getScalarAttribute(String name)
{
- return (ScalarAttribute)getAttribute(name);
+ Attribute attr = getAttribute(name);
+ return attr instanceof ScalarAttribute ? (ScalarAttribute)attr : null;
}
public RowAttribute getRowAttribute(String name)
{
- return (RowAttribute)getAttribute(name);
+ Attribute attr = getAttribute(name);
+ return attr instanceof RowAttribute ? (RowAttribute)attr : null;
}
public RowsetAttribute getRowsetAttribute(String name)
{
- return (RowsetAttribute)getAttribute(name);
+ Attribute attr = getAttribute(name);
+ return attr instanceof RowsetAttribute ? (RowsetAttribute)attr : null;
}
public Action getAction(String name)
{
- return (Action)getAttribute(name);
+ Attribute attr = getAttribute(name);
+ return attr instanceof Action ? (Action)attr : null;
}
public Serializable evaluate(String name, Serializable... params) throws
SQLException
Modified:
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseEntity.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseEntity.java?rev=1857940&r1=1857939&r2=1857940&view=diff
==============================================================================
---
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseEntity.java
(original)
+++
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseEntity.java
Mon Apr 22 09:23:56 2019
@@ -86,7 +86,12 @@ public abstract class BaseEntity extends
public List<Entity.Column> getPrimaryKey()
{
- return primaryKey;
+ return Collections.unmodifiableList(primaryKey);
+ }
+
+ public boolean hasPrimaryKey()
+ {
+ return primaryKey != null && primaryKey.size() > 0;
}
public BitSet getPrimaryKeyMask()
Modified:
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseModel.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseModel.java?rev=1857940&r1=1857939&r2=1857940&view=diff
==============================================================================
---
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseModel.java
(original)
+++
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/BaseModel.java
Mon Apr 22 09:23:56 2019
@@ -88,7 +88,7 @@ public abstract class BaseModel extends
}
else if(flatMapping instanceof Map)
{
- getIdentifiers().setMapping((Map)flatMapping);
+ getIdentifiers().setMapping((Map)flatMapping);
}
else
{
@@ -164,7 +164,7 @@ public abstract class BaseModel extends
}
}
- public NavigableMap<String, Attribute> getConfig()
+ public NavigableMap<String, Attribute> getConfiguration()
{
return new TreeMap(); // TODO
}
@@ -253,7 +253,7 @@ public abstract class BaseModel extends
return getModel();
}
- protected void readDefinition(InputSource source) throws Exception
+ protected final void readDefinition(InputSource source) throws Exception
{
if (source == null)
{
@@ -275,7 +275,7 @@ public abstract class BaseModel extends
new ConfigDigester(doc, this).process();
}
- protected void connect() throws Exception
+ protected final void connect() throws Exception
{
if (dataSource == null)
{
@@ -464,7 +464,7 @@ public abstract class BaseModel extends
entitiesMap.put(entity.getName(), entity);
}
- protected void reverseEngineer() throws SQLException
+ private void reverseEngineer() throws SQLException
{
if (connectionPool == null)
{
Modified:
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/InstanceProducer.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/InstanceProducer.java?rev=1857940&r1=1857939&r2=1857940&view=diff
==============================================================================
---
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/InstanceProducer.java
(original)
+++
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/impl/InstanceProducer.java
Mon Apr 22 09:23:56 2019
@@ -22,12 +22,12 @@ public class InstanceProducer
this(resultEntity.getModel(), resultEntity);
}
- protected Model getModel()
+ public Model getModel()
{
return model;
}
- protected Entity getResultEntity()
+ public Entity getResultEntity()
{
return resultEntity;
}
@@ -37,7 +37,7 @@ public class InstanceProducer
this.resultEntity = resultEntity;
}
- protected Instance newResultInstance()
+ public Instance newResultInstance()
{
return resultEntity == null ?
new Instance(getModel()) :
