You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/05/03 08:52:55 UTC
svn commit: r1098941 [6/8] - in
/incubator/isis/trunk/runtimes/dflt/objectstores:
nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/
nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/file/
nosql/src/main/java/org/a...
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java Tue May 3 06:52:51 2011
@@ -21,8 +21,6 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.Vector;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -46,357 +44,335 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistorUtil;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByPattern;
+import org.apache.log4j.Logger;
+
+public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, DebuggableWithTitle {
+ private static final Logger LOG = Logger.getLogger(AutoMapper.class);
+ private static final int MAX_INSTANCES = 100;
+ private final IdMapping idMapping;
+ private final VersionMapping versionMapping;
+ private final TitleMapping titleMapping;
+
+ public AutoMapper(final String className, final String parameterBase, final FieldMappingLookup lookup,
+ final ObjectMappingLookup objectMapperLookup) {
+ super(className, parameterBase, lookup, objectMapperLookup);
+ idMapping = lookup.createIdMapping();
+ versionMapping = lookup.createVersionMapping();
+ titleMapping = lookup.createTitleMapping();
+ }
+
+ @Override
+ public void createObject(final DatabaseConnector connector, final ObjectAdapter object) {
+ final int versionSequence = 1;
+ final SerialNumberVersion version = createVersion(versionSequence);
+
+ final StringBuffer sql = new StringBuffer();
+ sql.append("insert into " + table + " (");
+ idMapping.appendColumnNames(sql);
+ sql.append(", ");
+ final String columnList = columnList();
+ if (columnList.length() > 0) {
+ sql.append(columnList);
+ sql.append(", ");
+ }
+ titleMapping.appendColumnNames(sql);
+ sql.append(", ");
+ sql.append(versionMapping.insertColumns());
+ sql.append(") values (");
+ idMapping.appendInsertValues(connector, sql, object);
+ sql.append(", ");
+ sql.append(values(connector, object));
+ titleMapping.appendInsertValues(connector, sql, object);
+ sql.append(", ");
+ sql.append(versionMapping.insertValues(connector, version));
+ sql.append(") ");
+
+ connector.insert(sql.toString());
+ object.setOptimisticLock(version);
+
+ for (final CollectionMapper collectionMapper : collectionMappers) {
+ collectionMapper.saveInternalCollection(connector, object);
+ }
+ }
+
+ @Override
+ public void createTables(final DatabaseConnector connection) {
+ if (!connection.hasTable(table)) {
+ final StringBuffer sql = new StringBuffer();
+ sql.append("create table ");
+ sql.append(table);
+ sql.append(" (");
+ idMapping.appendCreateColumnDefinitions(sql);
+ sql.append(", ");
+ for (final FieldMapping mapping : fieldMappings) {
+ mapping.appendColumnDefinitions(sql);
+ sql.append(",");
+ }
+ titleMapping.appendColumnDefinitions(sql);
+ sql.append(", ");
+ sql.append(versionMapping.appendColumnDefinitions());
+ sql.append(")");
+ connection.update(sql.toString());
+ }
+ for (int i = 0; collectionMappers != null && i < collectionMappers.length; i++) {
+ if (collectionMappers[i].needsTables(connection)) {
+ collectionMappers[i].createTables(connection);
+ }
+ }
+ }
-public class AutoMapper extends AbstractAutoMapper implements ObjectMapping,
- DebuggableWithTitle {
- private static final Logger LOG = Logger.getLogger(AutoMapper.class);
- private static final int MAX_INSTANCES = 100;
- private final IdMapping idMapping;
- private final VersionMapping versionMapping;
- private final TitleMapping titleMapping;
-
- public AutoMapper(final String className, final String parameterBase,
- FieldMappingLookup lookup, ObjectMappingLookup objectMapperLookup) {
- super(className, parameterBase, lookup, objectMapperLookup);
- idMapping = lookup.createIdMapping();
- versionMapping = lookup.createVersionMapping();
- titleMapping = lookup.createTitleMapping();
- }
-
- @Override
- public void createObject(final DatabaseConnector connector,
- final ObjectAdapter object) {
- int versionSequence = 1;
- SerialNumberVersion version = createVersion(versionSequence);
-
- StringBuffer sql = new StringBuffer();
- sql.append("insert into " + table + " (");
- idMapping.appendColumnNames(sql);
- sql.append(", ");
- String columnList = columnList();
- if (columnList.length() > 0){
- sql.append(columnList);
- sql.append(", ");
- }
- titleMapping.appendColumnNames(sql);
- sql.append(", ");
- sql.append(versionMapping.insertColumns());
- sql.append(") values (");
- idMapping.appendInsertValues(connector, sql, object);
- sql.append(", ");
- sql.append(values(connector, object));
- titleMapping.appendInsertValues(connector, sql, object);
- sql.append(", ");
- sql.append(versionMapping.insertValues(connector, version));
- sql.append(") ");
-
- connector.insert(sql.toString());
- object.setOptimisticLock(version);
-
- for (int i = 0; i < collectionMappers.length; i++) {
- collectionMappers[i].saveInternalCollection(connector, object);
- }
- }
-
- @Override
- public void createTables(final DatabaseConnector connection) {
- if (!connection.hasTable(table)) {
- StringBuffer sql = new StringBuffer();
- sql.append("create table ");
- sql.append(table);
- sql.append(" (");
- idMapping.appendCreateColumnDefinitions(sql);
- sql.append(", ");
- for (FieldMapping mapping : fieldMappings) {
- mapping.appendColumnDefinitions(sql);
- sql.append(",");
- }
- titleMapping.appendColumnDefinitions(sql);
- sql.append(", ");
- sql.append(versionMapping.appendColumnDefinitions());
- sql.append(")");
- connection.update(sql.toString());
- }
- for (int i = 0; collectionMappers != null
- && i < collectionMappers.length; i++) {
- if (collectionMappers[i].needsTables(connection)) {
- collectionMappers[i].createTables(connection);
- }
- }
- }
-
- @Override
- public void destroyObject(final DatabaseConnector connector,
- final ObjectAdapter object) {
- StringBuffer sql = new StringBuffer();
+ @Override
+ public void destroyObject(final DatabaseConnector connector, final ObjectAdapter object) {
+ final StringBuffer sql = new StringBuffer();
sql.append("delete from " + table + " WHERE ");
- idMapping.appendWhereClause(connector, sql, object.getOid());
+ idMapping.appendWhereClause(connector, sql, object.getOid());
sql.append(" AND ");
- sql.append(versionMapping.whereClause(connector, (SerialNumberVersion) object
- .getVersion()));
- int updateCount = connector.update(sql.toString());
- if (updateCount == 0) {
- LOG.info("concurrency conflict object " + this
- + "; no deletion performed");
- throw new ConcurrencyException("", object.getOid());
- }
- }
-
- @Override
- public ObjectAdapter[] getInstances(final DatabaseConnector connector,
- final ObjectSpecification spec) {
- StringBuffer sql = createSelectStatement();
- return loadInstances(connector, spec, completeSelectStatement(sql));
- }
-
- @Override
- public ObjectAdapter[] getInstances(final DatabaseConnector connector,
- final ObjectSpecification spec,
- final PersistenceQueryFindByPattern query) {
- StringBuffer sql = createSelectStatement();
+ sql.append(versionMapping.whereClause(connector, (SerialNumberVersion) object.getVersion()));
+ final int updateCount = connector.update(sql.toString());
+ if (updateCount == 0) {
+ LOG.info("concurrency conflict object " + this + "; no deletion performed");
+ throw new ConcurrencyException("", object.getOid());
+ }
+ }
+
+ @Override
+ public ObjectAdapter[] getInstances(final DatabaseConnector connector, final ObjectSpecification spec) {
+ final StringBuffer sql = createSelectStatement();
+ return loadInstances(connector, spec, completeSelectStatement(sql));
+ }
+
+ @Override
+ public ObjectAdapter[] getInstances(final DatabaseConnector connector, final ObjectSpecification spec,
+ final PersistenceQueryFindByPattern query) {
+ final StringBuffer sql = createSelectStatement();
sql.append(" WHERE ");
- int initialLength = sql.length();
- ObjectAdapter pattern = query.getPattern();
- for (ObjectAssociation assoc : specification.getAssociations()) {
- ObjectAdapter field = assoc.get(pattern);
- if (field != null) {
- FieldMapping fieldMapping = fieldMappingFor(assoc);
- if (fieldMapping != null) {
- if (sql.length() > initialLength) {
+ final int initialLength = sql.length();
+ final ObjectAdapter pattern = query.getPattern();
+ for (final ObjectAssociation assoc : specification.getAssociations()) {
+ final ObjectAdapter field = assoc.get(pattern);
+ if (field != null) {
+ final FieldMapping fieldMapping = fieldMappingFor(assoc);
+ if (fieldMapping != null) {
+ if (sql.length() > initialLength) {
sql.append(" AND ");
- }
- fieldMapping.appendWhereClause(connector, sql, pattern);
- }
- }
- }
- return loadInstances(connector, spec, completeSelectStatement(sql));
- }
-
- @Override
- public ObjectAdapter[] getInstances(final DatabaseConnector connector,
- final ObjectSpecification spec, final String title) {
- StringBuffer sql = createSelectStatement();
+ }
+ fieldMapping.appendWhereClause(connector, sql, pattern);
+ }
+ }
+ }
+ return loadInstances(connector, spec, completeSelectStatement(sql));
+ }
+
+ @Override
+ public ObjectAdapter[] getInstances(final DatabaseConnector connector, final ObjectSpecification spec,
+ final String title) {
+ final StringBuffer sql = createSelectStatement();
sql.append(" WHERE ");
- titleMapping.appendWhereClause(sql, title);
- return loadInstances(connector, spec, completeSelectStatement(sql));
- }
-
- @Override
- public ObjectAdapter getObject(final DatabaseConnector connector,
- final Oid oid, final ObjectSpecification hint) {
- StringBuffer sql = createSelectStatement();
+ titleMapping.appendWhereClause(sql, title);
+ return loadInstances(connector, spec, completeSelectStatement(sql));
+ }
+
+ @Override
+ public ObjectAdapter getObject(final DatabaseConnector connector, final Oid oid, final ObjectSpecification hint) {
+ final StringBuffer sql = createSelectStatement();
sql.append(" WHERE ");
- idMapping.appendWhereClause(connector, sql, oid);
- Results rs = connector.select(completeSelectStatement(sql));
- if (rs.next()) {
- return loadObject(connector, hint, rs);
- } else {
- throw new ObjectNotFoundException("No object with with " + oid
- + " in table " + table);
- }
- }
-
- @Override
- public boolean hasInstances(final DatabaseConnector connector,
- final ObjectSpecification cls) {
- String statement = "select count(*) from " + table;
- int instances = connector.count(statement);
- return instances > 0;
- }
-
- private StringBuffer createSelectStatement() {
- StringBuffer sql = new StringBuffer();
- sql.append("select ");
- idMapping.appendColumnNames(sql);
- sql.append(", ");
- String columnList = columnList();
- if (columnList.length() > 0){
- sql.append(columnList);
- sql.append(", ");
- }
- sql.append(versionMapping.insertColumns());
- sql.append(" from " + table);
- return sql;
- } /*
+ idMapping.appendWhereClause(connector, sql, oid);
+ final Results rs = connector.select(completeSelectStatement(sql));
+ if (rs.next()) {
+ return loadObject(connector, hint, rs);
+ } else {
+ throw new ObjectNotFoundException("No object with with " + oid + " in table " + table);
+ }
+ }
+
+ @Override
+ public boolean hasInstances(final DatabaseConnector connector, final ObjectSpecification cls) {
+ final String statement = "select count(*) from " + table;
+ final int instances = connector.count(statement);
+ return instances > 0;
+ }
+
+ private StringBuffer createSelectStatement() {
+ final StringBuffer sql = new StringBuffer();
+ sql.append("select ");
+ idMapping.appendColumnNames(sql);
+ sql.append(", ");
+ final String columnList = columnList();
+ if (columnList.length() > 0) {
+ sql.append(columnList);
+ sql.append(", ");
+ }
+ sql.append(versionMapping.insertColumns());
+ sql.append(" from " + table);
+ return sql;
+ } /*
* if (whereClause != null) { sql.append(" WHERE "); sql.append(whereClause); } else if (whereClause != null) {
* sql.append(" WHERE "); idMapping.appendWhereClause(sql, oid); }
*/
- private String completeSelectStatement(final StringBuffer sql) {
- sql.append(" order by ");
- idMapping.appendColumnNames(sql);
- return sql.toString();
- }
-
- protected void loadFields(final ObjectAdapter object, final Results rs) {
- PersistorUtil.start(object, ResolveState.RESOLVING);
- for (FieldMapping mapping : fieldMappings) {
- mapping.initializeField(object, rs);
- }
- /*
- * for (int i = 0; i < oneToManyProperties.length; i++) { /* Need to set
- * up collection to be a ghost before we access as below
- */
- // CollectionAdapter collection = (CollectionAdapter)
- /*
- * oneToManyProperties[i].get(object); }
- */
- object.setOptimisticLock(versionMapping.getLock(rs));
- PersistorUtil.end(object);
- }
-
- // KAM
- private void loadCollections(DatabaseConnector connector,
- ObjectAdapter instance) {
-
- for (CollectionMapper mapper : collectionMappers) {
- mapper.loadInternalCollection(connector, instance);
- }
- }
-
- private ObjectAdapter[] loadInstances(final DatabaseConnector connector,
- final ObjectSpecification cls, final String selectStatment) {
- LOG.debug("loading instances from SQL " + table);
- Vector<ObjectAdapter> instances = new Vector<ObjectAdapter>();
-
- Results rs = connector.select(selectStatment);
- for (int count = 0; rs.next() && count < MAX_INSTANCES; count++) {
- ObjectAdapter instance = loadObject(connector, cls, rs);
- LOG.debug(" instance " + instance);
- instances.addElement(instance);
- }
- rs.close();
-
- ObjectAdapter[] array = new ObjectAdapter[instances.size()];
- instances.copyInto(array);
- return array;
- }
-
- private ObjectAdapter loadObject(final DatabaseConnector connector,
- final ObjectSpecification cls, final Results rs) {
- Oid oid = idMapping.recreateOid(rs, specification);
- ObjectAdapter instance = getAdapter(cls, oid);
-
- if (instance.getResolveState()
- .isValidToChangeTo(ResolveState.RESOLVING)) {
- loadFields(instance, rs);
- loadCollections(connector, instance); // KAM
- }
- return instance;
- }
-
- @Override
- public void resolve(final DatabaseConnector connector,
- final ObjectAdapter object) {
- LOG.debug("loading data from SQL " + table + " for " + object);
- StringBuffer sql = new StringBuffer();
- sql.append("select ");
- sql.append(columnList());
- sql.append(",");
- sql.append(versionMapping.appendSelectColumns());
+ private String completeSelectStatement(final StringBuffer sql) {
+ sql.append(" order by ");
+ idMapping.appendColumnNames(sql);
+ return sql.toString();
+ }
+
+ protected void loadFields(final ObjectAdapter object, final Results rs) {
+ PersistorUtil.start(object, ResolveState.RESOLVING);
+ for (final FieldMapping mapping : fieldMappings) {
+ mapping.initializeField(object, rs);
+ }
+ /*
+ * for (int i = 0; i < oneToManyProperties.length; i++) { /* Need to set up collection to be a ghost before we
+ * access as below
+ */
+ // CollectionAdapter collection = (CollectionAdapter)
+ /*
+ * oneToManyProperties[i].get(object); }
+ */
+ object.setOptimisticLock(versionMapping.getLock(rs));
+ PersistorUtil.end(object);
+ }
+
+ // KAM
+ private void loadCollections(final DatabaseConnector connector, final ObjectAdapter instance) {
+
+ for (final CollectionMapper mapper : collectionMappers) {
+ mapper.loadInternalCollection(connector, instance);
+ }
+ }
+
+ private ObjectAdapter[] loadInstances(final DatabaseConnector connector, final ObjectSpecification cls,
+ final String selectStatment) {
+ LOG.debug("loading instances from SQL " + table);
+ final Vector<ObjectAdapter> instances = new Vector<ObjectAdapter>();
+
+ final Results rs = connector.select(selectStatment);
+ for (int count = 0; rs.next() && count < MAX_INSTANCES; count++) {
+ final ObjectAdapter instance = loadObject(connector, cls, rs);
+ LOG.debug(" instance " + instance);
+ instances.addElement(instance);
+ }
+ rs.close();
+
+ final ObjectAdapter[] array = new ObjectAdapter[instances.size()];
+ instances.copyInto(array);
+ return array;
+ }
+
+ private ObjectAdapter loadObject(final DatabaseConnector connector, final ObjectSpecification cls, final Results rs) {
+ final Oid oid = idMapping.recreateOid(rs, specification);
+ final ObjectAdapter instance = getAdapter(cls, oid);
+
+ if (instance.getResolveState().isValidToChangeTo(ResolveState.RESOLVING)) {
+ loadFields(instance, rs);
+ loadCollections(connector, instance); // KAM
+ }
+ return instance;
+ }
+
+ @Override
+ public void resolve(final DatabaseConnector connector, final ObjectAdapter object) {
+ LOG.debug("loading data from SQL " + table + " for " + object);
+ final StringBuffer sql = new StringBuffer();
+ sql.append("select ");
+ sql.append(columnList());
+ sql.append(",");
+ sql.append(versionMapping.appendSelectColumns());
sql.append(" from " + table + " WHERE ");
- idMapping.appendWhereClause(connector, sql, object.getOid());
+ idMapping.appendWhereClause(connector, sql, object.getOid());
- Results rs = connector.select(sql.toString());
- if (rs.next()) {
- loadFields(object, rs);
- rs.close();
-
- for (int i = 0; i < collectionMappers.length; i++) {
- collectionMappers[i].loadInternalCollection(connector, object);
- }
- } else {
- rs.close();
- throw new SqlObjectStoreException("Unable to load data from "
- + table + " with id "
- + idMapping.primaryKey(object.getOid()));
- }
- }
-
- @Override
- public void resolveCollection(final DatabaseConnector connector,
- final ObjectAdapter object, final ObjectAssociation field) {
- if (collectionMappers.length > 0) {
- DatabaseConnector secondConnector = connector.getConnectionPool()
- .acquire();
- for (int i = 0; i < collectionMappers.length; i++) {
- collectionMappers[i].loadInternalCollection(secondConnector,
- object);
- }
- connector.getConnectionPool().release(secondConnector);
- }
- }
-
- @Override
- public void startup(final DatabaseConnector connector,
- final ObjectMappingLookup objectMapperLookup) {
- if (needsTables(connector)) {
- createTables(connector);
- }
- }
-
- @Override
- public void save(final DatabaseConnector connector,
- final ObjectAdapter object) {
- SerialNumberVersion version = (SerialNumberVersion) object.getVersion();
- long nextSequence = version.getSequence() + 1;
+ final Results rs = connector.select(sql.toString());
+ if (rs.next()) {
+ loadFields(object, rs);
+ rs.close();
+
+ for (final CollectionMapper collectionMapper : collectionMappers) {
+ collectionMapper.loadInternalCollection(connector, object);
+ }
+ } else {
+ rs.close();
+ throw new SqlObjectStoreException("Unable to load data from " + table + " with id "
+ + idMapping.primaryKey(object.getOid()));
+ }
+ }
+
+ @Override
+ public void resolveCollection(final DatabaseConnector connector, final ObjectAdapter object,
+ final ObjectAssociation field) {
+ if (collectionMappers.length > 0) {
+ final DatabaseConnector secondConnector = connector.getConnectionPool().acquire();
+ for (final CollectionMapper collectionMapper : collectionMappers) {
+ collectionMapper.loadInternalCollection(secondConnector, object);
+ }
+ connector.getConnectionPool().release(secondConnector);
+ }
+ }
+
+ @Override
+ public void startup(final DatabaseConnector connector, final ObjectMappingLookup objectMapperLookup) {
+ if (needsTables(connector)) {
+ createTables(connector);
+ }
+ }
- StringBuffer sql = new StringBuffer();
+ @Override
+ public void save(final DatabaseConnector connector, final ObjectAdapter object) {
+ final SerialNumberVersion version = (SerialNumberVersion) object.getVersion();
+ final long nextSequence = version.getSequence() + 1;
+
+ final StringBuffer sql = new StringBuffer();
sql.append("UPDATE " + table + " SET ");
- for (FieldMapping mapping : fieldMappings) {
- mapping.appendUpdateValues(connector, sql, object);
- sql.append(", ");
- }
- sql.append(versionMapping.updateAssigment(connector, nextSequence));
- sql.append(", ");
- titleMapping.appendUpdateAssignment(connector, sql, object);
+ for (final FieldMapping mapping : fieldMappings) {
+ mapping.appendUpdateValues(connector, sql, object);
+ sql.append(", ");
+ }
+ sql.append(versionMapping.updateAssigment(connector, nextSequence));
+ sql.append(", ");
+ titleMapping.appendUpdateAssignment(connector, sql, object);
sql.append(" WHERE ");
- idMapping.appendWhereClause(connector, sql, object.getOid());
+ idMapping.appendWhereClause(connector, sql, object.getOid());
sql.append(" AND ");
- sql.append(versionMapping.whereClause(connector, (SerialNumberVersion) object
- .getVersion()));
+ sql.append(versionMapping.whereClause(connector, (SerialNumberVersion) object.getVersion()));
+
+ final int updateCount = connector.update(sql.toString());
+ if (updateCount == 0) {
+ LOG.info("concurrency conflict object " + this + "; no update performed");
+ throw new ConcurrencyException("", object.getOid());
+ } else {
+ object.setOptimisticLock(createVersion(nextSequence));
+ }
+
+ // TODO update collections - change only when needed rather than
+ // reinserting from scratch
+ for (final CollectionMapper collectionMapper : collectionMappers) {
+ collectionMapper.saveInternalCollection(connector, object);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "AutoMapper [table=" + table + ",id=" + idMapping + ",noColumns=" + fieldMappings.size()
+ + ",specification=" + specification.getFullIdentifier() + "]";
+ }
+
+ @Override
+ public void debugData(final DebugBuilder debug) {
+ debug.appendln("ID mapping", idMapping);
+ debug.appendln("ID mapping", versionMapping);
+ debug.appendln("ID mapping", titleMapping);
+ for (final FieldMapping mapping : fieldMappings) {
+ mapping.debugData(debug);
+ }
+ for (final CollectionMapper collectionMapper : collectionMappers) {
+ collectionMapper.debugData(debug);
+ }
+
+ }
- int updateCount = connector.update(sql.toString());
- if (updateCount == 0) {
- LOG.info("concurrency conflict object " + this
- + "; no update performed");
- throw new ConcurrencyException("", object.getOid());
- } else {
- object.setOptimisticLock(createVersion(nextSequence));
- }
-
- // TODO update collections - change only when needed rather than
- // reinserting from scratch
- for (int i = 0; i < collectionMappers.length; i++) {
- collectionMappers[i].saveInternalCollection(connector, object);
- }
- }
-
- @Override
- public String toString() {
- return "AutoMapper [table=" + table + ",id=" + idMapping
- + ",noColumns=" + fieldMappings.size() + ",specification="
- + specification.getFullIdentifier() + "]";
- }
-
- @Override
- public void debugData(DebugBuilder debug) {
- debug.appendln("ID mapping", idMapping);
- debug.appendln("ID mapping", versionMapping);
- debug.appendln("ID mapping", titleMapping);
- for (FieldMapping mapping : fieldMappings) {
- mapping.debugData(debug);
- }
- for (int i = 0; i < collectionMappers.length; i++) {
- collectionMappers[i].debugData(debug);
- }
-
- }
-
- @Override
- public String debugTitle() {
- return toString();
- }
+ @Override
+ public String debugTitle() {
+ return toString();
+ }
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapperFactory.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapperFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapperFactory.java Tue May 3 06:52:51 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.objectstores.sql.auto;
import org.apache.isis.runtimes.dflt.objectstores.sql.FieldMappingLookup;
@@ -25,9 +24,10 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.ObjectMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.ObjectMappingLookup;
-
public class AutoMapperFactory implements ObjectMappingFactory {
- public ObjectMapping createMapper(final String className, final String propertiesBase, FieldMappingLookup lookup, ObjectMappingLookup objectMapperLookup) {
+ @Override
+ public ObjectMapping createMapper(final String className, final String propertiesBase,
+ final FieldMappingLookup lookup, final ObjectMappingLookup objectMapperLookup) {
return new AutoMapper(className, propertiesBase, lookup, objectMapperLookup);
}
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/CombinedCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/CombinedCollectionMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/CombinedCollectionMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/CombinedCollectionMapper.java Tue May 3 06:52:51 2011
@@ -22,6 +22,12 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.ArrayList;
import java.util.List;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.objectstores.sql.CollectionMapper;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
import org.apache.isis.runtimes.dflt.objectstores.sql.FieldMappingLookup;
@@ -33,12 +39,6 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.VersionMapping;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.ObjectReferenceMapping;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistorUtil;
import org.apache.log4j.Logger;
@@ -53,8 +53,8 @@ public class CombinedCollectionMapper ex
private final ObjectMapping originalMapping;
private final ObjectMappingLookup objectMapperLookup2;
- public CombinedCollectionMapper(ObjectAssociation objectAssociation, String parameterBase,
- FieldMappingLookup lookup, ObjectMappingLookup objectMapperLookup) {
+ public CombinedCollectionMapper(final ObjectAssociation objectAssociation, final String parameterBase,
+ final FieldMappingLookup lookup, final ObjectMappingLookup objectMapperLookup) {
super(objectAssociation.getSpecification().getFullIdentifier(), parameterBase, lookup, objectMapperLookup);
this.field = objectAssociation;
@@ -72,7 +72,7 @@ public class CombinedCollectionMapper ex
foreignKeyMapping = lookup.createMapping(columnName, objectAssociation.getSpecification());
}
- protected String determineColumnName(ObjectAssociation objectAssociation) {
+ protected String determineColumnName(final ObjectAssociation objectAssociation) {
return objectAssociation.getSpecification().getShortIdentifier();
}
@@ -80,24 +80,24 @@ public class CombinedCollectionMapper ex
return columnName;
}
- public void setColumnName(String columnName) {
+ public void setColumnName(final String columnName) {
this.columnName = columnName;
}
@Override
- public boolean needsTables(DatabaseConnector connection) {
+ public boolean needsTables(final DatabaseConnector connection) {
return !connection.hasColumn(table, foreignKeyName);
}
@Override
- public void startup(DatabaseConnector connector, FieldMappingLookup lookup) {
+ public void startup(final DatabaseConnector connector, final FieldMappingLookup lookup) {
originalMapping.startup(connector, objectMapperLookup2);
super.startup(connector, lookup);
}
@Override
- public void createTables(DatabaseConnector connection) {
- StringBuffer sql = new StringBuffer();
+ public void createTables(final DatabaseConnector connection) {
+ final StringBuffer sql = new StringBuffer();
sql.append("alter table ");
sql.append(table);
sql.append(" add ");
@@ -106,18 +106,18 @@ public class CombinedCollectionMapper ex
}
@Override
- public void loadInternalCollection(DatabaseConnector connector, ObjectAdapter parent) {
- ObjectAdapter collection = field.get(parent);
+ public void loadInternalCollection(final DatabaseConnector connector, final ObjectAdapter parent) {
+ final ObjectAdapter collection = field.get(parent);
if (collection.getResolveState().canChangeTo(ResolveState.RESOLVING)) {
LOG.debug("loading internal collection " + field);
PersistorUtil.start(collection, ResolveState.RESOLVING);
- StringBuffer sql = new StringBuffer();
+ final StringBuffer sql = new StringBuffer();
sql.append("select ");
idMapping.appendColumnNames(sql);
sql.append(", ");
- String columnList = columnList();
+ final String columnList = columnList();
if (columnList.length() > 0) {
sql.append(columnList);
sql.append(", ");
@@ -128,16 +128,16 @@ public class CombinedCollectionMapper ex
sql.append(" where ");
foreignKeyMapping.appendUpdateValues(connector, sql, parent);
- Results rs = connector.select(sql.toString());
- List<ObjectAdapter> list = new ArrayList<ObjectAdapter>();
+ final Results rs = connector.select(sql.toString());
+ final List<ObjectAdapter> list = new ArrayList<ObjectAdapter>();
while (rs.next()) {
- Oid oid = idMapping.recreateOid(rs, specification);
- ObjectAdapter element = getAdapter(specification, oid);
+ final Oid oid = idMapping.recreateOid(rs, specification);
+ final ObjectAdapter element = getAdapter(specification, oid);
loadFields(element, rs);
LOG.debug(" element " + element.getOid());
list.add(element);
}
- CollectionFacet collectionFacet = collection.getSpecification().getFacet(CollectionFacet.class);
+ final CollectionFacet collectionFacet = collection.getSpecification().getFacet(CollectionFacet.class);
collectionFacet.init(collection, list.toArray(new ObjectAdapter[list.size()]));
rs.close();
PersistorUtil.end(collection);
@@ -147,7 +147,7 @@ public class CombinedCollectionMapper ex
protected void loadFields(final ObjectAdapter object, final Results rs) {
if (object.getResolveState().canChangeTo(ResolveState.RESOLVING)) {
PersistorUtil.start(object, ResolveState.RESOLVING);
- for (FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappings) {
mapping.initializeField(object, rs);
}
object.setOptimisticLock(versionMapping.getLock(rs));
@@ -156,8 +156,8 @@ public class CombinedCollectionMapper ex
}
@Override
- public void saveInternalCollection(DatabaseConnector connector, ObjectAdapter parent) {
- ObjectAdapter collection = field.get(parent);
+ public void saveInternalCollection(final DatabaseConnector connector, final ObjectAdapter parent) {
+ final ObjectAdapter collection = field.get(parent);
LOG.debug("Saving internal collection " + collection);
StringBuffer sql = new StringBuffer();
@@ -174,9 +174,9 @@ public class CombinedCollectionMapper ex
sql.append(table);
sql.append(" set ");
- CollectionFacet collectionFacet = collection.getSpecification().getFacet(CollectionFacet.class);
- for (ObjectAdapter element : collectionFacet.iterable(collection)) {
- StringBuffer update = new StringBuffer(sql);
+ final CollectionFacet collectionFacet = collection.getSpecification().getFacet(CollectionFacet.class);
+ for (final ObjectAdapter element : collectionFacet.iterable(collection)) {
+ final StringBuffer update = new StringBuffer(sql);
foreignKeyMapping.appendUpdateValues(connector, update, parent);
update.append(" where ");
idMapping.appendWhereClause(connector, update, element.getOid());
@@ -185,7 +185,7 @@ public class CombinedCollectionMapper ex
}
@Override
- public void debugData(DebugBuilder debug) {
+ public void debugData(final DebugBuilder debug) {
debug.appendln(field.getName(), "collection");
debug.indent();
debug.appendln("Foreign key name", foreignKeyName);
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/MultiColumnCombinedCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/MultiColumnCombinedCollectionMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/MultiColumnCombinedCollectionMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/MultiColumnCombinedCollectionMapper.java Tue May 3 06:52:51 2011
@@ -17,44 +17,40 @@
* under the License.
*/
+/**
+ *
+ */
+package org.apache.isis.runtimes.dflt.objectstores.sql.auto;
-/**
- *
- */
-package org.apache.isis.runtimes.dflt.objectstores.sql.auto;
-
-import org.apache.isis.runtimes.dflt.objectstores.sql.FieldMappingLookup;
-import org.apache.isis.runtimes.dflt.objectstores.sql.ObjectMappingLookup;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationImpl;
-
-/**
- * Used to map 1-to-many collections by creating, in the child table, 1 column per parent collection.
- * The column is named by combining the final part of the parent class name and the collection variable name.
- *
- * @author Kevin
- */
-public class MultiColumnCombinedCollectionMapper extends
- CombinedCollectionMapper {
-
- public MultiColumnCombinedCollectionMapper(
- ObjectAssociation objectAssociation,
- String parameterBase, FieldMappingLookup lookup,
- ObjectMappingLookup objectMapperLookup) {
- super(objectAssociation, parameterBase, lookup, objectMapperLookup);
- }
-
- @Override
- protected String determineColumnName(ObjectAssociation objectAssociation){
- if (objectAssociation instanceof OneToManyAssociationImpl){
- OneToManyAssociationImpl fkAssoc = (OneToManyAssociationImpl) objectAssociation;
- FacetedMethod peer = fkAssoc.getFacetedMethod();
- String fullClassName = peer.getIdentifier().getClassName();
- int lastPos = fullClassName.lastIndexOf('.');
- return fullClassName.substring(lastPos+1)+"_"+fkAssoc.getId();
- } else {
- return objectAssociation.getSpecification().getShortIdentifier();
- }
- }
-}
+import org.apache.isis.runtimes.dflt.objectstores.sql.FieldMappingLookup;
+import org.apache.isis.runtimes.dflt.objectstores.sql.ObjectMappingLookup;
+
+/**
+ * Used to map 1-to-many collections by creating, in the child table, 1 column per parent collection. The column is
+ * named by combining the final part of the parent class name and the collection variable name.
+ *
+ * @author Kevin
+ */
+public class MultiColumnCombinedCollectionMapper extends CombinedCollectionMapper {
+
+ public MultiColumnCombinedCollectionMapper(final ObjectAssociation objectAssociation, final String parameterBase,
+ final FieldMappingLookup lookup, final ObjectMappingLookup objectMapperLookup) {
+ super(objectAssociation, parameterBase, lookup, objectMapperLookup);
+ }
+
+ @Override
+ protected String determineColumnName(final ObjectAssociation objectAssociation) {
+ if (objectAssociation instanceof OneToManyAssociationImpl) {
+ final OneToManyAssociationImpl fkAssoc = (OneToManyAssociationImpl) objectAssociation;
+ final FacetedMethod peer = fkAssoc.getFacetedMethod();
+ final String fullClassName = peer.getIdentifier().getClassName();
+ final int lastPos = fullClassName.lastIndexOf('.');
+ return fullClassName.substring(lastPos + 1) + "_" + fkAssoc.getId();
+ } else {
+ return objectAssociation.getSpecification().getShortIdentifier();
+ }
+ }
+}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java Tue May 3 06:52:51 2011
@@ -17,13 +17,19 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.objectstores.sql.auto;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.objectstores.sql.CollectionMapper;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
import org.apache.isis.runtimes.dflt.objectstores.sql.FieldMappingLookup;
@@ -32,48 +38,36 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.VersionMapping;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.ObjectReferenceMapping;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistorUtil;
import org.apache.log4j.Logger;
-
/** used where there is a one to many association, and the elements are only known to parent */
public class ReversedAutoAssociationMapper extends AbstractAutoMapper implements CollectionMapper {
private static final Logger LOG = Logger.getLogger(ReversedAutoAssociationMapper.class);
- private ObjectAssociation field;
+ private final ObjectAssociation field;
private final ObjectReferenceMapping idMapping;
private final VersionMapping versionMapping;
-
- public ReversedAutoAssociationMapper(
- final String elemenType,
- final ObjectAssociation field,
- final String parameterBase,
- final FieldMappingLookup lookup,
- final ObjectMappingLookup objectLookup) {
+ public ReversedAutoAssociationMapper(final String elemenType, final ObjectAssociation field,
+ final String parameterBase, final FieldMappingLookup lookup, final ObjectMappingLookup objectLookup) {
super(elemenType, parameterBase, lookup, objectLookup);
this.field = field;
idMapping = lookup.createMapping(field.getSpecification());
- versionMapping = lookup.createVersionMapping();
+ versionMapping = lookup.createVersionMapping();
}
-
+
+ @Override
public void createTables(final DatabaseConnector connection) {
if (!connection.hasTable(table)) {
- StringBuffer sql = new StringBuffer();
+ final StringBuffer sql = new StringBuffer();
sql.append("create table ");
sql.append(table);
sql.append(" (");
idMapping.appendColumnDefinitions(sql);
sql.append(", ");
- for (FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappings) {
mapping.appendColumnDefinitions(sql);
sql.append(",");
}
@@ -88,13 +82,13 @@ public class ReversedAutoAssociationMapp
}
}
-
+ @Override
public void loadInternalCollection(final DatabaseConnector connector, final ObjectAdapter parent) {
- ObjectAdapter collection = (ObjectAdapter) field.get(parent);
+ final ObjectAdapter collection = field.get(parent);
if (collection.getResolveState().canChangeTo(ResolveState.RESOLVING)) {
LOG.debug("loading internal collection " + field);
- StringBuffer sql = new StringBuffer();
+ final StringBuffer sql = new StringBuffer();
sql.append("select ");
idMapping.appendColumnNames(sql);
sql.append(", ");
@@ -103,82 +97,82 @@ public class ReversedAutoAssociationMapp
sql.append(table);
sql.append(" where ");
idMapping.appendUpdateValues(connector, sql, parent);
-
- Results rs = connector.select(sql.toString());
- List<ObjectAdapter> list = new ArrayList<ObjectAdapter>();
+
+ final Results rs = connector.select(sql.toString());
+ final List<ObjectAdapter> list = new ArrayList<ObjectAdapter>();
while (rs.next()) {
- Oid oid = idMapping.recreateOid(rs, specification);
- ObjectAdapter element = getAdapter(specification, oid);
+ final Oid oid = idMapping.recreateOid(rs, specification);
+ final ObjectAdapter element = getAdapter(specification, oid);
loadFields(element, rs);
LOG.debug(" element " + element.getOid());
list.add(element);
}
- CollectionFacet collectionFacet = collection.getSpecification().getFacet(CollectionFacet.class);
+ final CollectionFacet collectionFacet = collection.getSpecification().getFacet(CollectionFacet.class);
collectionFacet.init(collection, list.toArray(new ObjectAdapter[list.size()]));
rs.close();
PersistorUtil.end(collection);
}
}
-
+
protected void loadFields(final ObjectAdapter object, final Results rs) {
PersistorUtil.start(object, ResolveState.RESOLVING);
- for (FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappings) {
mapping.initializeField(object, rs);
}
-/*
- for (int i = 0; i < oneToManyProperties.length; i++) {
- /*
- * Need to set up collection to be a ghost before we access as below
- */
- // CollectionAdapter collection = (CollectionAdapter)
- /* oneToManyProperties[i].get(object);
- }
-*/
-
+ /*
+ * for (int i = 0; i < oneToManyProperties.length; i++) { /* Need to set up collection to be a ghost before we
+ * access as below
+ */
+ // CollectionAdapter collection = (CollectionAdapter)
+ /*
+ * oneToManyProperties[i].get(object); }
+ */
object.setOptimisticLock(versionMapping.getLock(rs));
PersistorUtil.end(object);
}
+ @Override
public void saveInternalCollection(final DatabaseConnector connector, final ObjectAdapter parent) {
- ObjectAdapter collection = field.get(parent);
+ final ObjectAdapter collection = field.get(parent);
LOG.debug("Saving internal collection " + collection);
-
+
deleteAllElments(connector, parent);
reinsertElements(connector, parent, collection);
}
- private void reinsertElements(final DatabaseConnector connector, final ObjectAdapter parent, ObjectAdapter collection) {
- StringBuffer sql = new StringBuffer();
+ private void reinsertElements(final DatabaseConnector connector, final ObjectAdapter parent,
+ final ObjectAdapter collection) {
+ final StringBuffer sql = new StringBuffer();
sql.append("insert into " + table + " (");
idMapping.appendColumnNames(sql);
sql.append(", ");
- String columnList = columnList();
- if (columnList.length() > 0){
- sql.append(columnList);
- sql.append(", ");
+ final String columnList = columnList();
+ if (columnList.length() > 0) {
+ sql.append(columnList);
+ sql.append(", ");
}
sql.append(versionMapping.insertColumns());
- sql.append(") values (" );
+ sql.append(") values (");
idMapping.appendInsertValues(connector, sql, parent);
sql.append(", ");
-
- CollectionFacet collectionFacet = field.getFacet(CollectionFacet.class);
- for (ObjectAdapter element : collectionFacet.iterable(collection)) {
- StringBuffer insert = new StringBuffer(sql);
+
+ final CollectionFacet collectionFacet = field.getFacet(CollectionFacet.class);
+ for (final ObjectAdapter element : collectionFacet.iterable(collection)) {
+ final StringBuffer insert = new StringBuffer(sql);
insert.append(values(connector, element));
- SerialNumberVersion version = new SerialNumberVersion(0, "", new Date());
+ final SerialNumberVersion version = new SerialNumberVersion(0, "", new Date());
insert.append(versionMapping.insertValues(connector, version));
- insert.append(") " );
-
+ insert.append(") ");
+
connector.insert(insert.toString());
element.setOptimisticLock(version);
}
}
private void deleteAllElments(final DatabaseConnector connector, final ObjectAdapter parent) {
- StringBuffer sql = new StringBuffer();
+ final StringBuffer sql = new StringBuffer();
sql.append("delete from ");
sql.append(table);
sql.append(" where ");
@@ -186,13 +180,13 @@ public class ReversedAutoAssociationMapp
connector.update(sql.toString());
}
-
- public void debugData(DebugBuilder debug) {
+ @Override
+ public void debugData(final DebugBuilder debug) {
debug.appendln(field.getName(), "collection");
debug.indent();
debug.appendln("ID mapping", idMapping);
debug.appendln("Version mapping", versionMapping);
- debug.unindent();
+ debug.unindent();
}
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java Tue May 3 06:52:51 2011
@@ -32,26 +32,26 @@ public abstract class AbstractJdbcFieldM
private final String columnName;
protected final ObjectAssociation field;
- public AbstractJdbcFieldMapping(ObjectAssociation field) {
+ public AbstractJdbcFieldMapping(final ObjectAssociation field) {
this.field = field;
columnName = Sql.sqlFieldName(field.getId());
}
@Override
- public void appendColumnDefinitions(StringBuffer sql) {
+ public void appendColumnDefinitions(final StringBuffer sql) {
sql.append(columnName);
sql.append(" ");
sql.append(columnType());
}
@Override
- public void appendColumnNames(StringBuffer sql) {
+ public void appendColumnNames(final StringBuffer sql) {
sql.append(columnName);
}
@Override
- public void appendInsertValues(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
- ObjectAdapter fieldValue = field.get(object);
+ public void appendInsertValues(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
+ final ObjectAdapter fieldValue = field.get(object);
if (fieldValue == null) {
sql.append("NULL");
} else {
@@ -61,33 +61,33 @@ public abstract class AbstractJdbcFieldM
}
@Override
- public void appendUpdateValues(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
+ public void appendUpdateValues(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
appendEqualsClause(connector, sql, object, "=");
}
@Override
- public void appendWhereClause(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
+ public void appendWhereClause(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
appendEqualsClause(connector, sql, object, "=");
}
- protected void appendEqualsClause(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object,
- String condition) {
+ protected void appendEqualsClause(final DatabaseConnector connector, final StringBuffer sql,
+ final ObjectAdapter object, final String condition) {
sql.append(Sql.sqlFieldName(field.getId()));
sql.append(condition);
- ObjectAdapter fieldValue = field.get(object);
+ final ObjectAdapter fieldValue = field.get(object);
sql.append("?");
connector.addToQueryValues(preparedStatementObject(fieldValue));
}
@Override
- public void initializeField(ObjectAdapter object, Results rs) {
- String columnName = Sql.sqlFieldName(field.getId());
- ObjectAdapter restoredValue = setFromDBColumn(rs, columnName, field);
+ public void initializeField(final ObjectAdapter object, final Results rs) {
+ final String columnName = Sql.sqlFieldName(field.getId());
+ final ObjectAdapter restoredValue = setFromDBColumn(rs, columnName, field);
((OneToOneAssociation) field).initAssociation(object, restoredValue);
}
@Override
- public void debugData(DebugBuilder debug) {
+ public void debugData(final DebugBuilder debug) {
debug.appendln(field.getId(), columnName + "/" + columnType());
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcMultiFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcMultiFieldMapping.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcMultiFieldMapping.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcMultiFieldMapping.java Tue May 3 06:52:51 2011
@@ -43,7 +43,7 @@ public abstract class AbstractJdbcMultiF
* @param types
* the list of SQL data types, 1 per columnCount, to represent the value type.
*/
- public AbstractJdbcMultiFieldMapping(ObjectAssociation field, int columnCount, String... types) {
+ public AbstractJdbcMultiFieldMapping(final ObjectAssociation field, final int columnCount, final String... types) {
super(field);
this.columnCount = columnCount;
@@ -52,14 +52,14 @@ public abstract class AbstractJdbcMultiF
this.types[i] = types[i];
}
- String fieldName = field.getId();
+ final String fieldName = field.getId();
columnNames = new String[columnCount];
columnNames[0] = Sql.sqlFieldName(fieldName + "1");
columnNames[1] = Sql.sqlFieldName(fieldName + "2");
}
@Override
- public void appendColumnDefinitions(StringBuffer sql) {
+ public void appendColumnDefinitions(final StringBuffer sql) {
for (int i = 0; i < columnCount; i++) {
sql.append(columnName(i) + " " + columnType(i));
if (i < columnCount - 1) {
@@ -69,7 +69,7 @@ public abstract class AbstractJdbcMultiF
}
@Override
- public void appendColumnNames(StringBuffer sql) {
+ public void appendColumnNames(final StringBuffer sql) {
for (int i = 0; i < columnCount; i++) {
sql.append(columnName(i));
if (i < columnCount - 1) {
@@ -79,9 +79,9 @@ public abstract class AbstractJdbcMultiF
}
@Override
- public void appendInsertValues(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
- ObjectAdapter fieldValue = field.get(object);
- Object o = (fieldValue == null) ? null : fieldValue.getObject();
+ public void appendInsertValues(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
+ final ObjectAdapter fieldValue = field.get(object);
+ final Object o = (fieldValue == null) ? null : fieldValue.getObject();
for (int i = 0; i < columnCount; i++) {
if (fieldValue == null) {
@@ -98,24 +98,24 @@ public abstract class AbstractJdbcMultiF
}
@Override
- public void appendUpdateValues(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
+ public void appendUpdateValues(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
for (int i = 0; i < columnCount; i++) {
appendEqualsClause(connector, i, sql, object, "=");
}
}
@Override
- public void appendWhereClause(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
+ public void appendWhereClause(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
for (int i = 0; i < columnCount; i++) {
appendEqualsClause(connector, i, sql, object, "=");
}
}
- protected void appendEqualsClause(DatabaseConnector connector, int index, StringBuffer sql, ObjectAdapter object,
- String condition) {
+ protected void appendEqualsClause(final DatabaseConnector connector, final int index, final StringBuffer sql,
+ final ObjectAdapter object, final String condition) {
- ObjectAdapter fieldValue = field.get(object);
- Object o = (fieldValue == null) ? null : fieldValue.getObject();
+ final ObjectAdapter fieldValue = field.get(object);
+ final Object o = (fieldValue == null) ? null : fieldValue.getObject();
for (int i = 0; i < columnCount; i++) {
sql.append(columnName(i) + condition + "?");
@@ -128,15 +128,15 @@ public abstract class AbstractJdbcMultiF
}
@Override
- public ObjectAdapter setFromDBColumn(Results results, String columnName, final ObjectAssociation field) {
+ public ObjectAdapter setFromDBColumn(final Results results, final String columnName, final ObjectAssociation field) {
ObjectAdapter restoredValue;
- Object objectValue = getObjectFromResults(results);
+ final Object objectValue = getObjectFromResults(results);
restoredValue = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(objectValue);
return restoredValue;
}
@Override
- public void debugData(DebugBuilder debug) {
+ public void debugData(final DebugBuilder debug) {
for (int i = 0; i < columnCount; i++) {
debug.appendln(field.getId(), columnName(i) + "/" + columnType(i));
}
@@ -148,15 +148,15 @@ public abstract class AbstractJdbcMultiF
}
@Override
- protected Object preparedStatementObject(ObjectAdapter value) {
+ protected Object preparedStatementObject(final ObjectAdapter value) {
throw new ApplicationException("Should never be called");
}
- protected String columnType(int index) {
+ protected String columnType(final int index) {
return types[index];
}
- protected String columnName(int index) {
+ protected String columnName(final int index) {
return columnNames[index];
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java Tue May 3 06:52:51 2011
@@ -46,7 +46,7 @@ public class JdbcBinaryValueMapper exten
private final String type;
- public JdbcBinaryValueMapper(ObjectAssociation field, String type) {
+ public JdbcBinaryValueMapper(final ObjectAssociation field, final String type) {
super(field);
this.type = type;
}
@@ -69,8 +69,8 @@ public class JdbcBinaryValueMapper exten
* .isis.core.metamodel.adapter.ObjectAdapter)
*/
@Override
- protected Object preparedStatementObject(ObjectAdapter value) {
- Object o = value.getObject();
+ protected Object preparedStatementObject(final ObjectAdapter value) {
+ final Object o = value.getObject();
return o;
}
@@ -83,10 +83,11 @@ public class JdbcBinaryValueMapper exten
* org.apache.isis.core.metamodel.spec.feature.ObjectAssociation)
*/
@Override
- protected ObjectAdapter setFromDBColumn(Results results, String columnName, ObjectAssociation field) {
+ protected ObjectAdapter setFromDBColumn(final Results results, final String columnName,
+ final ObjectAssociation field) {
ObjectAdapter restoredValue;
- Class<?> correspondingClass = field.getSpecification().getCorrespondingClass();
+ final Class<?> correspondingClass = field.getSpecification().getCorrespondingClass();
Object resultObject = results.getObject(columnName);
if (resultObject.getClass() != correspondingClass) {
@@ -113,7 +114,7 @@ public class JdbcBinaryValueMapper exten
}
- private boolean checkIfIsClass(Class<?> expected, Class<?> couldBe1, Class<?> couldBe2) {
+ private boolean checkIfIsClass(final Class<?> expected, final Class<?> couldBe1, final Class<?> couldBe2) {
return (expected == couldBe1 || expected == couldBe2);
}
}
\ No newline at end of file
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java Tue May 3 06:52:51 2011
@@ -46,7 +46,7 @@ public class JdbcColorValueMapper extend
private final String type;
- public JdbcColorValueMapper(ObjectAssociation field, String type) {
+ public JdbcColorValueMapper(final ObjectAssociation field, final String type) {
super(field);
this.type = type;
}
@@ -69,8 +69,8 @@ public class JdbcColorValueMapper extend
* .isis.core.metamodel.adapter.ObjectAdapter)
*/
@Override
- protected Object preparedStatementObject(ObjectAdapter value) {
- Object o = value.getObject();
+ protected Object preparedStatementObject(final ObjectAdapter value) {
+ final Object o = value.getObject();
return ((Color) o).intValue();
}
@@ -83,10 +83,11 @@ public class JdbcColorValueMapper extend
* org.apache.isis.core.metamodel.spec.feature.ObjectAssociation)
*/
@Override
- protected ObjectAdapter setFromDBColumn(Results results, String columnName, ObjectAssociation field) {
+ protected ObjectAdapter setFromDBColumn(final Results results, final String columnName,
+ final ObjectAssociation field) {
ObjectAdapter restoredValue;
- int intValue = results.getInt(columnName);
- Color colorValue = new Color(intValue);
+ final int intValue = results.getInt(columnName);
+ final Color colorValue = new Color(intValue);
restoredValue = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(colorValue);
return restoredValue;
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnector.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnector.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnector.java Tue May 3 06:52:51 2011
@@ -29,10 +29,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.log4j.Logger;
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDate;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractDatabaseConnector;
@@ -41,6 +37,9 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.SqlObjectStore;
import org.apache.isis.runtimes.dflt.objectstores.sql.SqlObjectStoreException;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.log4j.Logger;
+import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDate;
public class JdbcConnector extends AbstractDatabaseConnector {
private static final Logger LOG = Logger.getLogger(JdbcConnector.class);
@@ -285,11 +284,11 @@ public class JdbcConnector extends Abstr
if (value instanceof LocalDate) {
try {
statement.setObject(i, value, java.sql.Types.DATE);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
// This daft catch is required my MySQL, which also requires the TimeZone offset to be
// "undone"
- LocalDate localDate = (LocalDate) value;
- int millisOffset = -DateTimeZone.getDefault().getOffset(null);
+ final LocalDate localDate = (LocalDate) value;
+ final int millisOffset = -DateTimeZone.getDefault().getOffset(null);
final Date javaDate =
localDate.toDateTimeAtStartOfDay(DateTimeZone.forOffsetMillis(millisOffset)).toDate();
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnectorFactory.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnectorFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnectorFactory.java Tue May 3 06:52:51 2011
@@ -17,17 +17,16 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.objectstores.sql.jdbc;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnectorFactory;
-
public class JdbcConnectorFactory implements DatabaseConnectorFactory {
+ @Override
public DatabaseConnector createConnector() {
- JdbcConnector connection = new JdbcConnector();
+ final JdbcConnector connection = new JdbcConnector();
connection.open();
return connection;
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java Tue May 3 06:52:51 2011
@@ -17,11 +17,8 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.objectstores.sql.jdbc;
-import org.joda.time.LocalDate;
-
import org.apache.isis.applib.PersistFailedException;
import org.apache.isis.applib.value.Date;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
@@ -31,15 +28,16 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.joda.time.LocalDate;
/**
* Handles reading and writing java.sql.Date and org.apache.isis.applib.value.Date values to and from the data store.
*
- *
+ *
* @version $Rev$ $Date$
*/
public class JdbcDateMapper extends AbstractJdbcFieldMapping {
-
+
public static class Factory implements FieldMappingFactory {
@Override
public FieldMapping createFieldMapping(final ObjectAssociation field) {
@@ -47,32 +45,30 @@ public class JdbcDateMapper extends Abst
}
}
- protected JdbcDateMapper(ObjectAssociation field) {
+ protected JdbcDateMapper(final ObjectAssociation field) {
super(field);
}
@Override
- protected Object preparedStatementObject(ObjectAdapter value){
- Object o = value.getObject();
- if (o instanceof java.sql.Date){
- java.sql.Date javaSqlDate = (java.sql.Date) value.getObject();
- long millisSinceEpoch = javaSqlDate.getTime();
- return new LocalDate(millisSinceEpoch);
- }else if (o instanceof Date){
- Date asDate = (Date) value.getObject();
+ protected Object preparedStatementObject(final ObjectAdapter value) {
+ final Object o = value.getObject();
+ if (o instanceof java.sql.Date) {
+ final java.sql.Date javaSqlDate = (java.sql.Date) value.getObject();
+ final long millisSinceEpoch = javaSqlDate.getTime();
+ return new LocalDate(millisSinceEpoch);
+ } else if (o instanceof Date) {
+ final Date asDate = (Date) value.getObject();
return new LocalDate(asDate.getMillisSinceEpoch());
} else {
- throw new IsisApplicationException("Unimplemented JdbcDateMapper instance type: "+value.getClass().toString());
+ throw new IsisApplicationException("Unimplemented JdbcDateMapper instance type: "
+ + value.getClass().toString());
}
}
-
-
-
@Override
public ObjectAdapter setFromDBColumn(final Results results, final String columnName, final ObjectAssociation field) {
ObjectAdapter restoredValue;
- java.util.Date javaDateValue = results.getJavaDateOnly(columnName);
+ final java.util.Date javaDateValue = results.getJavaDateOnly(columnName);
final Class<?> correspondingClass = field.getSpecification().getCorrespondingClass();
if (correspondingClass == java.util.Date.class || correspondingClass == java.sql.Date.class) {
// 2011-04-08 = 1270684800000
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java Tue May 3 06:52:51 2011
@@ -41,24 +41,25 @@ public class JdbcDateTimeMapper extends
}
@Override
- protected Object preparedStatementObject(ObjectAdapter value) {
- DateTime asDate = (DateTime) value.getObject();
- java.sql.Timestamp dateTime = new java.sql.Timestamp(asDate.millisSinceEpoch());
+ protected Object preparedStatementObject(final ObjectAdapter value) {
+ final DateTime asDate = (DateTime) value.getObject();
+ final java.sql.Timestamp dateTime = new java.sql.Timestamp(asDate.millisSinceEpoch());
return dateTime;
}
@Override
- public ObjectAdapter setFromDBColumn(Results results, String columnName, final ObjectAssociation field) {
- String encodedValue = results.getString(columnName);
- if (encodedValue == null)
+ public ObjectAdapter setFromDBColumn(final Results results, final String columnName, final ObjectAssociation field) {
+ final String encodedValue = results.getString(columnName);
+ if (encodedValue == null) {
return null;
+ }
// convert date to yyyymmddhhmm
- String year = encodedValue.substring(0, 4);
- String month = encodedValue.substring(5, 7);
- String day = encodedValue.substring(8, 10);
- String hour = encodedValue.substring(11, 13);
- String minute = encodedValue.substring(14, 16);
- String valueString = year + month + day + "T" + hour + minute + "00000";
+ final String year = encodedValue.substring(0, 4);
+ final String month = encodedValue.substring(5, 7);
+ final String day = encodedValue.substring(8, 10);
+ final String hour = encodedValue.substring(11, 13);
+ final String minute = encodedValue.substring(14, 16);
+ final String valueString = year + month + day + "T" + hour + minute + "00000";
return field.getSpecification().getFacet(EncodableFacet.class).fromEncodedString(valueString);
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java Tue May 3 06:52:51 2011
@@ -52,11 +52,12 @@ public class JdbcGeneralValueMapper exte
}
@Override
- protected Object preparedStatementObject(ObjectAdapter value) {
- if (value == null)
+ protected Object preparedStatementObject(final ObjectAdapter value) {
+ if (value == null) {
return null;
+ }
- Object o = value.getObject();
+ final Object o = value.getObject();
if (o instanceof Money) {
return ((Money) o).floatValue();
@@ -68,8 +69,8 @@ public class JdbcGeneralValueMapper exte
return o;
} else {
if (columnType().contains("CHAR")) {
- EncodableFacet facet = value.getSpecification().getFacet(EncodableFacet.class);
- String encodedString = facet.toEncodedString(value);
+ final EncodableFacet facet = value.getSpecification().getFacet(EncodableFacet.class);
+ final String encodedString = facet.toEncodedString(value);
return encodedString;
} else {
return o;
@@ -78,11 +79,12 @@ public class JdbcGeneralValueMapper exte
}
@Override
- public ObjectAdapter setFromDBColumn(Results results, String columnName, final ObjectAssociation field) {
- String encodedValue = results.getString(columnName);
- if (encodedValue == null)
+ public ObjectAdapter setFromDBColumn(final Results results, final String columnName, final ObjectAssociation field) {
+ final String encodedValue = results.getString(columnName);
+ if (encodedValue == null) {
return null;
- EncodableFacet facet = field.getSpecification().getFacet(EncodableFacet.class);
+ }
+ final EncodableFacet facet = field.getSpecification().getFacet(EncodableFacet.class);
return facet.fromEncodedString(encodedValue);
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java Tue May 3 06:52:51 2011
@@ -37,7 +37,7 @@ public class JdbcMoneyValueMapper extend
private final String type1;
private final String type2;
- public Factory(String type1, String type2) {
+ public Factory(final String type1, final String type2) {
this.type1 = type1;
this.type2 = type2;
}
@@ -48,12 +48,12 @@ public class JdbcMoneyValueMapper extend
}
}
- public JdbcMoneyValueMapper(ObjectAssociation field, String type1, String type2) {
+ public JdbcMoneyValueMapper(final ObjectAssociation field, final String type1, final String type2) {
super(field, 2, type1, type2);
}
@Override
- protected Object preparedStatementObject(int index, Object o) {
+ protected Object preparedStatementObject(final int index, final Object o) {
if (o instanceof Money) {
if (index == 0) {
@@ -68,11 +68,11 @@ public class JdbcMoneyValueMapper extend
}
@Override
- protected Object getObjectFromResults(Results results) {
- double doubleValue = results.getDouble(columnName(0));
- String currencyValue = results.getString(columnName(1));
+ protected Object getObjectFromResults(final Results results) {
+ final double doubleValue = results.getDouble(columnName(0));
+ final String currencyValue = results.getString(columnName(1));
- Money moneyObject = new Money(doubleValue, currencyValue);
+ final Money moneyObject = new Money(doubleValue, currencyValue);
return moneyObject;
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java?rev=1098941&r1=1098940&r2=1098941&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java Tue May 3 06:52:51 2011
@@ -17,23 +17,22 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.objectstores.sql.jdbc;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.Sql;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-
public class JdbcObjectReferenceFieldMapping extends JdbcObjectReferenceMapping implements FieldMapping {
public static class Factory implements FieldMappingFactory {
+ @Override
public FieldMapping createFieldMapping(final ObjectAssociation field) {
return new JdbcObjectReferenceFieldMapping(field);
}
@@ -41,38 +40,42 @@ public class JdbcObjectReferenceFieldMap
private final ObjectAssociation field;
- public void appendWhereClause(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
- ObjectAdapter fieldValue = field.get(object);
+ @Override
+ public void appendWhereClause(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
+ final ObjectAdapter fieldValue = field.get(object);
appendWhereClause(connector, sql, fieldValue.getOid());
}
- public JdbcObjectReferenceFieldMapping(ObjectAssociation field) {
+ public JdbcObjectReferenceFieldMapping(final ObjectAssociation field) {
super(columnName(field), field.getSpecification());
this.field = field;
}
- private static String columnName(ObjectAssociation field) {
+ private static String columnName(final ObjectAssociation field) {
return Sql.sqlFieldName(field.getId());
}
- public void appendInsertValues(DatabaseConnector connector, StringBuffer sb, ObjectAdapter object) {
- ObjectAdapter fieldValue = field.get(object);
+ @Override
+ public void appendInsertValues(final DatabaseConnector connector, final StringBuffer sb, final ObjectAdapter object) {
+ final ObjectAdapter fieldValue = field.get(object);
super.appendInsertValues(connector, sb, fieldValue);
}
- public void appendUpdateValues(DatabaseConnector connector, StringBuffer sql, ObjectAdapter object) {
- ObjectAdapter fieldValue = field.get(object);
+ @Override
+ public void appendUpdateValues(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
+ final ObjectAdapter fieldValue = field.get(object);
super.appendUpdateValues(connector, sql, fieldValue);
}
- public void initializeField(ObjectAdapter object, Results rs) {
- ObjectAdapter reference = initializeField(rs);
+ @Override
+ public void initializeField(final ObjectAdapter object, final Results rs) {
+ final ObjectAdapter reference = initializeField(rs);
((OneToOneAssociation) field).initAssociation(object, reference);
}
-
- public void debugData(DebugBuilder debug) {
+
+ @Override
+ public void debugData(final DebugBuilder debug) {
debug.appendln(field.getId(), getColumn());
}
}
-