[GitHub] cayenne pull request #295: Update cgen dialog
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/295 Update cgen dialog You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne cgenDialog Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/295.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #295 commit e452059bb7a56e66bf3c2ee5fa202f66dbb7de5c Author: Arseni Bulatski Date: 2018-07-06T12:59:27Z Update cgen dialog (cherry picked from commit a799a39) ---
[jira] [Closed] (CAY-2442) Broken EventBridge providers implementations
[ https://issues.apache.org/jira/browse/CAY-2442?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev closed CAY-2442. Resolution: Fixed *4.1*: https://github.com/apache/cayenne/commit/5bd1ff0d53ce26491e02b72e1eee8b873ea5dcf3 *4.0*: https://github.com/apache/cayenne/commit/7c849e7479460698d3ff53990ab65b58d26d77c7 > Broken EventBridge providers implementations > > > Key: CAY-2442 > URL: https://issues.apache.org/jira/browse/CAY-2442 > Project: Cayenne > Issue Type: Bug > Components: Core Library >Affects Versions: 4.1.M1, 4.0.RC1 >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev >Priority: Blocker > Fix For: 4.0.RC2, 4.1.M2 > > > All three {{EventBridge}} providers in Cayenne (JMS, JGroups and XMPP) are > broken because of circular DI dependency ({{DataDomain <-> EventBridge}}). -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[1/3] cayenne git commit: CAY-2442 Broken EventBridge providers implementations
Repository: cayenne Updated Branches: refs/heads/master 22c2e789e -> b2c611036 CAY-2442 Broken EventBridge providers implementations (cherry picked from commit 7c849e7) Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5bd1ff0d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5bd1ff0d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5bd1ff0d Branch: refs/heads/master Commit: 5bd1ff0d53ce26491e02b72e1eee8b873ea5dcf3 Parents: 22c2e78 Author: Nikita Timofeev Authored: Thu Jul 5 17:43:42 2018 +0300 Committer: Nikita Timofeev Committed: Fri Jul 6 10:59:09 2018 +0300 -- .../cayenne/access/DefaultDataRowStoreFactory.java | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bd1ff0d/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDataRowStoreFactory.java -- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDataRowStoreFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDataRowStoreFactory.java index 22b5e2f..4925a6d 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDataRowStoreFactory.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDataRowStoreFactory.java @@ -23,9 +23,10 @@ import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.di.DIRuntimeException; import org.apache.cayenne.di.Inject; +import org.apache.cayenne.di.Provider; import org.apache.cayenne.event.EventBridge; import org.apache.cayenne.event.EventManager; -import org.apache.cayenne.event.NoopEventBridge; +import org.apache.cayenne.event.NoopEventBridgeProvider; import java.util.Map; @@ -36,7 +37,7 @@ import java.util.Map; */ public class DefaultDataRowStoreFactory implements DataRowStoreFactory { -EventBridge eventBridge; +Provider eventBridgeProvider; EventManager eventManager; @@ -44,13 +45,13 @@ public class DefaultDataRowStoreFactory implements DataRowStoreFactory { boolean isNoopEventBridge; -public DefaultDataRowStoreFactory(@Inject EventBridge eventBridge, +public DefaultDataRowStoreFactory(@Inject Provider eventBridgeProvider, @Inject EventManager eventManager, @Inject RuntimeProperties properties) { -this.eventBridge = eventBridge; +this.eventBridgeProvider = eventBridgeProvider; this.eventManager = eventManager; this.properties = properties; -isNoopEventBridge = eventBridge instanceof NoopEventBridge; +isNoopEventBridge = eventBridgeProvider instanceof NoopEventBridgeProvider; } @Override @@ -65,7 +66,7 @@ public class DefaultDataRowStoreFactory implements DataRowStoreFactory { return; } try { -store.setEventBridge(eventBridge); +store.setEventBridge(eventBridgeProvider.get()); store.startListeners(); } catch (Exception ex) { throw new CayenneRuntimeException("Error initializing DataRowStore.", ex);
[3/3] cayenne git commit: CAY-2442 Broken EventBridge providers implementations release notes
CAY-2442 Broken EventBridge providers implementations release notes (cherry picked from commit 63f7375) Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b2c61103 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b2c61103 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b2c61103 Branch: refs/heads/master Commit: b2c611036a154e4c3e1a3c5488e459188479d56a Parents: 09fa171 Author: Nikita Timofeev Authored: Thu Jul 5 17:53:36 2018 +0300 Committer: Nikita Timofeev Committed: Fri Jul 6 11:01:41 2018 +0300 -- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/b2c61103/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index b7d8a7c..76a7eea 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -62,6 +62,7 @@ CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS CAY-2430 Modeler: Redo throws NPE CAY-2435 cdbimport: procedure parameters are not imported CAY-2436 NPE in CayenneRuntimeException constructor +CAY-2442 Broken EventBridge providers implementations -- Release: 4.1.M1
[2/3] cayenne git commit: CAY-2442 Broken EventBridge providers implementations tests
CAY-2442 Broken EventBridge providers implementations tests (cherry picked from commit e795b28) Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/09fa1719 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/09fa1719 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/09fa1719 Branch: refs/heads/master Commit: 09fa17190509b1d03818776950e9e45fdb5692b6 Parents: 5bd1ff0 Author: Nikita Timofeev Authored: Thu Jul 5 18:21:05 2018 +0300 Committer: Nikita Timofeev Committed: Fri Jul 6 11:00:58 2018 +0300 -- .../apache/cayenne/event/JavaGroupsBridge.java | 7 +-- .../event/JavaGroupsBridgeProviderTest.java | 9 ++-- .../cayenne/event/JMSBridgeProviderTest.java| 6 +-- .../cayenne/event/XMPPBridgeProviderTest.java | 9 ++-- .../apache/cayenne/event/JGroupsModuleIT.java | 53 .../org/apache/cayenne/event/JMSModuleIT.java | 53 .../org/apache/cayenne/event/XMPPModuleIT.java | 53 7 files changed, 176 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/09fa1719/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JavaGroupsBridge.java -- diff --git a/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JavaGroupsBridge.java b/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JavaGroupsBridge.java index cd7bae2..eee4622 100644 --- a/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JavaGroupsBridge.java +++ b/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JavaGroupsBridge.java @@ -197,9 +197,10 @@ public class JavaGroupsBridge extends EventBridge implements MessageListener { adapter.stop(); } -channel.close(); -} -finally { +if(channel != null) { +channel.close(); +} +} finally { adapter = null; channel = null; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/09fa1719/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JavaGroupsBridgeProviderTest.java -- diff --git a/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JavaGroupsBridgeProviderTest.java b/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JavaGroupsBridgeProviderTest.java index 00232d4..8df03d8 100644 --- a/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JavaGroupsBridgeProviderTest.java +++ b/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JavaGroupsBridgeProviderTest.java @@ -37,12 +37,13 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; public class JavaGroupsBridgeProviderTest { -private final DataDomain DOMAIN = new DataDomain("test"); -private final EventManager EVENT_MANAGER = new DefaultEventManager(); +private static final DataDomain DOMAIN = new DataDomain("test"); +private static final EventManager EVENT_MANAGER = new DefaultEventManager(); protected static final String MCAST_ADDRESS_TEST = "192.168.0.0"; protected static final String MCAST_PORT_TEST = "1521"; protected static final String CONFIG_URL_TEST = "somehost.com"; @@ -79,10 +80,10 @@ public class JavaGroupsBridgeProviderTest { assertEquals(JavaGroupsBridge.MCAST_ADDRESS_DEFAULT, bridge.getMulticastAddress()); assertEquals(JavaGroupsBridge.MCAST_PORT_DEFAULT, bridge.getMulticastPort()); -assertEquals(null, bridge.getConfigURL()); +assertNull(bridge.getConfigURL()); } -class DefaultBindings implements Module { +static class DefaultBindings implements Module { @Override public void configure(Binder binder) { binder.bindMap(String.class, Constants.PROPERTIES_MAP); http://git-wip-us.apache.org/repos/asf/cayenne/blob/09fa1719/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSBridgeProviderTest.java -- diff --git a/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSBridgeProviderTest.java b/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSBridgeProviderTest.java index 83404eb..9c77f05 100644 --- a/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSBridgeProviderTest.java +++ b/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSBridgeProviderTest.java @@ -41,8 +41,8 @@ import static org.junit.Assert.assertTrue; public class JMSBridgeProviderTest { -private final DataDomain DOMAIN = new DataDomain("test"); -private final EventManager EVENT_