You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/07/21 14:48:33 UTC
[cayenne] branch master updated (c39d93244 -> 97ede0950)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from c39d93244 CAY-2752 Rename queryTemplate to dataMapTemplate in the cgen config - update build tools configs
new eacb52cd5 CAY-2752 Rename queryTemplate to dataMapTemplate in the cgen config - release and update notes
new 97ede0950 CAY-2498 Rename packages to prevent crossing package names - rename package in the project-compatibility module
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES.txt | 2 ++
UPGRADE.txt | 3 +++
.../project/compatibility/ProjectCompatibilityModule.java | 4 ++--
.../CompatibilityDataChannelDescriptorLoader.java | 13 +++++--------
.../configuration}/CompatibilityDataMapLoader.java | 5 ++++-
.../compatibility/CompatibilityUpgradeServiceIT.java | 4 ++--
.../CompatibilityDataChannelDescriptorLoaderIT.java | 7 ++++---
.../configuration}/CompatibilityDataMapLoaderIT.java | 7 ++++---
.../cayenne/configuration/xml/DataChannelHandler.java | 4 ++--
9 files changed, 28 insertions(+), 21 deletions(-)
rename cayenne-project-compatibility/src/main/java/org/apache/cayenne/{configuration/xml => project/compatibility/configuration}/CompatibilityDataChannelDescriptorLoader.java (93%)
rename cayenne-project-compatibility/src/main/java/org/apache/cayenne/{configuration/xml => project/compatibility/configuration}/CompatibilityDataMapLoader.java (94%)
rename cayenne-project-compatibility/src/test/java/org/apache/cayenne/{configuration/xml => project/compatibility/configuration}/CompatibilityDataChannelDescriptorLoaderIT.java (93%)
rename cayenne-project-compatibility/src/test/java/org/apache/cayenne/{configuration/xml => project/compatibility/configuration}/CompatibilityDataMapLoaderIT.java (91%)
[cayenne] 02/02: CAY-2498 Rename packages to prevent crossing package names - rename package in the project-compatibility module
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 97ede0950bd9b9d0a97972fcf8aeb34b9ff2c320
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Jul 21 17:48:22 2022 +0300
CAY-2498 Rename packages to prevent crossing package names
- rename package in the project-compatibility module
---
RELEASE-NOTES.txt | 1 +
.../project/compatibility/ProjectCompatibilityModule.java | 4 ++--
.../CompatibilityDataChannelDescriptorLoader.java | 13 +++++--------
.../configuration}/CompatibilityDataMapLoader.java | 5 ++++-
.../compatibility/CompatibilityUpgradeServiceIT.java | 4 ++--
.../CompatibilityDataChannelDescriptorLoaderIT.java | 7 ++++---
.../configuration}/CompatibilityDataMapLoaderIT.java | 7 ++++---
.../cayenne/configuration/xml/DataChannelHandler.java | 4 ++--
8 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 9ceb5f3c5..21a413d41 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -14,6 +14,7 @@ Date:
Changes/New Features:
CAY-2378 Switch usage of SelectQuery to ObjectSelect internally
+CAY-2498 Rename packages to prevent crossing package names
CAY-2737 Cayenne 4.3: cleanup deprecated code
CAY-2741 Cleanup TransactionDescriptor and deprecate DefaultTransactionDescriptor
CAY-2742 Switch minimum required Java version to 11
diff --git a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModule.java b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModule.java
index 82e704e1f..a86efa84b 100644
--- a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModule.java
+++ b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModule.java
@@ -21,8 +21,8 @@ package org.apache.cayenne.project.compatibility;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataMapLoader;
-import org.apache.cayenne.configuration.xml.CompatibilityDataChannelDescriptorLoader;
-import org.apache.cayenne.configuration.xml.CompatibilityDataMapLoader;
+import org.apache.cayenne.project.compatibility.configuration.CompatibilityDataChannelDescriptorLoader;
+import org.apache.cayenne.project.compatibility.configuration.CompatibilityDataMapLoader;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.project.ProjectModule;
diff --git a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoader.java
similarity index 93%
rename from cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java
rename to cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoader.java
index 49ea1688b..4fa520ca1 100644
--- a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java
+++ b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoader.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.xml;
+package org.apache.cayenne.project.compatibility.configuration;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -30,9 +30,11 @@ import javax.xml.transform.stream.StreamResult;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.configuration.ConfigurationTree;
import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.configuration.xml.DataChannelHandler;
+import org.apache.cayenne.configuration.xml.LoaderContext;
+import org.apache.cayenne.configuration.xml.XMLDataChannelDescriptorLoader;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
-import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.project.compatibility.CompatibilityUpgradeService;
import org.apache.cayenne.project.compatibility.DocumentProvider;
import org.apache.cayenne.project.upgrade.UpgradeMetaData;
@@ -111,12 +113,7 @@ public class CompatibilityDataChannelDescriptorLoader extends XMLDataChannelDesc
XMLReader parser = Util.createXmlReader();
LoaderContext loaderContext = new LoaderContext(parser, handlerFactory);
- loaderContext.addDataMapListener(new DataMapLoaderListener() {
- @Override
- public void onDataMapLoaded(DataMap dataMap) {
- descriptor.getDataMaps().add(dataMap);
- }
- });
+ loaderContext.addDataMapListener(dataMap -> descriptor.getDataMaps().add(dataMap));
DataChannelHandler rootHandler = new DataChannelHandler(this, descriptor, loaderContext);
parser.setContentHandler(rootHandler);
diff --git a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataMapLoader.java b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoader.java
similarity index 94%
rename from cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataMapLoader.java
rename to cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoader.java
index 1385b0163..e7ccf5732 100644
--- a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataMapLoader.java
+++ b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoader.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.xml;
+package org.apache.cayenne.project.compatibility.configuration;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -28,6 +28,9 @@ import javax.xml.transform.stream.StreamResult;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.configuration.xml.LoaderContext;
+import org.apache.cayenne.configuration.xml.RootDataMapHandler;
+import org.apache.cayenne.configuration.xml.XMLDataMapLoader;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.map.DataMap;
diff --git a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java
index 8fda72054..9dd17d138 100644
--- a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java
+++ b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/CompatibilityUpgradeServiceIT.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
public class CompatibilityUpgradeServiceIT {
@Test
- public void testUpgradeFullProjectDom() throws Exception {
+ public void testUpgradeFullProjectDom() {
Injector injector = getInjector();
CompatibilityUpgradeService upgradeService = (CompatibilityUpgradeService)injector
@@ -64,7 +64,7 @@ public class CompatibilityUpgradeServiceIT {
}
@Test
- public void testUpgradeStandAloneDataMapDom() throws Exception {
+ public void testUpgradeStandAloneDataMapDom() {
Injector injector = getInjector();
CompatibilityUpgradeService upgradeService = (CompatibilityUpgradeService)injector
diff --git a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoaderIT.java b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoaderIT.java
similarity index 93%
rename from cayenne-project-compatibility/src/test/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoaderIT.java
rename to cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoaderIT.java
index ea66609de..3667857aa 100644
--- a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoaderIT.java
+++ b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoaderIT.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.xml;
+package org.apache.cayenne.project.compatibility.configuration;
import java.net.URL;
@@ -25,6 +25,7 @@ import org.apache.cayenne.configuration.ConfigurationTree;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataMapLoader;
+import org.apache.cayenne.configuration.xml.XMLReaderProvider;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.map.DataMap;
@@ -42,13 +43,13 @@ import static org.junit.Assert.*;
public class CompatibilityDataChannelDescriptorLoaderIT {
@Test
- public void testLoad() throws Exception {
+ public void testLoad() {
Injector injector = getInjector();
DataChannelDescriptorLoader loader = injector.getInstance(DataChannelDescriptorLoader.class);
assertTrue(loader instanceof CompatibilityDataChannelDescriptorLoader);
- URL resourceUrl = getClass().getResource("../../project/compatibility/cayenne-project-v6.xml");
+ URL resourceUrl = getClass().getResource("../cayenne-project-v6.xml");
Resource resource = new URLResource(resourceUrl);
ConfigurationTree<DataChannelDescriptor> configurationTree = loader.load(resource);
diff --git a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/configuration/xml/CompatibilityDataMapLoaderIT.java b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoaderIT.java
similarity index 91%
rename from cayenne-project-compatibility/src/test/java/org/apache/cayenne/configuration/xml/CompatibilityDataMapLoaderIT.java
rename to cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoaderIT.java
index e5eb4f735..b1f9c50e4 100644
--- a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/configuration/xml/CompatibilityDataMapLoaderIT.java
+++ b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataMapLoaderIT.java
@@ -17,11 +17,12 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.xml;
+package org.apache.cayenne.project.compatibility.configuration;
import java.net.URL;
import org.apache.cayenne.configuration.DataMapLoader;
+import org.apache.cayenne.configuration.xml.XMLReaderProvider;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.map.DataMap;
@@ -41,13 +42,13 @@ import static org.junit.Assert.assertTrue;
public class CompatibilityDataMapLoaderIT {
@Test
- public void testLoad() throws Exception {
+ public void testLoad() {
Injector injector = getInjector();
DataMapLoader loader = injector.getInstance(DataMapLoader.class);
assertTrue(loader instanceof CompatibilityDataMapLoader);
- URL resourceUrl = getClass().getResource("../../project/compatibility/test-map-v6.map.xml");
+ URL resourceUrl = getClass().getResource("../test-map-v6.map.xml");
Resource resource = new URLResource(resourceUrl);
DataMap dataMap = loader.load(resource);
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java
index bf1fe73f8..72136bdfa 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java
@@ -28,7 +28,7 @@ import org.xml.sax.ContentHandler;
/**
* @since 4.1
*/
-final class DataChannelHandler extends VersionAwareHandler {
+public final class DataChannelHandler extends VersionAwareHandler {
private static final Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class);
@@ -37,7 +37,7 @@ final class DataChannelHandler extends VersionAwareHandler {
private XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader;
DataChannelDescriptor descriptor;
- DataChannelHandler(XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader, DataChannelDescriptor dataChannelDescriptor, LoaderContext loaderContext) {
+ public DataChannelHandler(XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader, DataChannelDescriptor dataChannelDescriptor, LoaderContext loaderContext) {
super(loaderContext, DOMAIN_TAG);
this.xmlDataChannelDescriptorLoader = xmlDataChannelDescriptorLoader;
this.descriptor = dataChannelDescriptor;
[cayenne] 01/02: CAY-2752 Rename queryTemplate to dataMapTemplate in the cgen config - release and update notes
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit eacb52cd502340563774980ec7b8a5fdc926c649
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Jul 20 18:55:14 2022 +0300
CAY-2752 Rename queryTemplate to dataMapTemplate in the cgen config
- release and update notes
---
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 3 +++
2 files changed, 4 insertions(+)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 9a8ce96b9..9ceb5f3c5 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -19,6 +19,7 @@ CAY-2741 Cleanup TransactionDescriptor and deprecate DefaultTransactionDescripto
CAY-2742 Switch minimum required Java version to 11
CAY-2747 Update project XML version to 11
CAY-2751 Simplify DataNode configuration
+CAY-2752 Rename queryTemplate to dataMapTemplate in the cgen config
Bug Fixes:
diff --git a/UPGRADE.txt b/UPGRADE.txt
index c0815c17c..2d69d5fb6 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -25,6 +25,9 @@ Most notable removals are SelectQuery and these Cayenne modules:
* Per CAY-2747 Cayenne XML schemas are updated, so you need to update you projects (just open them in the Modeler
or use cayenne-project-compatibility module)
+* Per CAY-2752 code generation configuration has minor changes. You need to review and update
+Maven, Gradle and Ant configs accordingly.
+
UPGRADING TO 4.2.M2