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 2012/03/14 00:06:44 UTC
svn commit: r1300398 - in
/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql:
auto/ jdbc/ mapping/
Author: danhaywood
Date: Tue Mar 13 23:06:43 2012
New Revision: 1300398
URL: http://svn.apache.org/viewvc?rev=1300398&view=rev
Log:
ISIS-215: change the way that SQL object store determines the properties to be persisted (use a map, not a list, so don't get accidental duplicates)
Modified:
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ForeignKeyCollectionMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMapping.java
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java Tue Mar 13 23:06:43 2012
@@ -20,18 +20,18 @@
package org.apache.isis.runtimes.dflt.objectstores.sql.auto;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
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.AbstractMapper;
import org.apache.isis.runtimes.dflt.objectstores.sql.CollectionMapper;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
@@ -43,53 +43,62 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
+import org.apache.log4j.Logger;
+
+import com.google.common.collect.Maps;
public abstract class AbstractAutoMapper extends AbstractMapper {
+
private static final Logger LOG = Logger.getLogger(AbstractAutoMapper.class);
+ protected final Map<ObjectAssociation, FieldMapping> fieldMappingByField = Maps.newLinkedHashMap();
+
+ protected CollectionMapper collectionMappers[];
+ protected String collectionMapperFields[];
+ protected boolean dbCreatesId;
+
+ protected ObjectSpecification specification;
+ protected String table;
+
final String className;
final String parameterBase;
final FieldMappingLookup lookup;
- final ObjectMappingLookup objectMapperLookup;
+ final ObjectMappingLookup objectMappingLookup;
- protected AbstractAutoMapper(final String className, final String parameterBase, final FieldMappingLookup lookup, final ObjectMappingLookup objectMapperLookup) {
- specification = IsisContext.getSpecificationLoader().loadSpecification(className);
- if (specification.getProperties() == null || specification.getProperties().size() == 0) {
- if (specification.isAbstract() == false) {
- throw new SqlObjectStoreException(specification.getFullIdentifier() + " has no fields: " + specification);
- }
- }
+ protected AbstractAutoMapper(final String className, final String parameterBase, final FieldMappingLookup lookup, final ObjectMappingLookup objectMappingLookup) {
+ this.specification = specificationFor(className);
this.className = className;
this.parameterBase = parameterBase;
this.lookup = lookup;
- this.objectMapperLookup = objectMapperLookup;
+ this.objectMappingLookup = objectMappingLookup;
}
protected AbstractAutoMapper(final FieldMappingLookup lookup, final AbstractAutoMapper abstractAutoMapper, final String className) {
+ this.specification = getSpecificationLoader().loadSpecification(className);
this.className = className;
- specification = IsisContext.getSpecificationLoader().loadSpecification(className);
this.parameterBase = null;
this.lookup = null;
- this.objectMapperLookup = null;
+ this.objectMappingLookup = null;
}
+ private static ObjectSpecification specificationFor(final String className) {
+ ObjectSpecification specification = IsisContext.getSpecificationLoader().loadSpecification(className);
+ List<OneToOneAssociation> properties = specification.getProperties();
+ if (isNullOrEmpty(properties) && !specification.isAbstract()) {
+ throw new SqlObjectStoreException(specification.getFullIdentifier() + " has no fields: " + specification);
+ }
+ return specification;
+ }
+
+
protected void setUpFieldMappers() {
- setUpFieldMappers(lookup, objectMapperLookup, className, parameterBase);
+ setUpFieldMappers(lookup, objectMappingLookup, className, parameterBase);
}
- protected CollectionMapper collectionMappers[];
- protected String collectionMapperFields[];
- protected boolean dbCreatesId;
-
- protected ObjectSpecification specification;
- protected String table;
- protected List<FieldMapping> fieldMappings = new ArrayList<FieldMapping>();
- protected Map<ObjectAssociation, FieldMapping> fieldMappingLookup = new HashMap<ObjectAssociation, FieldMapping>();
-
- private void setUpFieldMappers(final FieldMappingLookup lookup, final ObjectMappingLookup objectMapperLookup, final String className, final String parameterBase) {
- final IsisConfiguration configParameters = IsisContext.getConfiguration();
+ private void setUpFieldMappers(final FieldMappingLookup lookup, final ObjectMappingLookup objectMappingLookup, final String className, final String parameterBase) {
+ final IsisConfiguration configParameters = getConfiguration();
table = configParameters.getString(parameterBase + ".table." + className);
if (table == null) {
final String name = getTableNameFromSpecification(specification);
@@ -100,13 +109,13 @@ public abstract class AbstractAutoMapper
dbCreatesId = configParameters.getBoolean(parameterBase + "db-ids", false);
if (configParameters.getBoolean(parameterBase + "all-fields", true)) {
- setupFullMapping(lookup, objectMapperLookup, className, configParameters, parameterBase);
+ setupFullMapping(lookup, objectMappingLookup, className, configParameters, parameterBase);
} else {
// setupSpecifiedMapping(specification, configParameters,
// parameterBase);
}
- LOG.info("table mapping: " + table + " (" + columnList(fieldMappings) + ")");
+ LOG.info("table mapping: " + table + " (" + columnList(fieldMappingByField) + ")");
}
protected String getTableNameFromSpecification(final ObjectSpecification objectSpecification) {
@@ -138,7 +147,7 @@ public abstract class AbstractAutoMapper
final ObjectAssociation[] oneToManyProperties = new ObjectAssociation[collectionFieldCount];
collectionMappers = new CollectionMapper[collectionFieldCount];
collectionMapperFields = new String[collectionFieldCount];
- final IsisConfiguration subset = IsisContext.getConfiguration().createSubset(parameterBase + ".mapper.");
+ final IsisConfiguration subset = getConfiguration().createSubset(parameterBase + ".mapper.");
for (int i = 0, simpleFieldNo = 0, collectionFieldNo = 0; i < fields.size(); i++) {
final ObjectAssociation field = fields.get(i);
@@ -224,12 +233,18 @@ public abstract class AbstractAutoMapper
}
}
+
for (final ObjectAssociation field : oneToOneProperties) {
- final FieldMapping mapping = lookup.createMapping(specification, field);
- fieldMappings.add(mapping);
- fieldMappingLookup.put(field, mapping);
+ if(fieldMappingByField.containsKey(field)) {
+ continue;
+ }
+ final FieldMapping mapping = lookup.createMapping(specification, field);
+ fieldMappingByField.put(field, mapping);
}
+ }
+ protected String columnList(final Map<ObjectAssociation, FieldMapping> fieldMappingByField) {
+ return columnList(fieldMappingByField.values());
}
/*
@@ -269,7 +284,7 @@ public abstract class AbstractAutoMapper
*
* throw new NotYetImplementedException(); } } }
*/
- protected String columnList(final List<FieldMapping> fieldMappings) {
+ protected String columnList(final Collection<FieldMapping> fieldMappings) {
final StringBuffer sql = new StringBuffer();
for (final FieldMapping mapping : fieldMappings) {
if (sql.length() > 0) {
@@ -291,7 +306,7 @@ public abstract class AbstractAutoMapper
}
protected FieldMapping fieldMappingFor(final ObjectAssociation field) {
- return fieldMappingLookup.get(field);
+ return fieldMappingByField.get(field);
}
@Override
@@ -304,17 +319,34 @@ public abstract class AbstractAutoMapper
return !connection.hasTable(table);
}
- @Override
- public String toString() {
- return "AbstractAutoMapper [table=" + table + ",noColumns=" + fieldMappings.size() + ",specification=" + specification.getFullIdentifier() + "]";
- }
-
protected String values(final DatabaseConnector connector, final ObjectAdapter object) {
final StringBuffer sql = new StringBuffer();
- for (final FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.appendInsertValues(connector, sql, object);
sql.append(",");
}
return sql.toString();
}
+
+
+ private static boolean isNullOrEmpty(List<?> list) {
+ return list == null || list.size() == 0;
+ }
+
+
+
+ @Override
+ public String toString() {
+ return "AbstractAutoMapper [table=" + table + ",noColumns=" + fieldMappingByField.size() + ",specification=" + specification.getFullIdentifier() + "]";
+ }
+
+ protected SpecificationLoader getSpecificationLoader() {
+ return IsisContext.getSpecificationLoader();
+ }
+
+ protected IsisConfiguration getConfiguration() {
+ return IsisContext.getConfiguration();
+ }
+
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java Tue Mar 13 23:06:43 2012
@@ -23,8 +23,6 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.Vector;
-import org.apache.log4j.Logger;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
@@ -54,24 +52,23 @@ 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.isis.runtimes.dflt.runtime.system.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
+import org.apache.log4j.Logger;
public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, DebuggableWithTitle {
+
private static final Logger LOG = Logger.getLogger(AutoMapper.class);
private final IdMapping idMapping;
private final VersionMapping versionMapping;
private final TitleMapping titleMapping;
private final boolean useVersioning;
- final AdapterManager adapterManager;
-
+
+
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();
- adapterManager = IsisContext.getPersistenceSession().getAdapterManager();
useVersioning = Defaults.useVersioning(specification.getShortIdentifier());
setUpFieldMappers();
@@ -94,7 +91,7 @@ public class AutoMapper extends Abstract
sql.append(" (");
idMapping.appendCreateColumnDefinitions(sql);
sql.append(", ");
- for (final FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.appendColumnDefinitions(sql);
sql.append(",");
}
@@ -120,7 +117,7 @@ public class AutoMapper extends Abstract
sql.append("insert into " + table + " (");
idMapping.appendColumnNames(sql);
sql.append(", ");
- final String columnList = columnList(fieldMappings);
+ final String columnList = columnList(fieldMappingByField);
if (columnList.length() > 0) {
sql.append(columnList);
sql.append(", ");
@@ -285,7 +282,7 @@ public class AutoMapper extends Abstract
sql.append("select ");
idMapping.appendColumnNames(sql);
sql.append(", ");
- final String columnList = columnList(fieldMappings);
+ final String columnList = columnList(fieldMappingByField);
if (columnList.length() > 0) {
sql.append(columnList);
sql.append(", ");
@@ -307,7 +304,7 @@ public class AutoMapper extends Abstract
protected void loadFields(final ObjectAdapter object, final Results rs) {
PersistorUtil.start(object, ResolveState.RESOLVING);
- for (final FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.initializeField(object, rs);
}
/*
@@ -364,7 +361,7 @@ public class AutoMapper extends Abstract
LOG.debug("loading data from SQL " + table + " for " + object);
final StringBuffer sql = new StringBuffer();
sql.append("select ");
- sql.append(columnList(fieldMappings));
+ sql.append(columnList(fieldMappingByField));
sql.append(",");
sql.append(versionMapping.appendColumnNames());
sql.append(" from " + table + " WHERE ");
@@ -414,7 +411,7 @@ public class AutoMapper extends Abstract
final StringBuffer sql = new StringBuffer();
sql.append("UPDATE " + table + " SET ");
- for (final FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.appendUpdateValues(connector, sql, object);
sql.append(", ");
}
@@ -457,17 +454,17 @@ public class AutoMapper extends Abstract
return false;
}
- @Override
- public String toString() {
- return "AutoMapper [table=" + table + ",id=" + idMapping + ",noColumns=" + fieldMappings.size() + ",specification=" + specification.getFullIdentifier() + "]";
- }
+ ////////////////////////////////////////////////////////////////
+ // debugging, toString
+ ////////////////////////////////////////////////////////////////
+
@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) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.debugData(debug);
}
for (final CollectionMapper collectionMapper : collectionMappers) {
@@ -481,4 +478,10 @@ public class AutoMapper extends Abstract
return toString();
}
+
+ @Override
+ public String toString() {
+ return "AutoMapper [table=" + table + ",id=" + idMapping + ",noColumns=" + fieldMappingByField.size() + ",specification=" + specification.getFullIdentifier() + "]";
+ }
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ForeignKeyCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ForeignKeyCollectionMapper.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ForeignKeyCollectionMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ForeignKeyCollectionMapper.java Tue Mar 13 23:06:43 2012
@@ -22,6 +22,7 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.log4j.Logger;
@@ -32,6 +33,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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.CollectionMapper;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
import org.apache.isis.runtimes.dflt.objectstores.sql.FieldMappingLookup;
@@ -125,7 +127,7 @@ public class ForeignKeyCollectionMapper
@Override
public void startup(final DatabaseConnector connector, final FieldMappingLookup lookup) {
if (originalMapping == null) {
- originalMapping = objectMapperLookup.getMapping(specification, null);
+ originalMapping = objectMappingLookup.getMapping(specification, null);
}
originalMapping.startup(connector, objectMapperLookup2);
super.startup(connector, lookup);
@@ -195,7 +197,7 @@ public class ForeignKeyCollectionMapper
final List<ObjectAdapter> list = new ArrayList<ObjectAdapter>();
- loadCollectionIntoList(connector, parent, makeResolved, table, specification, getIdMapping(), fieldMappings, versionMapping, list);
+ loadCollectionIntoList(connector, parent, makeResolved, table, specification, getIdMapping(), fieldMappingByField, versionMapping, list);
final CollectionFacet collectionFacet = collection.getSpecification().getFacet(CollectionFacet.class);
collectionFacet.init(collection, list.toArray(new ObjectAdapter[list.size()]));
@@ -217,7 +219,7 @@ public class ForeignKeyCollectionMapper
}
}
- protected void loadCollectionIntoList(final DatabaseConnector connector, final ObjectAdapter parent, final boolean makeResolved, final String table, final ObjectSpecification specification, final IdMappingAbstract idMappingAbstract, final List<FieldMapping> fieldMappings,
+ protected void loadCollectionIntoList(final DatabaseConnector connector, final ObjectAdapter parent, final boolean makeResolved, final String table, final ObjectSpecification specification, final IdMappingAbstract idMappingAbstract, final Map<ObjectAssociation, FieldMapping> fieldMappingByField,
final VersionMapping versionMapping, final List<ObjectAdapter> list) {
final StringBuffer sql = new StringBuffer();
@@ -225,7 +227,7 @@ public class ForeignKeyCollectionMapper
idMappingAbstract.appendColumnNames(sql);
sql.append(", ");
- final String columnList = columnList(fieldMappings);
+ final String columnList = columnList(fieldMappingByField);
if (columnList.length() > 0) {
sql.append(columnList);
sql.append(", ");
@@ -240,17 +242,17 @@ public class ForeignKeyCollectionMapper
while (rs.next()) {
final Oid oid = idMappingAbstract.recreateOid(rs, specification);
final ObjectAdapter element = getAdapter(specification, oid);
- loadFields(element, rs, makeResolved, fieldMappings);
+ loadFields(element, rs, makeResolved, fieldMappingByField);
LOG.debug(" element " + element.getOid());
list.add(element);
}
rs.close();
}
- protected void loadFields(final ObjectAdapter object, final Results rs, final boolean makeResolved, final List<FieldMapping> fieldMappings) {
+ protected void loadFields(final ObjectAdapter object, final Results rs, final boolean makeResolved, final Map<ObjectAssociation, FieldMapping> fieldMappingByField) {
if (object.getResolveState().canChangeTo(ResolveState.RESOLVING)) {
PersistorUtil.start(object, ResolveState.RESOLVING);
- for (final FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.initializeField(object, rs);
}
object.setOptimisticLock(versionMapping.getLock(rs));
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java Tue Mar 13 23:06:43 2012
@@ -24,6 +24,7 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.log4j.Logger;
@@ -184,7 +185,7 @@ public class PolymorphicForeignKeyInChil
}
@Override
- protected void loadCollectionIntoList(final DatabaseConnector connector, final ObjectAdapter parent, final boolean makeResolved, final String table, final ObjectSpecification specification, final IdMappingAbstract idMappingAbstract, final List<FieldMapping> fieldMappings,
+ protected void loadCollectionIntoList(final DatabaseConnector connector, final ObjectAdapter parent, final boolean makeResolved, final String table, final ObjectSpecification specification, final IdMappingAbstract idMappingAbstract, final Map<ObjectAssociation, FieldMapping> fieldMappingByField,
final VersionMapping versionMapping, final List<ObjectAdapter> list) {
LOG.debug("Loading polymorphic list");
@@ -211,7 +212,7 @@ public class PolymorphicForeignKeyInChil
idMapping.setObjectSpecification(itemSpecification);
// Load new recordSet for the actual class
- final ObjectMapping itemMapper = objectMapperLookup.getMapping(itemSpecification, connector);
+ final ObjectMapping itemMapper = objectMappingLookup.getMapping(itemSpecification, connector);
final Oid oid = idMapping.recreateOid(rs, itemSpecification);
final ObjectAdapter loadedObject = itemMapper.getObject(connector, oid, itemSpecification);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java Tue Mar 13 23:06:43 2012
@@ -25,6 +25,7 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.log4j.Logger;
@@ -39,6 +40,8 @@ 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 com.google.common.collect.Lists;
+
/**
* 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
@@ -181,16 +184,16 @@ public class PolymorphicForeignKeyInChil
}
@Override
- protected void loadCollectionIntoList(final DatabaseConnector connector, final ObjectAdapter parent, final boolean makeResolved, final String table, final ObjectSpecification specification, final IdMappingAbstract idMappingAbstract, final List<FieldMapping> fieldMappings,
+ protected void loadCollectionIntoList(final DatabaseConnector connector, final ObjectAdapter parent, final boolean makeResolved, final String table, final ObjectSpecification specification, final IdMappingAbstract idMappingAbstract, final Map<ObjectAssociation, FieldMapping> fieldMappingByField,
final VersionMapping versionMapping, final List<ObjectAdapter> superList) {
- final List<ObjectAdapter> list = new ArrayList<ObjectAdapter>();
+ final List<ObjectAdapter> list = Lists.newArrayList();
+
for (int i = 0; i < tables.size(); i++) {
-
currentTableSpecification = tableSpecifications.get(i);
final AutoMapper mapper = (AutoMapper) subClassMappers.get(i);
final String mapperTable = tables.get(i);
- super.loadCollectionIntoList(connector, parent, makeResolved, mapperTable, currentTableSpecification, mapper.getIdMapping(), mapper.fieldMappings, mapper.getVersionMapping(), list);
+ super.loadCollectionIntoList(connector, parent, makeResolved, mapperTable, currentTableSpecification, mapper.getIdMapping(), mapper.fieldMappingByField, mapper.getVersionMapping(), list);
superList.addAll(list);
list.clear();
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/ReversedAutoAssociationMapper.java Tue Mar 13 23:06:43 2012
@@ -72,7 +72,7 @@ public class ReversedAutoAssociationMapp
sql.append(" (");
idMapping.appendColumnDefinitions(sql);
sql.append(", ");
- for (final FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.appendColumnDefinitions(sql);
sql.append(",");
}
@@ -97,7 +97,7 @@ public class ReversedAutoAssociationMapp
sql.append("select ");
idMapping.appendColumnNames(sql);
sql.append(", ");
- sql.append(columnList(fieldMappings));
+ sql.append(columnList(fieldMappingByField));
sql.append(" from ");
sql.append(table);
sql.append(" where ");
@@ -121,7 +121,7 @@ public class ReversedAutoAssociationMapp
protected void loadFields(final ObjectAdapter object, final Results rs, final boolean makeResolved) {
PersistorUtil.start(object, ResolveState.RESOLVING);
- for (final FieldMapping mapping : fieldMappings) {
+ for (final FieldMapping mapping : fieldMappingByField.values()) {
mapping.initializeField(object, rs);
}
/*
@@ -154,7 +154,7 @@ public class ReversedAutoAssociationMapp
sql.append("insert into " + table + " (");
idMapping.appendColumnNames(sql);
sql.append(", ");
- final String columnList = columnList(fieldMappings);
+ final String columnList = columnList(fieldMappingByField);
if (columnList.length() > 0) {
sql.append(columnList);
sql.append(", ");
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/AbstractJdbcFieldMapping.java Tue Mar 13 23:06:43 2012
@@ -29,6 +29,7 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
public abstract class AbstractJdbcFieldMapping implements FieldMapping {
+
private final String columnName;
protected final ObjectAssociation field;
@@ -38,6 +39,11 @@ public abstract class AbstractJdbcFieldM
}
@Override
+ public ObjectAssociation getField() {
+ return field;
+ }
+
+ @Override
public void appendColumnDefinitions(final StringBuffer sql) {
sql.append(columnName);
sql.append(" ");
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java Tue Mar 13 23:06:43 2012
@@ -47,6 +47,11 @@ public class JdbcObjectReferenceFieldMap
protected final ObjectAssociation field;
@Override
+ public ObjectAssociation getField() {
+ return field;
+ }
+
+ @Override
public void appendWhereClause(final DatabaseConnector connector, final StringBuffer sql, final ObjectAdapter object) {
final ObjectAdapter fieldValue = field.get(object);
appendWhereClause(connector, sql, fieldValue.getOid());
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMapping.java?rev=1300398&r1=1300397&r2=1300398&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMapping.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMapping.java Tue Mar 13 23:06:43 2012
@@ -21,10 +21,14 @@ package org.apache.isis.runtimes.dflt.ob
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.runtimes.dflt.objectstores.sql.DatabaseConnector;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
public interface FieldMapping {
+
+ public ObjectAssociation getField();
+
void appendColumnDefinitions(StringBuffer sql);
void appendColumnNames(StringBuffer sql);