Repository: cayenne Updated Branches: refs/heads/master 88361d20d -> 4357557dd unused import Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/30220d8d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/30220d8d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/30220d8d Branch: refs/heads/master Commit: 30220d8d62309b0064ea49fa7a14fdd676b2e361 Parents: 88361d2 Author: aadamchik <aa...@apache.org> Authored: Sun Jan 25 16:21:02 2015 -0500 Committer: aadamchik <aa...@apache.org> Committed: Sun Jan 25 16:21:02 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cayenne/tools/DbImporterTask.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/30220d8d/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java index 72e4a24..5c1585d 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java @@ -19,13 +19,17 @@ package org.apache.cayenne.tools; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import org.apache.cayenne.access.loader.filters.EntityFilters; import org.apache.cayenne.access.loader.filters.FilterFactory; import org.apache.cayenne.conn.DataSourceInfo; +import org.apache.cayenne.di.DIBootstrap; +import org.apache.cayenne.di.Injector; +import org.apache.cayenne.map.naming.DefaultNameGenerator; +import org.apache.cayenne.tools.configuration.ToolsModule; +import org.apache.cayenne.tools.dbimport.DbImportAction; +import org.apache.cayenne.tools.dbimport.DbImportConfiguration; +import org.apache.cayenne.tools.dbimport.DbImportModule; import org.apache.cayenne.tools.dbimport.config.AntNestedElement; import org.apache.cayenne.tools.dbimport.config.Catalog; import org.apache.cayenne.tools.dbimport.config.ExcludeColumn; @@ -36,13 +40,6 @@ import org.apache.cayenne.tools.dbimport.config.IncludeProcedure; import org.apache.cayenne.tools.dbimport.config.IncludeTable; import org.apache.cayenne.tools.dbimport.config.ReverseEngineering; import org.apache.cayenne.tools.dbimport.config.Schema; -import org.apache.cayenne.di.DIBootstrap; -import org.apache.cayenne.di.Injector; -import org.apache.cayenne.map.naming.DefaultNameGenerator; -import org.apache.cayenne.tools.configuration.ToolsModule; -import org.apache.cayenne.tools.dbimport.DbImportAction; -import org.apache.cayenne.tools.dbimport.DbImportConfiguration; -import org.apache.cayenne.tools.dbimport.DbImportModule; import org.apache.cayenne.util.Util; import org.apache.commons.logging.Log; import org.apache.tools.ant.BuildException;
documenting the new iterator API
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4357557d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4357557d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4357557d
Branch: refs/heads/master
Commit: 4357557ddf9da1a271195502137fdccae346611c
Parents: 30220d8
Author: aadamchik <aa...@apache.org>
Authored: Sun Jan 25 16:35:58 2015 -0500
Committer: aadamchik <aa...@apache.org>
Committed: Sun Jan 25 16:42:35 2015 -0500
----------------------------------------------------------------------
.../cayenne-guide/src/docbkx/performance-tuning.xml | 10 +++-------
.../upgrade-guide/src/docbkx/new-features.xml | 15 ++++++++++++++-
2 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4357557d/docs/docbook/cayenne-guide/src/docbkx/performance-tuning.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/performance-tuning.xml b/docs/docbook/cayenne-guide/src/docbkx/performance-tuning.xml
index b331e83..06b98ec 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/performance-tuning.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/performance-tuning.xml
@@ -218,13 +218,9 @@ finally {
<para>Same thing with a
callback:<programlisting>SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class);
-context.iterate(q, new ResultIteratorCallback<Artist>() {
- public void iterate(ResultIterator<Artist> it) {
- for(Artist a : it) {
- // do something with the object...
- ...
- }
- }
+context.iterate(q, (Artist a) -> {
+ // do something with the object...
+ ...
});</programlisting></para>
</section>
<section xml:id="paginated-queries">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4357557d/docs/docbook/upgrade-guide/src/docbkx/new-features.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/upgrade-guide/src/docbkx/new-features.xml b/docs/docbook/upgrade-guide/src/docbkx/new-features.xml
index b2dcafd..b6777cd 100644
--- a/docs/docbook/upgrade-guide/src/docbkx/new-features.xml
+++ b/docs/docbook/upgrade-guide/src/docbkx/new-features.xml
@@ -85,7 +85,20 @@
</section>
</section>
-
+ <section xml:id="objectcontext">
+ <title>ObjectContext</title>
+ <section>
+ <title>Callback-based Object Iterator</title>
+ <para>ObjectContext now features a simpler way to iterate over large result sets, based
+ on callback interface that can be implemented with a
+ lambda:<programlisting>SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class);
+
+context.iterate(q, (Artist a) -> {
+ // do something with the object...
+ ...
+});</programlisting></para>
+ </section>
+ </section>
<section>
<title>Generics in Expressions and Queries</title>
<para>We finished the work of "genericizing" Cayenne APIs started in 3.1. Now all APIs