You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by am...@apache.org on 2016/02/12 00:35:28 UTC
[1/6] cayenne git commit: Cleanup some unused variables,
tidy formatting and add generics.
Repository: cayenne
Updated Branches:
refs/heads/master 9aba7ec6b -> 60a66d813
Cleanup some unused variables, tidy formatting and add generics.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f7c02d11
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f7c02d11
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f7c02d11
Branch: refs/heads/master
Commit: f7c02d1163d637029687175a5db4782316deec73
Parents: 1448a19
Author: Aristedes Maniatis <ar...@ish.com.au>
Authored: Thu Dec 17 19:35:13 2015 +1100
Committer: Aristedes Maniatis <ar...@ish.com.au>
Committed: Thu Dec 17 19:35:13 2015 +1100
----------------------------------------------------------------------
.../apache/cayenne/remote/ClientChannel.java | 57 ++++++--------------
1 file changed, 17 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f7c02d11/cayenne-client/src/main/java/org/apache/cayenne/remote/ClientChannel.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/main/java/org/apache/cayenne/remote/ClientChannel.java b/cayenne-client/src/main/java/org/apache/cayenne/remote/ClientChannel.java
index 5b9d240..b917e49 100644
--- a/cayenne-client/src/main/java/org/apache/cayenne/remote/ClientChannel.java
+++ b/cayenne-client/src/main/java/org/apache/cayenne/remote/ClientChannel.java
@@ -19,16 +19,7 @@
package org.apache.cayenne.remote;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.DataChannelSyncCallbackAction;
-import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.Persistent;
-import org.apache.cayenne.QueryResponse;
+import org.apache.cayenne.*;
import org.apache.cayenne.event.EventBridge;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.event.EventSubject;
@@ -43,6 +34,9 @@ import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.util.DeepMergeOperation;
import org.apache.cayenne.util.ToStringBuilder;
+import java.util.List;
+import java.util.ListIterator;
+
/**
* A {@link org.apache.cayenne.DataChannel} implementation that accesses a remote server
* via a ClientConnection.
@@ -75,14 +69,11 @@ public class ClientChannel implements DataChannel {
if (!remoteEventsOptional) {
setupRemoteChannelListener();
- }
- else {
+ } else {
try {
setupRemoteChannelListener();
}
- catch (CayenneRuntimeException e) {
-
- }
+ catch (CayenneRuntimeException e) {}
}
}
@@ -106,9 +97,7 @@ public class ClientChannel implements DataChannel {
public QueryResponse onQuery(ObjectContext context, Query query) {
- QueryResponse response = (QueryResponse) send(
- new QueryMessage(query),
- QueryResponse.class);
+ QueryResponse response = send( new QueryMessage(query), QueryResponse.class);
// if needed, register objects in provided context, rewriting the response
// (assuming all lists are mutable)
@@ -132,21 +121,16 @@ public class ClientChannel implements DataChannel {
DeepMergeOperation merger = new DeepMergeOperation(context);
List<Object> rsMapping = info.getResultSetMapping();
if (rsMapping == null) {
- convertSingleObjects(resolver, objects, merger);
+ convertSingleObjects(objects, merger);
}
else {
if (rsMapping.size() == 1) {
if (rsMapping.get(0) instanceof EntityResultSegment) {
- convertSingleObjects(resolver, objects, merger);
+ convertSingleObjects(objects, merger);
}
}
else {
- processMixedResult(
- resolver,
- objects,
- merger,
- rsMapping);
-
+ processMixedResult(objects, merger, rsMapping);
}
}
}
@@ -159,7 +143,6 @@ public class ClientChannel implements DataChannel {
}
private void processMixedResult(
- EntityResolver resolver,
List<Object[]> objects,
DeepMergeOperation merger,
List<Object> rsMapping) {
@@ -168,28 +151,22 @@ public class ClientChannel implements DataChannel {
for (int i = 0; i < width; i++) {
if (rsMapping.get(i) instanceof EntityResultSegment) {
for (Object[] object : objects) {
- object[i] = convertObject(resolver, merger, (Persistent) object[i]);
+ object[i] = convertObject(merger, (Persistent) object[i]);
}
}
}
}
- private void convertSingleObjects(
- EntityResolver resolver,
- List objects,
- DeepMergeOperation merger) {
+ private void convertSingleObjects(List objects, DeepMergeOperation merger) {
ListIterator it = objects.listIterator();
while (it.hasNext()) {
Object next = it.next();
- it.set(convertObject(resolver, merger, (Persistent) next));
+ it.set(convertObject( merger, (Persistent) next));
}
}
- private Object convertObject(
- EntityResolver resolver,
- DeepMergeOperation merger,
- Persistent object) {
+ private Object convertObject(DeepMergeOperation merger, Persistent object) {
ObjectId id = object.getObjectId();
@@ -217,7 +194,7 @@ public class ClientChannel implements DataChannel {
changes = diffCompressor.compress(changes);
- GraphDiff replyDiff = (GraphDiff) send(new SyncMessage(
+ GraphDiff replyDiff = send(new SyncMessage(
originatingContext,
syncType,
changes), GraphDiff.class);
@@ -322,7 +299,7 @@ public class ClientChannel implements DataChannel {
* @throws org.apache.cayenne.CayenneRuntimeException if an underlying connector
* exception occurred, or a result is not of expected type.
*/
- protected Object send(ClientMessage message, Class<?> resultClass) {
+ protected <T extends Object> T send(ClientMessage message, Class<T> resultClass) {
Object result = connection.sendMessage(message);
if (result != null && !resultClass.isInstance(result)) {
@@ -333,6 +310,6 @@ public class ClientChannel implements DataChannel {
+ resultString);
}
- return result;
+ return resultClass.cast(result);
}
}
[4/6] cayenne git commit: Add some missing license headers
Posted by am...@apache.org.
Add some missing license headers
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ff38058e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ff38058e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ff38058e
Branch: refs/heads/master
Commit: ff38058ea5a86b2ca99de7c1c104ec81779fe6ac
Parents: 5bc55aa
Author: Aristedes Maniatis <ar...@ish.com.au>
Authored: Fri Feb 12 10:27:16 2016 +1100
Committer: Aristedes Maniatis <ar...@ish.com.au>
Committed: Fri Feb 12 10:27:16 2016 +1100
----------------------------------------------------------------------
.../access/loader/filters/FiltersConfig.java | 19 +++++++++++++++++++
.../CayenneDataObjectSetToManyCollectionIT.java | 19 +++++++++++++++++++
.../cayenne/CayenneDataObjectSetToManySetIT.java | 19 +++++++++++++++++++
.../access/loader/filters/FiltersConfigTest.java | 19 +++++++++++++++++++
.../testdo/array_type/ArrayTestEntity.java | 19 +++++++++++++++++++
.../lifecycle_callbacks_order/Lifecycle.java | 19 +++++++++++++++++++
6 files changed, 114 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ff38058e/cayenne-server/src/main/java/org/apache/cayenne/access/loader/filters/FiltersConfig.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/loader/filters/FiltersConfig.java b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/filters/FiltersConfig.java
index 5f69501..7a6823e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/loader/filters/FiltersConfig.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/loader/filters/FiltersConfig.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ * 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.cayenne.access.loader.filters;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ff38058e/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java
index a2a74ab..edbbc9b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ * 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.cayenne;
import org.apache.cayenne.di.Inject;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ff38058e/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java
index 42dfd33..45d6b5e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ * 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.cayenne;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ff38058e/cayenne-server/src/test/java/org/apache/cayenne/access/loader/filters/FiltersConfigTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/loader/filters/FiltersConfigTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/loader/filters/FiltersConfigTest.java
index 26501fc..a43f890 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/loader/filters/FiltersConfigTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/loader/filters/FiltersConfigTest.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ * 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.cayenne.access.loader.filters;
import junit.framework.TestCase;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ff38058e/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java
index 64fa867..e2cf945 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ * 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.cayenne.testdo.array_type;
import org.apache.cayenne.testdo.array_type.auto._ArrayTestEntity;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ff38058e/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/Lifecycle.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/Lifecycle.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/Lifecycle.java
index 49ee979..e8d9249 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/Lifecycle.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/Lifecycle.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ * 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.cayenne.testdo.lifecycle_callbacks_order;
import org.apache.cayenne.testdo.lifecycle_callbacks_order.auto._Lifecycle;
[2/6] cayenne git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cayenne into ish/master
Posted by am...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cayenne into ish/master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4621beff
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4621beff
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4621beff
Branch: refs/heads/master
Commit: 4621beffc1b3168ebba68e5a4e8f6b8a2ba22987
Parents: f7c02d1 9aba7ec
Author: Aristedes Maniatis <ar...@ish.com.au>
Authored: Fri Feb 12 09:24:05 2016 +1100
Committer: Aristedes Maniatis <ar...@ish.com.au>
Committed: Fri Feb 12 09:24:05 2016 +1100
----------------------------------------------------------------------
assembly/pom.xml | 14 -
.../org/apache/cayenne/CayenneDataObject.java | 91 ++++++
.../java/org/apache/cayenne/QueryResult.java | 56 ++++
.../access/translator/ParameterBinding.java | 9 +-
.../translator/batch/DeleteBatchTranslator.java | 13 +-
.../translator/batch/InsertBatchTranslator.java | 11 +-
.../batch/SoftDeleteBatchTranslator.java | 7 +-
.../translator/batch/UpdateBatchTranslator.java | 18 +-
.../translator/select/QueryAssembler.java | 59 ++--
.../translator/select/QueryAssemblerHelper.java | 22 +-
.../apache/cayenne/cache/EhCacheQueryCache.java | 30 +-
.../server/SyntheticNodeDataDomainProvider.java | 11 +-
.../dba/oracle/Oracle8LOBBatchTranslator.java | 14 +-
.../org/apache/cayenne/map/EntityResolver.java | 20 +-
.../java/org/apache/cayenne/query/SQLExec.java | 241 +++++++++++++++
.../apache/cayenne/util/QueryResultBuilder.java | 150 +++++++++
.../CayenneDataObjectSetToManyCollectionIT.java | 79 +++++
.../CayenneDataObjectSetToManyListIT.java | 301 +++++++++++++++++++
.../CayenneDataObjectSetToManyMapIT.java | 96 ++++++
.../CayenneDataObjectSetToManySetIT.java | 71 +++++
.../org/apache/cayenne/TranslationCase.java | 78 -----
.../translator/select/OrderingTranslatorIT.java | 129 ++------
.../select/QualifierTranslatorIT.java | 90 +++---
.../translator/select/TstQueryAssembler.java | 3 +-
.../AshwoodEntitySorter_InheritanceIT.java | 16 +-
.../SyntheticNodeDataDomainProviderTest.java | 42 +++
.../cayenne/exp/ExpressionTraversalTest.java | 117 ++++---
.../apache/cayenne/exp/TstBinaryExpSuite.java | 164 ----------
.../apache/cayenne/exp/TstExpressionCase.java | 55 ----
.../apache/cayenne/exp/TstExpressionSuite.java | 37 ---
.../apache/cayenne/exp/TstTernaryExpSuite.java | 45 ---
.../apache/cayenne/exp/TstTraversalHandler.java | 2 +-
.../apache/cayenne/exp/TstUnaryExpSuite.java | 71 -----
.../org/apache/cayenne/query/SQLExecIT.java | 74 +++++
.../org/apache/cayenne/query/TstQueryCase.java | 34 ---
docs/doc/src/main/resources/KEYS | 119 ++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 14 +
.../src/docbkx/performance-tuning.xml | 70 +++++
.../dialog/objentity/ObjRelationshipInfo.java | 32 +-
.../modeler/cayennemodeler-strings.properties | 2 +-
40 files changed, 1731 insertions(+), 776 deletions(-)
----------------------------------------------------------------------
[3/6] cayenne git commit: Upgrade RAT and add exclusion for Intellij
config files
Posted by am...@apache.org.
Upgrade RAT and add exclusion for Intellij config files
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5bc55aa8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5bc55aa8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5bc55aa8
Branch: refs/heads/master
Commit: 5bc55aa8d6d0960bb299360be126b0b1d8e37445
Parents: 4621bef
Author: Aristedes Maniatis <ar...@ish.com.au>
Authored: Fri Feb 12 10:20:51 2016 +1100
Committer: Aristedes Maniatis <ar...@ish.com.au>
Committed: Fri Feb 12 10:20:51 2016 +1100
----------------------------------------------------------------------
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bc55aa8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5adbcc7..6f74c2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -817,7 +817,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
+ <version>0.11</version>
</plugin>
<plugin>
<groupId>org.objectstyle.japp</groupId>
@@ -920,7 +920,8 @@
<exclude>**/*.eomodeld</exclude>
<exclude>**/*.fspec</exclude>
- <exclude>derby.log</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.iml</exclude>
</excludes>
</configuration>
</plugin>
[5/6] cayenne git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cayenne
Posted by am...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cayenne
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/dd32f1d0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/dd32f1d0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/dd32f1d0
Branch: refs/heads/master
Commit: dd32f1d079e54ba4d39ff3d1eb39b943eb8b7c7f
Parents: f7c02d1 9aba7ec
Author: Aristedes Maniatis <ar...@ish.com.au>
Authored: Fri Feb 12 10:34:24 2016 +1100
Committer: Aristedes Maniatis <ar...@ish.com.au>
Committed: Fri Feb 12 10:34:24 2016 +1100
----------------------------------------------------------------------
assembly/pom.xml | 14 -
.../org/apache/cayenne/CayenneDataObject.java | 91 ++++++
.../java/org/apache/cayenne/QueryResult.java | 56 ++++
.../access/translator/ParameterBinding.java | 9 +-
.../translator/batch/DeleteBatchTranslator.java | 13 +-
.../translator/batch/InsertBatchTranslator.java | 11 +-
.../batch/SoftDeleteBatchTranslator.java | 7 +-
.../translator/batch/UpdateBatchTranslator.java | 18 +-
.../translator/select/QueryAssembler.java | 59 ++--
.../translator/select/QueryAssemblerHelper.java | 22 +-
.../apache/cayenne/cache/EhCacheQueryCache.java | 30 +-
.../server/SyntheticNodeDataDomainProvider.java | 11 +-
.../dba/oracle/Oracle8LOBBatchTranslator.java | 14 +-
.../org/apache/cayenne/map/EntityResolver.java | 20 +-
.../java/org/apache/cayenne/query/SQLExec.java | 241 +++++++++++++++
.../apache/cayenne/util/QueryResultBuilder.java | 150 +++++++++
.../CayenneDataObjectSetToManyCollectionIT.java | 79 +++++
.../CayenneDataObjectSetToManyListIT.java | 301 +++++++++++++++++++
.../CayenneDataObjectSetToManyMapIT.java | 96 ++++++
.../CayenneDataObjectSetToManySetIT.java | 71 +++++
.../org/apache/cayenne/TranslationCase.java | 78 -----
.../translator/select/OrderingTranslatorIT.java | 129 ++------
.../select/QualifierTranslatorIT.java | 90 +++---
.../translator/select/TstQueryAssembler.java | 3 +-
.../AshwoodEntitySorter_InheritanceIT.java | 16 +-
.../SyntheticNodeDataDomainProviderTest.java | 42 +++
.../cayenne/exp/ExpressionTraversalTest.java | 117 ++++---
.../apache/cayenne/exp/TstBinaryExpSuite.java | 164 ----------
.../apache/cayenne/exp/TstExpressionCase.java | 55 ----
.../apache/cayenne/exp/TstExpressionSuite.java | 37 ---
.../apache/cayenne/exp/TstTernaryExpSuite.java | 45 ---
.../apache/cayenne/exp/TstTraversalHandler.java | 2 +-
.../apache/cayenne/exp/TstUnaryExpSuite.java | 71 -----
.../org/apache/cayenne/query/SQLExecIT.java | 74 +++++
.../org/apache/cayenne/query/TstQueryCase.java | 34 ---
docs/doc/src/main/resources/KEYS | 119 ++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 14 +
.../src/docbkx/performance-tuning.xml | 70 +++++
.../dialog/objentity/ObjRelationshipInfo.java | 32 +-
.../modeler/cayennemodeler-strings.properties | 2 +-
40 files changed, 1731 insertions(+), 776 deletions(-)
----------------------------------------------------------------------
[6/6] cayenne git commit: Merge branch 'ish/master'
Posted by am...@apache.org.
Merge branch 'ish/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/60a66d81
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/60a66d81
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/60a66d81
Branch: refs/heads/master
Commit: 60a66d813139f2f47c2504d993b180462ab6129d
Parents: dd32f1d ff38058
Author: Aristedes Maniatis <ar...@ish.com.au>
Authored: Fri Feb 12 10:34:58 2016 +1100
Committer: Aristedes Maniatis <ar...@ish.com.au>
Committed: Fri Feb 12 10:34:58 2016 +1100
----------------------------------------------------------------------
.../access/loader/filters/FiltersConfig.java | 19 +++++++++++++++++++
.../CayenneDataObjectSetToManyCollectionIT.java | 19 +++++++++++++++++++
.../cayenne/CayenneDataObjectSetToManySetIT.java | 19 +++++++++++++++++++
.../access/loader/filters/FiltersConfigTest.java | 19 +++++++++++++++++++
.../testdo/array_type/ArrayTestEntity.java | 19 +++++++++++++++++++
.../lifecycle_callbacks_order/Lifecycle.java | 19 +++++++++++++++++++
pom.xml | 5 +++--
7 files changed, 117 insertions(+), 2 deletions(-)
----------------------------------------------------------------------