You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2013/02/08 18:55:53 UTC
[1/4] git commit: ISIS-220: Changing method signature,
adding extra optional parameters to contructor)
ISIS-220: Changing method signature, adding extra optional parameters to contructor)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/693e8788
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/693e8788
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/693e8788
Branch: refs/heads/master
Commit: 693e87880592abfb823729a57f380182cd0431d0
Parents: 4c6530c
Author: Kevin Meyer <ke...@apache.org>
Authored: Fri Feb 8 16:27:38 2013 +0100
Committer: Kevin Meyer <ke...@apache.org>
Committed: Fri Feb 8 16:27:38 2013 +0100
----------------------------------------------------------------------
.../apache/isis/objectstore/sql/ObjectMapping.java | 2 +-
.../isis/objectstore/sql/SqlObjectStore.java | 16 +-
.../isis/objectstore/sql/auto/AutoMapper.java | 13 +-
.../apache/isis/applib/query/QueryAbstract.java | 26 +++-
.../isis/applib/query/QueryBuiltInAbstract.java | 11 +-
.../org/apache/isis/applib/query/QueryDefault.java | 2 +-
.../isis/applib/query/QueryFindAllInstances.java | 13 ++-
.../isis/applib/query/QueryFindAllPaged.java | 68 ---------
.../container/query/QueryFindByPattern.java | 8 +-
.../services/container/query/QueryFindByTitle.java | 8 +-
.../query/PersistenceQueryAbstract.java | 28 ++++-
.../query/PersistenceQueryBuiltInAbstract.java | 11 +-
.../query/PersistenceQueryFindAllInstances.java | 22 +++-
.../query/PersistenceQueryFindByPattern.java | 4 +-
.../query/PersistenceQueryFindByTitle.java | 6 +-
.../query/PersistenceQueryFindPaged.java | 2 +-
...ersistenceQueryFindUsingApplibQueryDefault.java | 8 +-
...tenceQueryFindUsingApplibQuerySerializable.java | 4 +-
.../system/persistence/PersistenceQuery.java | 11 ++
.../system/persistence/PersistenceSession.java | 112 ++++-----------
.../tck/dom/sqlos/SqlDomainObjectRepository.java | 4 +-
21 files changed, 179 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMapping.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMapping.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMapping.java
index d0dac05..64034e5 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMapping.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMapping.java
@@ -34,7 +34,7 @@ public interface ObjectMapping {
Vector<ObjectAdapter> getInstances(DatabaseConnector connector, ObjectSpecification spec, long startIndex, long rowCount);
- Vector<ObjectAdapter> getInstances(DatabaseConnector connector, ObjectSpecification spec, String title);
+ Vector<ObjectAdapter> getInstances(DatabaseConnector connector, ObjectSpecification spec, String title, long startIndex, long rowCount);
Vector<ObjectAdapter> getInstances(DatabaseConnector connector, ObjectSpecification spec, PersistenceQueryFindByPattern query);
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
index ecc201e..403fb0f 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
@@ -328,27 +328,27 @@ public final class SqlObjectStore implements ObjectStoreSpi {
@Override
public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery query) {
if (query instanceof PersistenceQueryFindByTitle) {
- return findByTitle((PersistenceQueryFindByTitle) query);
+ return findByTitle((PersistenceQueryFindByTitle) query, query.getStart(), query.getCount());
} else if (query instanceof PersistenceQueryFindAllInstances) {
- return getAllInstances((PersistenceQueryFindAllInstances) query, 0, 0);
+ return getAllInstances((PersistenceQueryFindAllInstances) query, query.getStart(), query.getCount());
} else if (query instanceof PersistenceQueryFindPaged) {
PersistenceQueryFindPaged findQuery = (PersistenceQueryFindPaged) query;
return getAllInstances((PersistenceQueryFindPaged) query, findQuery.getStart(), findQuery.getCount());
} else if (query instanceof PersistenceQueryFindByPattern) {
- return findByPattern((PersistenceQueryFindByPattern) query);
+ return findByPattern((PersistenceQueryFindByPattern) query, query.getStart(), query.getCount());
} else {
throw new SqlObjectStoreException("Query type not supported: " + query);
}
}
- private List<ObjectAdapter> findByPattern(final PersistenceQueryFindByPattern query) {
+ private List<ObjectAdapter> findByPattern(final PersistenceQueryFindByPattern query, final long startIndex, final long rowCount) {
final ObjectSpecification specification = query.getSpecification();// query.getPattern().getSpecification();//
// getSpecification();
final DatabaseConnector connector = connectionPool.acquire();
try {
final List<ObjectAdapter> matchingInstances = Lists.newArrayList();
- addSpecQueryInstances(specification, connector, query, matchingInstances, 0, 0);
+ addSpecQueryInstances(specification, connector, query, matchingInstances, startIndex, rowCount);
return matchingInstances;
} finally {
@@ -389,7 +389,7 @@ public final class SqlObjectStore implements ObjectStoreSpi {
}
private void addSpecInstances(final ObjectSpecification spec, final DatabaseConnector connector,
- final List<ObjectAdapter> matchingInstances, long startIndex, long rowCount) {
+ final List<ObjectAdapter> matchingInstances, final long startIndex, final long rowCount) {
if (!spec.isAbstract()) {
final ObjectMapping mapper = objectMappingLookup.getMapping(spec, connector);
@@ -406,12 +406,12 @@ public final class SqlObjectStore implements ObjectStoreSpi {
}
- private List<ObjectAdapter> findByTitle(final PersistenceQueryFindByTitle criteria) {
+ private List<ObjectAdapter> findByTitle(final PersistenceQueryFindByTitle criteria, final long startIndex, final long rowCount) {
final ObjectSpecification spec = criteria.getSpecification();
final DatabaseConnector connector = connectionPool.acquire();
final ObjectMapping mapper = objectMappingLookup.getMapping(spec, connector);
- final Vector<ObjectAdapter> instances = mapper.getInstances(connector, spec, criteria.getTitle());
+ final Vector<ObjectAdapter> instances = mapper.getInstances(connector, spec, criteria.getTitle(), startIndex, rowCount);
connectionPool.release(connector);
return instances;
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
index c8933df..3839258 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
@@ -161,7 +161,8 @@ public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, Deb
}
@Override
- public Vector<ObjectAdapter> getInstances(final DatabaseConnector connector, final ObjectSpecification spec, final long startIndex, final long rowCount) {
+ public Vector<ObjectAdapter> getInstances(final DatabaseConnector connector, final ObjectSpecification spec,
+ final long startIndex, final long rowCount) {
final StringBuffer sql = createSelectStatement();
final Vector<ObjectAdapter> instances = new Vector<ObjectAdapter>();
loadInstancesToVector(connector, spec, completeSelectStatement(sql, startIndex, rowCount), instances);
@@ -169,7 +170,8 @@ public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, Deb
}
@Override
- public Vector<ObjectAdapter> getInstances(final DatabaseConnector connector, final ObjectSpecification spec, final PersistenceQueryFindByPattern query) {
+ public Vector<ObjectAdapter> getInstances(final DatabaseConnector connector, final ObjectSpecification spec,
+ final PersistenceQueryFindByPattern query) {
final Vector<ObjectAdapter> instances = new Vector<ObjectAdapter>();
final StringBuffer sql = createSelectStatement();
@@ -245,19 +247,20 @@ public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, Deb
}
}
// if (foundFields > 0) {
- loadInstancesToVector(connector, spec, completeSelectStatement(sql, 0, 0), instances);
+ loadInstancesToVector(connector, spec, completeSelectStatement(sql, query.getStart(), query.getCount()), instances);
// }
return instances;
}
@Override
- public Vector<ObjectAdapter> getInstances(final DatabaseConnector connector, final ObjectSpecification spec, final String title) {
+ public Vector<ObjectAdapter> getInstances(final DatabaseConnector connector, final ObjectSpecification spec,
+ final String title, final long startIndex, final long rowCount) {
final Vector<ObjectAdapter> instances = new Vector<ObjectAdapter>();
final StringBuffer sql = createSelectStatement();
sql.append(" WHERE ");
titleMapping.appendWhereClause(sql, title);
- loadInstancesToVector(connector, spec, completeSelectStatement(sql, 0, 0), instances);
+ loadInstancesToVector(connector, spec, completeSelectStatement(sql, startIndex, rowCount), instances);
return instances;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
index 57263f6..41ceafc 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
@@ -27,6 +27,8 @@ package org.apache.isis.applib.query;
*/
public abstract class QueryAbstract<T> implements Query<T> {
+ private final long start;
+ private final long count;
private static final long serialVersionUID = 1L;
private final String resultTypeName;
@@ -36,12 +38,16 @@ public abstract class QueryAbstract<T> implements Query<T> {
*/
private transient Class<T> resultType;
- public QueryAbstract(final Class<T> type) {
+ public QueryAbstract(final Class<T> type, final long start, final long count) {
this.resultTypeName = type.getName();
+ this.start = start;
+ this.count = count;
}
- public QueryAbstract(final String typeName) {
+ public QueryAbstract(final String typeName, final long start, final long count) {
this.resultTypeName = typeName;
+ this.start = start;
+ this.count = count;
}
/**
@@ -66,4 +72,20 @@ public abstract class QueryAbstract<T> implements Query<T> {
return resultTypeName;
}
+ /**
+ * The start index into the set table
+ * @return
+ */
+ public long getStart() {
+ return start;
+ }
+
+
+ /**
+ * The number of items to return, starting at {@link QueryFindAllPaged#getStart()}
+ * @return
+ */
+ public long getCount() {
+ return count;
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/applib/src/main/java/org/apache/isis/applib/query/QueryBuiltInAbstract.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryBuiltInAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/query/QueryBuiltInAbstract.java
index 4a973c6..8d3dbc5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/query/QueryBuiltInAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/query/QueryBuiltInAbstract.java
@@ -46,12 +46,13 @@ import org.apache.isis.applib.DomainObjectContainer;
public abstract class QueryBuiltInAbstract<T> extends QueryAbstract<T> {
private static final long serialVersionUID = 1L;
-
- public QueryBuiltInAbstract(final Class<T> type) {
- super(type);
+
+ public QueryBuiltInAbstract(final Class<T> type, final long start, final long count) {
+ super(type, start, count);
}
- public QueryBuiltInAbstract(final String typeName) {
- super(typeName);
+ public QueryBuiltInAbstract(final String typeName, final long start, final long count) {
+ super(typeName, start, count);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java b/core/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
index 5a855fd..cd0d524 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
@@ -84,7 +84,7 @@ public class QueryDefault<T> extends QueryAbstract<T> {
}
public QueryDefault(final Class<T> resultType, final String queryName, final Map<String, Object> argumentsByParameterName) {
- super(resultType);
+ super(resultType, 0, 0);
this.queryName = queryName;
this.argumentsByParameterName = argumentsByParameterName;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java b/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
index 93c86ea..517beb5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
@@ -21,6 +21,7 @@ package org.apache.isis.applib.query;
import java.io.Serializable;
+
/**
* Although implements {@link Query} and thus is intended to be (and indeed is)
* {@link Serializable}, it will be converted into a <tt>PersistenceQuery</tt>
@@ -34,11 +35,19 @@ public class QueryFindAllInstances<T> extends QueryBuiltInAbstract<T> {
private static final long serialVersionUID = 1L;
public QueryFindAllInstances(final Class<T> type) {
- super(type);
+ this(type, 0, 0);
}
public QueryFindAllInstances(final String typeName) {
- super(typeName);
+ this(typeName, 0, 0);
+ }
+
+ public QueryFindAllInstances(Class<T> type, final long startIndex, final long rowCount) {
+ super(type, startIndex, rowCount);
+ }
+
+ public QueryFindAllInstances(String typeName, final long startIndex, final long rowCount) {
+ super(typeName, startIndex, rowCount);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllPaged.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllPaged.java b/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllPaged.java
deleted file mode 100644
index 985cb69..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllPaged.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.applib.query;
-
-
-/**
- * Used to support paging access. When paging through a dataset, use this method
- * to access portions of the dataset at a time.
- *
- * @author Kevin Meyer
- * @version $Rev$ $Date$
- */
-public class QueryFindAllPaged<T> extends QueryBuiltInAbstract<T> {
-
- private static final long serialVersionUID = 1L;
- private final long start;
- private final long count;
-
- public QueryFindAllPaged(final Class<T> type, final long start, final long count) {
- super(type);
- this.start = start;
- this.count = count;
- }
-
- public QueryFindAllPaged(final String typeName, final long start, final long count) {
- super(typeName);
- this.start = start;
- this.count = count;
- }
-
-
- @Override
- public String getDescription() {
- return getResultTypeName() + String.format(" (all instances, paged %d %d)", getStart(), getCount());
- }
-
-
- /**
- * The start index into the set table
- * @return
- */
- public long getStart() {
- return start;
- }
-
-
- /**
- * The number of items to return, starting at {@link QueryFindAllPaged#getStart()}
- * @return
- */
- public long getCount() {
- return count;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java
index 46aec95..b7b58b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java
@@ -38,9 +38,13 @@ public class QueryFindByPattern<T> extends QueryBuiltInAbstract<T> {
private static final long serialVersionUID = 1L;
private final T pattern;
+
+ public QueryFindByPattern(final Class<T> type, final T pattern){
+ this(type, pattern, 0, 0);
+ }
- public QueryFindByPattern(final Class<T> type, final T pattern) {
- super(type);
+ public QueryFindByPattern(final Class<T> type, final T pattern, final long start, final long count) {
+ super(type, start, count);
this.pattern = pattern;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java
index 3c2b7a5..7e4bb65 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java
@@ -40,10 +40,14 @@ public class QueryFindByTitle<T> extends QueryBuiltInAbstract<T> {
private final String title;
public QueryFindByTitle(final Class<T> type, final String title) {
- super(type);
- this.title = title;
+ this(type, title, 0, 0);
}
+ public QueryFindByTitle(final Class<T> type, final String title, final long start, final long count) {
+ super(type, start, count);
+ this.title = title;
+ }
+
public String getTitle() {
return title;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
index f9c5fba..f4620f7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
@@ -31,15 +31,21 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
public abstract class PersistenceQueryAbstract implements PersistenceQuery, Encodable {
+ private final long start;
+ private final long count;
private final ObjectSpecification specification;
- public PersistenceQueryAbstract(final ObjectSpecification specification) {
+ public PersistenceQueryAbstract(final ObjectSpecification specification, final long start, final long count) {
this.specification = specification;
+ this.start = start;
+ this.count = count;
initialized();
}
- protected PersistenceQueryAbstract(final DataInputExtended input) throws IOException {
+ protected PersistenceQueryAbstract(final DataInputExtended input, final long start, final long count) throws IOException {
final String specName = input.readUTF();
+ this.start = start;
+ this.count = count;
specification = getSpecificationLoader().loadSpecification(specName);
initialized();
}
@@ -52,6 +58,24 @@ public abstract class PersistenceQueryAbstract implements PersistenceQuery, Enco
private void initialized() {
// nothing to do
}
+
+ /**
+ * The start index into the set table
+ * @return
+ */
+ public long getStart() {
+ return start;
+ }
+
+
+ /**
+ * The number of items to return, starting at {@link QueryFindAllPaged#getStart()}
+ * @return
+ */
+ public long getCount() {
+ return count;
+ }
+
// ///////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
index 168f76b..f0f251f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
@@ -36,12 +36,13 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
*/
public abstract class PersistenceQueryBuiltInAbstract extends PersistenceQueryAbstract implements PersistenceQueryBuiltIn {
- public PersistenceQueryBuiltInAbstract(final ObjectSpecification specification) {
- super(specification);
- }
- public PersistenceQueryBuiltInAbstract(final DataInputExtended input) throws IOException {
- super(input);
+ public PersistenceQueryBuiltInAbstract(final ObjectSpecification specification, final long start, final long count) {
+ super(specification, start, count);
}
+ public PersistenceQueryBuiltInAbstract(final DataInputExtended input, final long start, final long count) throws IOException {
+ super(input, start, count);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
index 700b6f1..db70783 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
@@ -28,8 +28,17 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
* Corresponds to {@link QueryFindAllInstances}
*/
public class PersistenceQueryFindAllInstances extends PersistenceQueryBuiltInAbstract {
+ private long index;
+ private long countedSoFar;
+
public PersistenceQueryFindAllInstances(final ObjectSpecification specification) {
- super(specification);
+ this(specification, 0, 0);
+ }
+
+ public PersistenceQueryFindAllInstances(final ObjectSpecification specification, final long start, final long count) {
+ super(specification, start, count);
+ index=0;
+ countedSoFar=0;
}
/**
@@ -37,7 +46,16 @@ public class PersistenceQueryFindAllInstances extends PersistenceQueryBuiltInAbs
*/
@Override
public boolean matches(final ObjectAdapter object) {
- return true;
+ if (getCount() == 0 && getStart() == 0){
+ return true;
+ }
+ if (index++ < getStart()){
+ return false;
+ }
+ if (countedSoFar++ <getCount()){
+ return true;
+ }
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
index 1d30a51..c961540 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
@@ -36,8 +36,8 @@ public class PersistenceQueryFindByPattern extends PersistenceQueryBuiltInAbstra
return pattern;
}
- public PersistenceQueryFindByPattern(final ObjectSpecification specification, final ObjectAdapter pattern) {
- super(specification);
+ public PersistenceQueryFindByPattern(final ObjectSpecification specification, final ObjectAdapter pattern, final long start, final long count) {
+ super(specification, start, count);
this.pattern = pattern;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
index 46cca1a..121305b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
@@ -31,7 +31,11 @@ public class PersistenceQueryFindByTitle extends PersistenceQueryBuiltInAbstract
private final String title;
public PersistenceQueryFindByTitle(final ObjectSpecification specification, final String title) {
- super(specification);
+ this(specification, title, 0, 0);
+ }
+
+ public PersistenceQueryFindByTitle(final ObjectSpecification specification, final String title, final long start, final long count) {
+ super(specification, start, count);
this.title = title == null ? "" : title.toLowerCase();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindPaged.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindPaged.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindPaged.java
index f80f9a0..bc745c7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindPaged.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindPaged.java
@@ -32,7 +32,7 @@ public class PersistenceQueryFindPaged extends PersistenceQueryBuiltInAbstract {
private long index;
private long countedSoFar;
public PersistenceQueryFindPaged(final ObjectSpecification specification, final long start, final long count) {
- super(specification);
+ super(specification, start, count);
this.start = start;
this.count = count;
index=0;
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
index ba1ff90..03dbda1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
@@ -41,16 +41,16 @@ public class PersistenceQueryFindUsingApplibQueryDefault extends PersistenceQuer
private final QueryCardinality cardinality;
private final Map<String, ObjectAdapter> argumentsAdaptersByParameterName;
- public PersistenceQueryFindUsingApplibQueryDefault(final ObjectSpecification specification, final String queryName, final Map<String, ObjectAdapter> argumentsAdaptersByParameterName, final QueryCardinality cardinality) {
- super(specification);
+ public PersistenceQueryFindUsingApplibQueryDefault(final ObjectSpecification specification, final String queryName, final Map<String, ObjectAdapter> argumentsAdaptersByParameterName, final QueryCardinality cardinality, final long start, final long count) {
+ super(specification, start, count);
this.queryName = queryName;
this.cardinality = cardinality;
this.argumentsAdaptersByParameterName = argumentsAdaptersByParameterName;
initialized();
}
- public PersistenceQueryFindUsingApplibQueryDefault(final DataInputExtended input) throws IOException {
- super(input);
+ public PersistenceQueryFindUsingApplibQueryDefault(final DataInputExtended input, final long start, final long count) throws IOException {
+ super(input, start, count);
this.queryName = input.readUTF();
this.cardinality = QueryCardinality.valueOf(input.readUTF());
// TODO: need to read from input
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
index b186e53..e4ab9d5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
@@ -37,14 +37,14 @@ public class PersistenceQueryFindUsingApplibQuerySerializable extends Persistenc
private final QueryCardinality cardinality;
public PersistenceQueryFindUsingApplibQuerySerializable(final ObjectSpecification specification, final Query<?> query, final QueryCardinality cardinality) {
- super(specification);
+ super(specification, 0, 0);
this.query = query;
this.cardinality = cardinality;
initialized();
}
public PersistenceQueryFindUsingApplibQuerySerializable(final DataInputExtended input) throws IOException {
- super(input);
+ super(input, 0, 0);
this.query = input.readSerializable(Query.class);
this.cardinality = QueryCardinality.valueOf(input.readUTF());
initialized();
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQuery.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQuery.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQuery.java
index 1d631fd..e76ff79 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQuery.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQuery.java
@@ -32,4 +32,15 @@ public interface PersistenceQuery {
* The type of instances in the resulting set.
*/
ObjectSpecification getSpecification();
+
+ /**
+ * The index of the first record to return, 0 means the first.
+ * @return
+ */
+ public long getStart() ;
+ /**
+ * The number of records to return, 0 means all.
+ * @return
+ */
+ public long getCount() ;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index d042008..665ee53 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -29,10 +29,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import org.apache.log4j.Logger;
+
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryDefault;
import org.apache.isis.applib.query.QueryFindAllInstances;
-import org.apache.isis.applib.query.QueryFindAllPaged;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.SessionScopedComponent;
@@ -78,7 +82,6 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObje
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindPaged;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -87,17 +90,8 @@ import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosureAbstract;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosureWithReturnAbstract;
import org.apache.isis.core.runtime.system.transaction.UpdateNotifier;
-import org.apache.log4j.Logger;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-public class PersistenceSession implements
- Persistor,
- EnlistedObjectDirtying, ToPersistObjectSet,
- RecreatedPojoRemapper,
- AdapterLifecycleTransitioner,
- SessionScopedComponent, DebuggableWithTitle {
+public class PersistenceSession implements Persistor, EnlistedObjectDirtying, ToPersistObjectSet, RecreatedPojoRemapper, AdapterLifecycleTransitioner, SessionScopedComponent, DebuggableWithTitle {
private static final Logger LOG = Logger.getLogger(PersistenceSession.class);
@@ -124,39 +118,24 @@ public class PersistenceSession implements
}
private State state;
-
-
+
/**
* Initialize the object store so that calls to this object store access
* persisted objects and persist changes to the object that are saved.
*/
- public PersistenceSession(
- final PersistenceSessionFactory persistenceSessionFactory,
- final ObjectAdapterFactory adapterFactory,
- final ObjectFactory objectFactory,
- final ServicesInjectorSpi servicesInjector,
- final IdentifierGenerator identifierGenerator,
- final AdapterManagerSpi adapterManager,
- final PersistAlgorithm persistAlgorithm,
- final ObjectStore objectStore) {
+ public PersistenceSession(final PersistenceSessionFactory persistenceSessionFactory, final ObjectAdapterFactory adapterFactory, final ObjectFactory objectFactory, final ServicesInjectorSpi servicesInjector, final IdentifierGenerator identifierGenerator, final AdapterManagerSpi adapterManager,
+ final PersistAlgorithm persistAlgorithm, final ObjectStore objectStore) {
- this(persistenceSessionFactory, adapterFactory, objectFactory, servicesInjector, new OidGenerator(identifierGenerator), adapterManager,
- persistAlgorithm, objectStore);
+ this(persistenceSessionFactory, adapterFactory, objectFactory, servicesInjector, new OidGenerator(identifierGenerator), adapterManager, persistAlgorithm, objectStore);
}
/**
* Initialize the object store so that calls to this object store access
* persisted objects and persist changes to the object that are saved.
*/
- public PersistenceSession(
- final PersistenceSessionFactory persistenceSessionFactory,
- final ObjectAdapterFactory adapterFactory,
- final ObjectFactory objectFactory,
- final ServicesInjectorSpi servicesInjector,
- final OidGenerator oidGenerator,
- final AdapterManagerSpi adapterManager,
+ public PersistenceSession(final PersistenceSessionFactory persistenceSessionFactory, final ObjectAdapterFactory adapterFactory, final ObjectFactory objectFactory, final ServicesInjectorSpi servicesInjector, final OidGenerator oidGenerator, final AdapterManagerSpi adapterManager,
final PersistAlgorithm persistAlgorithm, final ObjectStore objectStore) {
-
+
ensureThatArg(persistenceSessionFactory, is(not(nullValue())), "persistence session factory required");
ensureThatArg(adapterFactory, is(not(nullValue())), "adapter factory required");
@@ -176,8 +155,7 @@ public class PersistenceSession implements
this.adapterManager = adapterManager;
setState(State.NOT_INITIALIZED);
-
-
+
if (LOG.isDebugEnabled()) {
LOG.debug("creating " + this);
}
@@ -189,7 +167,6 @@ public class PersistenceSession implements
this.objectStore = objectStore;
}
-
// ///////////////////////////////////////////////////////////////////////////
// PersistenceSessionFactory
// ///////////////////////////////////////////////////////////////////////////
@@ -236,19 +213,17 @@ public class PersistenceSession implements
ensureThatState(objectStore, is(notNullValue()), "object store required");
ensureThatState(getTransactionManager(), is(notNullValue()), "transaction manager required");
ensureThatState(persistAlgorithm, is(notNullValue()), "persist algorithm required");
-
+
getAdapterManager().injectInto(objectStore);
getSpecificationLoader().injectInto(objectStore);
-
+
objectStore.open();
-
+
createServiceAdapters();
setState(State.OPEN);
}
-
-
/**
* Calls {@link #doClose()}, then closes all components.
*
@@ -273,7 +248,6 @@ public class PersistenceSession implements
setState(State.CLOSED);
}
-
/**
* Creates (or recreates following a {@link #testReset()})
* {@link ObjectAdapter adapters} for the {@link #serviceList}.
@@ -351,7 +325,7 @@ public class PersistenceSession implements
final Object pojo = objectSpec.createObject();
final ObjectAdapter adapter = getAdapterManager().adapterFor(pojo, parentAdapter);
// returned adapter's ResolveState will either be TRANSIENT or GHOST
- objectSpec.initialize(adapter);
+ objectSpec.initialize(adapter);
if (adapter.isGhost()) {
adapter.changeState(ResolveState.RESOLVING);
adapter.changeState(ResolveState.RESOLVED);
@@ -359,7 +333,6 @@ public class PersistenceSession implements
return adapter;
}
-
// ///////////////////////////////////////////////////////////////////////////
// findInstances, getInstances
// ///////////////////////////////////////////////////////////////////////////
@@ -386,33 +359,30 @@ public class PersistenceSession implements
* {@link PersistenceQuery NOF-internal representation}.
*/
protected final PersistenceQuery createPersistenceQueryFor(final Query<?> query, final QueryCardinality cardinality) {
- if(LOG.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("createPersistenceQueryFor: " + query.getDescription());
}
final ObjectSpecification noSpec = specFor(query);
if (query instanceof QueryFindAllInstances) {
- return new PersistenceQueryFindAllInstances(noSpec);
- }
- if (query instanceof QueryFindAllPaged ) {
- QueryFindAllPaged<?> pagedQuery = (QueryFindAllPaged<?>) query;
- return new PersistenceQueryFindPaged(noSpec, pagedQuery.getStart(), pagedQuery.getCount());
+ final QueryFindAllInstances<?> queryFindAllInstances = (QueryFindAllInstances<?>) query;
+ return new PersistenceQueryFindAllInstances(noSpec, queryFindAllInstances.getStart(), queryFindAllInstances.getCount());
}
if (query instanceof QueryFindByTitle) {
final QueryFindByTitle<?> queryByTitle = (QueryFindByTitle<?>) query;
final String title = queryByTitle.getTitle();
- return new PersistenceQueryFindByTitle(noSpec, title);
+ return new PersistenceQueryFindByTitle(noSpec, title, queryByTitle.getStart(), queryByTitle.getCount());
}
if (query instanceof QueryFindByPattern) {
final QueryFindByPattern<?> queryByPattern = (QueryFindByPattern<?>) query;
final Object pattern = queryByPattern.getPattern();
final ObjectAdapter patternAdapter = getAdapterManager().adapterFor(pattern);
- return new PersistenceQueryFindByPattern(noSpec, patternAdapter);
+ return new PersistenceQueryFindByPattern(noSpec, patternAdapter, queryByPattern.getStart(), queryByPattern.getCount());
}
if (query instanceof QueryDefault) {
final QueryDefault<?> queryDefault = (QueryDefault<?>) query;
final String queryName = queryDefault.getQueryName();
final Map<String, ObjectAdapter> argumentsAdaptersByParameterName = wrap(queryDefault.getArgumentsByParameterName());
- return new PersistenceQueryFindUsingApplibQueryDefault(noSpec, queryName, argumentsAdaptersByParameterName, cardinality);
+ return new PersistenceQueryFindUsingApplibQueryDefault(noSpec, queryName, argumentsAdaptersByParameterName, cardinality, queryDefault.getStart(), queryDefault.getCount());
}
// fallback; generic serializable applib query.
return new PersistenceQueryFindUsingApplibQuerySerializable(noSpec, query, cardinality);
@@ -529,7 +499,6 @@ public class PersistenceSession implements
}
}
-
// ///////////////////////////////////////////////////////////////////////////
// Services
// ///////////////////////////////////////////////////////////////////////////
@@ -576,7 +545,7 @@ public class PersistenceSession implements
final ObjectSpecification serviceSpecification = getSpecificationLoader().loadSpecification(servicePojo.getClass());
final RootOid oid = getOidForService(serviceSpecification);
final ObjectAdapter serviceAdapter = mapRecreatedPojo(oid, servicePojo);
-
+
serviceAdapter.markAsResolvedIfPossible();
return serviceAdapter;
}
@@ -598,12 +567,10 @@ public class PersistenceSession implements
return oid;
}
-
// ///////////////////////////////////////////////////////////////////////////
// fixture installation
// ///////////////////////////////////////////////////////////////////////////
-
/**
* Determine if the object store has been initialized with its set of start
* up objects.
@@ -645,8 +612,7 @@ public class PersistenceSession implements
super.finalize();
LOG.debug("finalizing persistence session");
}
-
-
+
// ///////////////////////////////////////////////////////////////////////////
// loadObject, reload
// ///////////////////////////////////////////////////////////////////////////
@@ -670,7 +636,7 @@ public class PersistenceSession implements
return objectStore.loadInstanceAndAdapt(oid);
}
});
- return adapter;
+ return adapter;
}
// ///////////////////////////////////////////////////////////////////////////
@@ -790,7 +756,7 @@ public class PersistenceSession implements
@Override
public void execute() {
persistAlgorithm.makePersistent(adapter, PersistenceSession.this);
-
+
// clear out the map of transient -> persistent
PersistenceSession.this.persistentByTransient.clear();
}
@@ -872,7 +838,6 @@ public class PersistenceSession implements
getUpdateNotifier().addChangedObject(adapter);
}
-
// ///////////////////////////////////////////////////////////////////////////
// destroyObject
// ///////////////////////////////////////////////////////////////////////////
@@ -916,7 +881,6 @@ public class PersistenceSession implements
});
}
-
// ///////////////////////////////////////////////////////////////////////////
// hasInstances
// ///////////////////////////////////////////////////////////////////////////
@@ -938,7 +902,6 @@ public class PersistenceSession implements
});
}
-
// ///////////////////////////////////////////////////////////////////////////
// RecreatedPojoRemapper
// ///////////////////////////////////////////////////////////////////////////
@@ -953,7 +916,6 @@ public class PersistenceSession implements
adapterManager.remapRecreatedPojo(adapter, recreatedPojo);
}
-
// ///////////////////////////////////////////////////////////////////////////
// AdapterLifecycleTransitioner
// ///////////////////////////////////////////////////////////////////////////
@@ -967,9 +929,7 @@ public class PersistenceSession implements
public void removeAdapter(ObjectAdapter adapter) {
adapterManager.removeAdapter(adapter);
}
-
-
-
+
// ///////////////////////////////////////////////////////////////////////////
// ToPersistObjectSet
// ///////////////////////////////////////////////////////////////////////////
@@ -1002,14 +962,11 @@ public class PersistenceSession implements
persistentByTransient.put(transientOid, persistentOid);
}
-
-
@Override
public Oid remappedFrom(Oid transientOid) {
return persistentByTransient.get(transientOid);
}
-
/**
* Uses the {@link ObjectStoreSpi} to
* {@link ObjectStoreSpi#createCreateObjectCommand(ObjectAdapter) create} a
@@ -1021,12 +978,10 @@ public class PersistenceSession implements
getTransactionManager().addCommand(objectStore.createCreateObjectCommand(object));
}
-
// ///////////////////////////////////////////////////////////////////////////
// Debugging
// ///////////////////////////////////////////////////////////////////////////
-
@Override
public String debugTitle() {
return "Object Store Persistor";
@@ -1059,7 +1014,6 @@ public class PersistenceSession implements
}
debug.appendln();
-
debug.appendTitle("Persistor");
getTransactionManager().debugData(debug);
debug.appendln("Persist Algorithm", persistAlgorithm);
@@ -1068,7 +1022,7 @@ public class PersistenceSession implements
objectStore.debugData(debug);
}
-
+
@Override
public String toString() {
final ToString toString = new ToString(this);
@@ -1081,7 +1035,6 @@ public class PersistenceSession implements
return toString.toString();
}
-
// ////////////////////////////////////////////////////////////////////
// Helpers
// ////////////////////////////////////////////////////////////////////
@@ -1091,8 +1044,6 @@ public class PersistenceSession implements
return ImmutableFacetUtils.isAlwaysImmutable(noSpec) || (ImmutableFacetUtils.isImmutableOncePersisted(noSpec) && adapter.representsPersistent());
}
-
-
// ///////////////////////////////////////////////////////////////////////////
// test support
// ///////////////////////////////////////////////////////////////////////////
@@ -1105,7 +1056,6 @@ public class PersistenceSession implements
adapterManager.reset();
}
-
// ///////////////////////////////////////////////////////////////////////////
// Dependencies (injected in constructor, possibly implicitly)
// ///////////////////////////////////////////////////////////////////////////
@@ -1175,12 +1125,10 @@ public class PersistenceSession implements
return objectFactory;
}
-
// ///////////////////////////////////////////////////////////////////////////
// Dependencies (injected)
// ///////////////////////////////////////////////////////////////////////////
-
/**
* Inject the {@link IsisTransactionManager}.
*
@@ -1195,7 +1143,6 @@ public class PersistenceSession implements
this.transactionManager = transactionManager;
}
-
/**
* The configured {@link IsisTransactionManager}.
*
@@ -1205,7 +1152,6 @@ public class PersistenceSession implements
return transactionManager;
}
-
// ///////////////////////////////////////////////////////////////////////////
// Dependencies (from context)
// ///////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/693e8788/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/sqlos/SqlDomainObjectRepository.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/sqlos/SqlDomainObjectRepository.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/sqlos/SqlDomainObjectRepository.java
index 05950f4..2658fa7 100644
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/sqlos/SqlDomainObjectRepository.java
+++ b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/sqlos/SqlDomainObjectRepository.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.query.Query;
-import org.apache.isis.applib.query.QueryFindAllPaged;
+import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.core.tck.dom.poly.Empty;
import org.apache.isis.core.tck.dom.poly.ReferencingPolyTypesEntity;
import org.apache.isis.core.tck.dom.poly.SelfReferencingEntity;
@@ -169,7 +169,7 @@ public class SqlDomainObjectRepository extends AbstractFactoryAndRepository {
}
public List<SimpleClass> someSimpleClasses(final long startIndex, final long rowCount) {
- Query<SimpleClass> query = new QueryFindAllPaged<SimpleClass>(SimpleClass.class, startIndex, rowCount);
+ Query<SimpleClass> query = new QueryFindAllInstances<SimpleClass>(SimpleClass.class, startIndex, rowCount);
return allMatches(query);
}