[3/4] cayenne git commit: Merge PR #333
Merge PR #333 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a4ad4b6d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a4ad4b6d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a4ad4b6d Branch: refs/heads/master Commit: a4ad4b6d0d38750a0d9dac3c193c2e3d73989e14 Parents: 5855ffc d8d2ec5 Author: Nikita Timofeev Authored: Thu Oct 18 17:14:13 2018 +0300 Committer: Nikita Timofeev Committed: Thu Oct 18 17:14:13 2018 +0300 -- .../log/CompactSlf4jJdbcEventLogger.java| 196 +++ .../cayenne/log/Slf4jJdbcEventLogger.java | 2 +- .../log/CompactSlf4jJdbcEventLoggerTest.java| 93 + .../cayenne/log/Slf4jJdbcEventLoggerTest.java | 4 - .../src/test/resources/logback-test.xml | 42 5 files changed, 332 insertions(+), 5 deletions(-) --
[4/4] cayenne git commit: CAY-2485 Compact Slf4j Logger additional tests release notes cleanup
CAY-2485 Compact Slf4j Logger
additional tests
release notes
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7694a64d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7694a64d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7694a64d
Branch: refs/heads/master
Commit: 7694a64d3b83175e3e2ffd2db315e78c1bf0813f
Parents: a4ad4b6
Author: Nikita Timofeev
Authored: Thu Oct 18 17:29:52 2018 +0300
Committer: Nikita Timofeev
Committed: Thu Oct 18 17:29:52 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../log/CompactSlf4jJdbcEventLogger.java| 15 ++--
.../log/CompactSlf4jJdbcEventLoggerTest.java| 80 +---
.../src/test/resources/logback-test.xml | 42 --
4 files changed, 60 insertions(+), 78 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7694a64d/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e1c1e28..dce64ec 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ CAY-2473 Modeler: cleanup attributes and relationship editors
CAY-2474 Modeler: swap buttons in dialog toolbar
CAY-2475 Modeler: move inheritance icon to name column in objAttr table and
objRel table
CAY-2481 Support for Object[] as return type in SQLTemplate and SQLExec
+CAY-2485 Compact Slf4j Logger
CAY-2487 Removed usage of CayenneException.
CAY-2489 Add validation to the case of not to PK relationships
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7694a64d/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java
b/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java
index d4d57a9..b6ea8b3 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java
@@ -65,8 +65,7 @@ public class CompactSlf4jJdbcEventLogger extends
Slf4jJdbcEventLogger {
protected String processUnionSql(String sql) {
String modified = Pattern.compile(UNION.toLowerCase(),
Pattern.CASE_INSENSITIVE).matcher(sql).replaceAll(UNION);
-String[] queries = modified.split(
-UNION);
+String[] queries = modified.split(UNION);
List formattedQueries =
Arrays.stream(queries).map(this::trimSqlSelectColumns).collect(Collectors.toList());
StringBuilder buffer = new StringBuilder();
boolean used = false;
@@ -119,9 +118,7 @@ public class CompactSlf4jJdbcEventLogger extends
Slf4jJdbcEventLogger {
String key = null;
String value;
-for (int i = 0; i < bindings.length; i++) {
-ParameterBinding b = bindings[i];
-
+for (ParameterBinding b : bindings) {
if (b.isExcluded()) {
continue;
}
@@ -135,12 +132,12 @@ public class CompactSlf4jJdbcEventLogger extends
Slf4jJdbcEventLogger {
if (b.getExtendedType() != null) {
value = b.getExtendedType().toString(b.getValue());
-} else if(b.getValue() == null) {
+} else if (b.getValue() == null) {
value = "NULL";
} else {
-value = new StringBuilder(b.getValue().getClass().getName())
-.append("@")
-
.append(System.identityHashCode(b.getValue())).toString();
+value = b.getValue().getClass().getName() +
+"@" +
+System.identityHashCode(b.getValue());
}
List objects = bindingsMap.computeIfAbsent(key, k -> new
ArrayList<>());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7694a64d/cayenne-server/src/test/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLoggerTest.java
--
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLoggerTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLoggerTest.java
index 4846463..84ecd6c 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLoggerTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLoggerTest.java
@@ -25,32 +25,54 @@ import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.IntegerType;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import
[GitHub] cayenne pull request #333: Feature/compact event logger
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/333 ---
[1/4] cayenne git commit: CAY-2485 Added CompactSl4jJdbcEventLogger.
Repository: cayenne
Updated Branches:
refs/heads/master 5855ffc71 -> 7694a64d3
CAY-2485 Added CompactSl4jJdbcEventLogger.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a07bba55
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a07bba55
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a07bba55
Branch: refs/heads/master
Commit: a07bba5542a79f534b80bab28de2b1354a52d593
Parents: 20b166a
Author: kkomyak
Authored: Wed Oct 10 11:18:17 2018 +0300
Committer: kkomyak
Committed: Thu Oct 11 16:40:30 2018 +0300
--
cayenne-server/pom.xml | 6 +
.../cayenne/log/CompactSl4jJdbcEventLogger.java | 201 +++
.../log/CompactSl4jJdbcEventLoggerTest.java | 109 ++
.../cayenne/log/Slf4jJdbcEventLoggerTest.java | 4 -
.../org/apache/cayenne/log/TestAppender.java| 16 ++
.../src/test/resources/logback-test.xml | 42
6 files changed, 374 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a07bba55/cayenne-server/pom.xml
--
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 0ede0dd..e965ffa 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -46,6 +46,12 @@
+ ch.qos.logback
+ logback-classic
+ 1.0.13
+ test
+
+
junit
junit
test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a07bba55/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
b/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
new file mode 100644
index 000..38e4370
--- /dev/null
+++
b/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
@@ -0,0 +1,201 @@
+/*
+ * 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.log;
+
+import org.apache.cayenne.access.translator.DbAttributeBinding;
+import org.apache.cayenne.access.translator.ParameterBinding;
+import org.apache.cayenne.configuration.RuntimeProperties;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.map.DbAttribute;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * @since 4.1
+ */
+public class CompactSl4jJdbcEventLogger extends Slf4jJdbcEventLogger {
+
+private static final String UNION = "UNION";
+private static final String SELECT = "SELECT";
+private static final String FROM = "FROM";
+private static final String SPACE = " ";
+
+public CompactSl4jJdbcEventLogger(@Inject RuntimeProperties
runtimeProperties) {
+super(runtimeProperties);
+}
+
+@Override
+public void logQuery(String sql, ParameterBinding[] bindings) {
+if (!isLoggable()) {
+return;
+}
+
+String str;
+if (sql.toUpperCase().contains(UNION)) {
+str = processUnionSql(sql);
+} else {
+str = formatSqlSelectColumns(sql);
+}
+
+StringBuilder stringBuilder = new StringBuilder(str);
+appendParameters(stringBuilder, "bind", bindings);
+if (stringBuilder.length() < 0) {
+return;
+}
+
+super.logQuery(stringBuilder.toString(), new ParameterBinding[0]);
+}
+
+private String processUnionSql(String sql) {
+
+String modified =
[2/4] cayenne git commit: CAY-2485 Refactored logger to have possibility to test without adding logback.
CAY-2485 Refactored logger to have possibility to test without adding logback.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d8d2ec5d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d8d2ec5d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d8d2ec5d
Branch: refs/heads/master
Commit: d8d2ec5de67e0c203ee73a85bba7192fe0ba86f4
Parents: a07bba5
Author: kkomyak
Authored: Mon Oct 15 12:23:41 2018 +0300
Committer: kkomyak
Committed: Mon Oct 15 12:37:29 2018 +0300
--
cayenne-server/pom.xml | 6 -
.../cayenne/log/CompactSl4jJdbcEventLogger.java | 201 ---
.../log/CompactSlf4jJdbcEventLogger.java| 196 ++
.../cayenne/log/Slf4jJdbcEventLogger.java | 2 +-
.../log/CompactSl4jJdbcEventLoggerTest.java | 109 --
.../log/CompactSlf4jJdbcEventLoggerTest.java| 93 +
.../org/apache/cayenne/log/TestAppender.java| 16 --
7 files changed, 290 insertions(+), 333 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d8d2ec5d/cayenne-server/pom.xml
--
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index e965ffa..0ede0dd 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -46,12 +46,6 @@
- ch.qos.logback
- logback-classic
- 1.0.13
- test
-
-
junit
junit
test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d8d2ec5d/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
b/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
deleted file mode 100644
index 38e4370..000
---
a/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSl4jJdbcEventLogger.java
+++ /dev/null
@@ -1,201 +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.cayenne.log;
-
-import org.apache.cayenne.access.translator.DbAttributeBinding;
-import org.apache.cayenne.access.translator.ParameterBinding;
-import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.map.DbAttribute;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * @since 4.1
- */
-public class CompactSl4jJdbcEventLogger extends Slf4jJdbcEventLogger {
-
-private static final String UNION = "UNION";
-private static final String SELECT = "SELECT";
-private static final String FROM = "FROM";
-private static final String SPACE = " ";
-
-public CompactSl4jJdbcEventLogger(@Inject RuntimeProperties
runtimeProperties) {
-super(runtimeProperties);
-}
-
-@Override
-public void logQuery(String sql, ParameterBinding[] bindings) {
-if (!isLoggable()) {
-return;
-}
-
-String str;
-if (sql.toUpperCase().contains(UNION)) {
-str = processUnionSql(sql);
-} else {
-str = formatSqlSelectColumns(sql);
-}
-
-StringBuilder stringBuilder = new StringBuilder(str);
-appendParameters(stringBuilder, "bind", bindings);
-if (stringBuilder.length() < 0) {
-return;
-}
-
-super.logQuery(stringBuilder.toString(), new ParameterBinding[0]);
-}
-
-private String processUnionSql(String sql) {
-
-
[jira] [Updated] (CAY-2485) Compact Slf4j Logger
[ https://issues.apache.org/jira/browse/CAY-2485?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2485: - Fix Version/s: 4.1.M3 > Compact Slf4j Logger > > > Key: CAY-2485 > URL: https://issues.apache.org/jira/browse/CAY-2485 > Project: Cayenne > Issue Type: Improvement > Components: Core Library >Affects Versions: 4.1.M3 >Reporter: Konstantin >Priority: Minor > Fix For: 4.1.M3 > > > Create Compact Slf4j Logger: > * Remove logging begin and commit transactions > * Simplify selecting columns list > * Groupe binding values by field -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CAY-2489) Add validation to the case of not to PK relationships.
[ https://issues.apache.org/jira/browse/CAY-2489?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16655257#comment-16655257 ] ASF GitHub Bot commented on CAY-2489: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/334 > Add validation to the case of not to PK relationships. > -- > > Key: CAY-2489 > URL: https://issues.apache.org/jira/browse/CAY-2489 > Project: Cayenne > Issue Type: Task > Components: Core Library >Reporter: Arseni Bulatski >Priority: Major > Labels: pull-request-available > Fix For: 4.1.M3 > > > Now there are no any validation to this case. Need to add validation to the > case of not to PK relationships. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[1/2] cayenne git commit: CAY-2489 Add validation to the case of not to PK relationships
Repository: cayenne
Updated Branches:
refs/heads/master 23dc84b66 -> 5855ffc71
CAY-2489 Add validation to the case of not to PK relationships
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4dbcfd31
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4dbcfd31
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4dbcfd31
Branch: refs/heads/master
Commit: 4dbcfd31879aaa1ed070ada9d423f9166f9f8b4f
Parents: 20b166a
Author: Arseni Bulatski
Authored: Wed Oct 17 10:53:39 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Oct 17 10:57:42 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../validation/DbRelationshipValidator.java| 11 +++
.../validation/ObjRelationshipValidator.java | 17 ++---
.../org/apache/cayenne/map/DbRelationship.java | 6 +++---
4 files changed, 29 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4dbcfd31/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 2905bab..c670328 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -19,6 +19,7 @@ CAY-2471 Support multiple XML project versions
CAY-2473 Modeler: cleanup attributes and relationship editors
CAY-2474 Modeler: swap buttons in dialog toolbar
CAY-2475 Modeler: move inheritance icon to name column in objAttr table and
objRel table
+CAY-2489 Add validation to the case of not to PK relationships
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4dbcfd31/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java
--
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java
index 68854fb..8ddc5f9 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java
@@ -71,6 +71,17 @@ class DbRelationshipValidator extends
ConfigurationNodeValidator {
}
}
+if(!relationship.isToPK()) {
+DbRelationship reverseRelationship =
relationship.getReverseRelationship();
+if(reverseRelationship == null || !reverseRelationship.isToPK()) {
+addFailure(
+validationResult,
+relationship,
+"DbRelationship '%s' has join not to PK. Cayenne
doesn't allow this type of relashionships",
+toString(relationship));
+}
+}
+
if (Util.isEmptyString(relationship.getName())) {
addFailure(validationResult, relationship, "Unnamed
DbRelationship");
} else if
(relationship.getSourceEntity().getAttribute(relationship.getName()) != null) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4dbcfd31/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
--
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
index 733c300..d75cc1a 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
@@ -18,9 +18,6 @@
/
package org.apache.cayenne.project.validation;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
@@ -30,6 +27,9 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationResult;
+import java.util.Iterator;
+import java.util.List;
+
class ObjRelationshipValidator extends ConfigurationNodeValidator {
void validate(ObjRelationship relationship, ValidationResult
validationResult) {
@@ -126,6 +126,17 @@ class ObjRelationshipValidator extends
ConfigurationNodeValidator {
}
}
+if(!relationship.isToPK()) {
+ObjRelationship reverseRelationship =
relationship.getReverseRelationship();
+if(reverseRelationship == null || !reverseRelationship.isToPK()) {
+
[GitHub] cayenne pull request #334: CAY-2489 Add validation to the case of not to PK ...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/334 ---
[2/2] cayenne git commit: Merge PR #334
Merge PR #334 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5855ffc7 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5855ffc7 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5855ffc7 Branch: refs/heads/master Commit: 5855ffc71869661d6efe01105934ad81be97ee7b Parents: 23dc84b 4dbcfd3 Author: Nikita Timofeev Authored: Thu Oct 18 16:50:32 2018 +0300 Committer: Nikita Timofeev Committed: Thu Oct 18 16:50:32 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../validation/DbRelationshipValidator.java| 11 +++ .../validation/ObjRelationshipValidator.java | 17 ++--- .../org/apache/cayenne/map/DbRelationship.java | 6 +++--- 4 files changed, 29 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5855ffc7/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index 6762076,c670328..e1c1e28 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -19,8 -19,7 +19,9 @@@ CAY-2471 Support multiple XML project v CAY-2473 Modeler: cleanup attributes and relationship editors CAY-2474 Modeler: swap buttons in dialog toolbar CAY-2475 Modeler: move inheritance icon to name column in objAttr table and objRel table +CAY-2481 Support for Object[] as return type in SQLTemplate and SQLExec +CAY-2487 Removed usage of CayenneException. + CAY-2489 Add validation to the case of not to PK relationships Bug Fixes:
[jira] [Commented] (CAY-2487) Remove CayenneException useage
[ https://issues.apache.org/jira/browse/CAY-2487?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16655230#comment-16655230 ] ASF GitHub Bot commented on CAY-2487: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/332 > Remove CayenneException useage > -- > > Key: CAY-2487 > URL: https://issues.apache.org/jira/browse/CAY-2487 > Project: Cayenne > Issue Type: Improvement >Affects Versions: 4.1.M3 >Reporter: Konstantin >Priority: Minor > Labels: pull-request-available > > Remove usage of CayenneException. Use CayenneRuntimeException instead. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[GitHub] cayenne pull request #332: CAY-2487 Removed usage of CayenneException.
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/332 ---
[2/4] cayenne git commit: Merge PR #332
Merge PR #332 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f8dfaa0c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f8dfaa0c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f8dfaa0c Branch: refs/heads/master Commit: f8dfaa0c5fa6104ac4eb0b876283c4bd38832ed2 Parents: 553de26 52df4e1 Author: Nikita Timofeev Authored: Thu Oct 18 16:18:42 2018 +0300 Committer: Nikita Timofeev Committed: Thu Oct 18 16:18:42 2018 +0300 -- .../org/apache/cayenne/CayenneException.java| 7 +++ .../apache/cayenne/CayenneRuntimeException.java | 18 -- .../apache/cayenne/access/jdbc/BatchAction.java | 6 +++--- .../cayenne/access/jdbc/SQLTemplateAction.java | 4 ++-- .../cayenne/access/types/ByteArrayType.java | 4 ++-- .../apache/cayenne/access/types/CharType.java | 4 ++-- .../access/util/IteratedSelectObserver.java | 1 - .../dba/oracle/Oracle8LOBBatchAction.java | 3 +-- .../cayenne/dba/oracle/OracleBatchAction.java | 4 ++-- .../apache/cayenne/CayenneExceptionTest.java| 20 ++-- .../cayenne/CayenneRuntimeExceptionTest.java| 12 ++-- .../org/apache/cayenne/ConfigExceptionTest.java | 8 .../java/org/apache/cayenne/util/UtilTest.java | 6 +++--- 13 files changed, 58 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f8dfaa0c/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java --
[4/4] cayenne git commit: Cleanup
Cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/23dc84b6 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/23dc84b6 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/23dc84b6 Branch: refs/heads/master Commit: 23dc84b66f7150bea336020fb9cc6c82a042 Parents: adf9a80 Author: Nikita Timofeev Authored: Thu Oct 18 16:30:08 2018 +0300 Committer: Nikita Timofeev Committed: Thu Oct 18 16:30:08 2018 +0300 -- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/23dc84b6/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 3c2dfc5..6762076 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -19,7 +19,7 @@ CAY-2471 Support multiple XML project versions CAY-2473 Modeler: cleanup attributes and relationship editors CAY-2474 Modeler: swap buttons in dialog toolbar CAY-2475 Modeler: move inheritance icon to name column in objAttr table and objRel table -CAY-2481 Methods to return Object[] after SQLTemplate and SQLExec perform +CAY-2481 Support for Object[] as return type in SQLTemplate and SQLExec CAY-2487 Removed usage of CayenneException. Bug Fixes:
[1/4] cayenne git commit: CAY-2487 Removed usage of CayenneException. CayenneException marked as deprecated.
Repository: cayenne
Updated Branches:
refs/heads/master 553de2669 -> 23dc84b66
CAY-2487 Removed usage of CayenneException. CayenneException marked as
deprecated.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/52df4e18
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/52df4e18
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/52df4e18
Branch: refs/heads/master
Commit: 52df4e18424965ed4947765be88461b560b2ea52
Parents: 20b166a
Author: kkomyak
Authored: Mon Oct 15 15:13:33 2018 +0300
Committer: kkomyak
Committed: Mon Oct 15 15:13:33 2018 +0300
--
.../org/apache/cayenne/CayenneException.java| 7 +++
.../apache/cayenne/CayenneRuntimeException.java | 18 --
.../apache/cayenne/access/jdbc/BatchAction.java | 6 +++---
.../cayenne/access/jdbc/SQLTemplateAction.java | 4 ++--
.../cayenne/access/types/ByteArrayType.java | 4 ++--
.../apache/cayenne/access/types/CharType.java | 4 ++--
.../access/util/IteratedSelectObserver.java | 1 -
.../dba/oracle/Oracle8LOBBatchAction.java | 3 +--
.../cayenne/dba/oracle/OracleBatchAction.java | 4 ++--
.../apache/cayenne/CayenneExceptionTest.java| 20 ++--
.../cayenne/CayenneRuntimeExceptionTest.java| 12 ++--
.../org/apache/cayenne/ConfigExceptionTest.java | 8
.../java/org/apache/cayenne/util/UtilTest.java | 6 +++---
13 files changed, 58 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/52df4e18/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
b/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
index 0026a4c..e951da1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
@@ -23,9 +23,12 @@ import org.apache.cayenne.util.LocalizedStringsHandler;
/**
+ * @deprecated please @since 4.1 use {@link CayenneRuntimeException}
+ *
* A generic checked exception that may be thrown by Cayenne framework. All
checked
* exceptions in Cayenne inherit from this class.
*/
+@Deprecated
public class CayenneException extends Exception {
private static String exceptionLabel;
@@ -36,6 +39,10 @@ public class CayenneException extends Exception {
exceptionLabel = "[v." + version + " " + date + "] ";
}
+/**
+ * @deprecated please @since 4.1 use {@link
CayenneRuntimeException#getExceptionLabel()}
+ */
+@Deprecated
public static String getExceptionLabel() {
return exceptionLabel;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/52df4e18/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
b/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
index 135b50c..1d06614 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
@@ -19,12 +19,26 @@
package org.apache.cayenne;
+import org.apache.cayenne.util.LocalizedStringsHandler;
+
/**
* A generic unchecked exception that may be thrown by Cayenne framework. All
runtime
* exceptions in Cayenne inherit from this class.
*/
public class CayenneRuntimeException extends RuntimeException {
+private static String exceptionLabel;
+
+static {
+String version = LocalizedStringsHandler.getString("cayenne.version");
+String date = LocalizedStringsHandler.getString("cayenne.build.date");
+exceptionLabel = "[v." + version + " " + date + "] ";
+}
+
+public static String getExceptionLabel() {
+return exceptionLabel;
+}
+
/**
* Creates new CayenneRuntimeException without detail message.
*/
@@ -74,7 +88,7 @@ public class CayenneRuntimeException extends RuntimeException
{
public String getMessage() {
String message = super.getMessage();
return (message != null)
-? CayenneException.getExceptionLabel() + message
-: CayenneException.getExceptionLabel() + "(no message)";
+? exceptionLabel + message
+: exceptionLabel + "(no message)";
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/52df4e18/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
--
diff
[3/4] cayenne git commit: Merge PR #332
Merge PR #332
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/adf9a80b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/adf9a80b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/adf9a80b
Branch: refs/heads/master
Commit: adf9a80b2de93d743c3ce31197a494a2b0a05a98
Parents: f8dfaa0
Author: Nikita Timofeev
Authored: Thu Oct 18 16:29:36 2018 +0300
Committer: Nikita Timofeev
Committed: Thu Oct 18 16:29:36 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../org/apache/cayenne/CayenneException.java| 18 -
.../apache/cayenne/CayenneRuntimeException.java | 3 +++
.../apache/cayenne/access/jdbc/BatchAction.java | 11 ++
.../cayenne/dba/oracle/OracleBatchAction.java | 3 +--
.../apache/cayenne/CayenneExceptionTest.java| 21 ++--
6 files changed, 27 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/adf9a80b/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 714a8ff..3c2dfc5 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ CAY-2473 Modeler: cleanup attributes and relationship editors
CAY-2474 Modeler: swap buttons in dialog toolbar
CAY-2475 Modeler: move inheritance icon to name column in objAttr table and
objRel table
CAY-2481 Methods to return Object[] after SQLTemplate and SQLExec perform
+CAY-2487 Removed usage of CayenneException.
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/adf9a80b/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
b/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
index e951da1..017cf35 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
@@ -19,32 +19,22 @@
package org.apache.cayenne;
-import org.apache.cayenne.util.LocalizedStringsHandler;
-
/**
- * @deprecated please @since 4.1 use {@link CayenneRuntimeException}
- *
* A generic checked exception that may be thrown by Cayenne framework. All
checked
* exceptions in Cayenne inherit from this class.
+ *
+ * @deprecated since 4.1 use {@link CayenneRuntimeException} instead
*/
@Deprecated
public class CayenneException extends Exception {
-private static String exceptionLabel;
-
-static {
-String version = LocalizedStringsHandler.getString("cayenne.version");
-String date = LocalizedStringsHandler.getString("cayenne.build.date");
-exceptionLabel = "[v." + version + " " + date + "] ";
-}
-
/**
- * @deprecated please @since 4.1 use {@link
CayenneRuntimeException#getExceptionLabel()}
+ * @deprecated since 4.1 use {@link
CayenneRuntimeException#getExceptionLabel()}
*/
@Deprecated
public static String getExceptionLabel() {
-return exceptionLabel;
+return CayenneRuntimeException.getExceptionLabel();
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/adf9a80b/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
b/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
index 1d06614..02a8e89 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
@@ -35,6 +35,9 @@ public class CayenneRuntimeException extends RuntimeException
{
exceptionLabel = "[v." + version + " " + date + "] ";
}
+/**
+ * @since 4.1 moved from deprecated {@link CayenneException}
+ */
public static String getExceptionLabel() {
return exceptionLabel;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/adf9a80b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
index 132c6be..da5d942 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.access.jdbc;
-import
