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 2018/12/19 07:45:01 UTC
[1/4] cayenne git commit: Fix detection of NoopEventBridge (provider
is actually a DefaultScopeProvider returning a NoopEventBridge)
Repository: cayenne
Updated Branches:
refs/heads/STABLE-4.0 cbeb58ab5 -> a07cd1c98
Fix detection of NoopEventBridge (provider is actually a DefaultScopeProvider returning a NoopEventBridge)
(cherry picked from commit 220e1cb0189e2446214473959c8174c253eb6053)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/37793337
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/37793337
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/37793337
Branch: refs/heads/STABLE-4.0
Commit: 377933370b40b6b3739d1e2613ecc3f64c9f5858
Parents: cbeb58a
Author: John Huss <jo...@apache.org>
Authored: Mon Dec 10 23:20:47 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Dec 18 16:07:24 2018 +0300
----------------------------------------------------------------------
.../cayenne/access/DefaultDataRowStoreFactory.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/37793337/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 4925a6d..68f6d1d 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
@@ -26,9 +26,7 @@ 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.NoopEventBridgeProvider;
-
-import java.util.Map;
+import org.apache.cayenne.event.NoopEventBridge;
/**
* A default implementation of {@link DataRowStoreFactory}
@@ -43,15 +41,12 @@ public class DefaultDataRowStoreFactory implements DataRowStoreFactory {
RuntimeProperties properties;
- boolean isNoopEventBridge;
-
public DefaultDataRowStoreFactory(@Inject Provider<EventBridge> eventBridgeProvider,
@Inject EventManager eventManager,
@Inject RuntimeProperties properties) {
this.eventBridgeProvider = eventBridgeProvider;
this.eventManager = eventManager;
this.properties = properties;
- isNoopEventBridge = eventBridgeProvider instanceof NoopEventBridgeProvider;
}
@Override
@@ -62,11 +57,12 @@ public class DefaultDataRowStoreFactory implements DataRowStoreFactory {
}
private void setUpEventBridge(DataRowStore store) {
- if(isNoopEventBridge) {
- return;
- }
try {
- store.setEventBridge(eventBridgeProvider.get());
+ EventBridge eventBridge = eventBridgeProvider.get();
+ if (eventBridge instanceof NoopEventBridge) {
+ return;
+ }
+ store.setEventBridge(eventBridge);
store.startListeners();
} catch (Exception ex) {
throw new CayenneRuntimeException("Error initializing DataRowStore.", ex);
[2/4] cayenne git commit: CAY-2505 EventBridge providers should be
bound without scope
Posted by nt...@apache.org.
CAY-2505 EventBridge providers should be bound without scope
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3f0f373f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3f0f373f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3f0f373f
Branch: refs/heads/STABLE-4.0
Commit: 3f0f373ff8d4a436f757778a7deaf3123feb1d02
Parents: 3779333
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Dec 19 10:43:34 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Dec 19 10:43:34 2018 +0300
----------------------------------------------------------------------
.../apache/cayenne/access/DefaultDataRowStoreFactoryIT.java | 6 ++++--
.../src/main/java/org/apache/cayenne/event/JGroupsModule.java | 2 +-
.../test/java/org/apache/cayenne/event/JGroupsModuleIT.java | 7 ++++++-
.../src/main/java/org/apache/cayenne/event/JMSModule.java | 2 +-
.../src/test/java/org/apache/cayenne/event/JMSModuleIT.java | 7 ++++++-
.../src/main/java/org/apache/cayenne/event/XMPPModule.java | 2 +-
.../src/test/java/org/apache/cayenne/event/XMPPModuleIT.java | 7 ++++++-
7 files changed, 25 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3f0f373f/cayenne-server/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
index c46c04f..6f32dce 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
@@ -29,10 +29,10 @@ import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.event.DefaultEventManager;
import org.apache.cayenne.event.EventBridge;
-import org.apache.cayenne.event.NoopEventBridgeProvider;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.event.MockEventBridge;
import org.apache.cayenne.event.MockEventBridgeProvider;
+import org.apache.cayenne.event.NoopEventBridgeProvider;
import org.apache.cayenne.log.Slf4jJdbcEventLogger;
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.tx.DefaultTransactionFactory;
@@ -46,12 +46,13 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
@UseServerRuntime(CayenneProjects.MULTI_TIER_PROJECT)
public class DefaultDataRowStoreFactoryIT extends ServerCase {
@Test
- public void testGetDataRowStore() throws Exception {
+ public void testGetDataRowStore() {
ServerRuntime runtime = getUnitTestInjector().getInstance(ServerRuntime.class);
DataRowStore dataStore = runtime.getInjector().getInstance(DataRowStoreFactory.class)
.createDataRowStore("test");
@@ -85,6 +86,7 @@ public class DefaultDataRowStoreFactoryIT extends ServerCase {
assertNotNull(dataStore);
assertEquals(dataStore.maximumSize(), CACHE_SIZE);
+ assertNull(dataStore.getEventBridge());
}
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3f0f373f/eventbridges/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsModule.java
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsModule.java b/eventbridges/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsModule.java
index 77738c3..dcbea94 100644
--- a/eventbridges/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsModule.java
+++ b/eventbridges/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsModule.java
@@ -58,6 +58,6 @@ public class JGroupsModule implements Module {
contributeMulticastAddress(binder, JavaGroupsBridge.MCAST_ADDRESS_DEFAULT);
contributeMulticastPort(binder, JavaGroupsBridge.MCAST_PORT_DEFAULT_INT);
- binder.bind(EventBridge.class).toProvider(JavaGroupsBridgeProvider.class);
+ binder.bind(EventBridge.class).toProvider(JavaGroupsBridgeProvider.class).withoutScope();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3f0f373f/eventbridges/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JGroupsModuleIT.java
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JGroupsModuleIT.java b/eventbridges/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JGroupsModuleIT.java
index cc5e7e0..75f5521 100644
--- a/eventbridges/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JGroupsModuleIT.java
+++ b/eventbridges/cayenne-jgroups/src/test/java/org/apache/cayenne/event/JGroupsModuleIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.di.Module;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertThat;
/**
@@ -45,9 +46,13 @@ public class JGroupsModuleIT {
};
Injector injector = DIBootstrap.createInjector(new ServerModule(), new JGroupsModule(), configModule);
- EventBridge bridge = injector.getInstance(EventBridge.class);
+ EventBridge bridge = injector.getInstance(EventBridge.class);
assertThat(bridge, instanceOf(JavaGroupsBridge.class));
+
+ EventBridge bridge2 = injector.getInstance(EventBridge.class);
+ assertThat(bridge2, instanceOf(JavaGroupsBridge.class));
+ assertNotSame(bridge, bridge2);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3f0f373f/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java b/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
index b532bc5..7e87dc7 100644
--- a/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
+++ b/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
@@ -49,6 +49,6 @@ public class JMSModule implements Module {
// init properties' defaults
contributeTopicConnectionFactory(binder, JMSBridge.TOPIC_CONNECTION_FACTORY_DEFAULT);
- binder.bind(EventBridge.class).toProvider(JMSBridgeProvider.class);
+ binder.bind(EventBridge.class).toProvider(JMSBridgeProvider.class).withoutScope();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3f0f373f/eventbridges/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSModuleIT.java
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSModuleIT.java b/eventbridges/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSModuleIT.java
index c8391ea..459fff7 100644
--- a/eventbridges/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSModuleIT.java
+++ b/eventbridges/cayenne-jms/src/test/java/org/apache/cayenne/event/JMSModuleIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.di.Module;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertThat;
/**
@@ -45,9 +46,13 @@ public class JMSModuleIT {
};
Injector injector = DIBootstrap.createInjector(new ServerModule(), new JMSModule(), configModule);
- EventBridge bridge = injector.getInstance(EventBridge.class);
+ EventBridge bridge = injector.getInstance(EventBridge.class);
assertThat(bridge, instanceOf(JMSBridge.class));
+
+ EventBridge bridge2 = injector.getInstance(EventBridge.class);
+ assertThat(bridge2, instanceOf(JMSBridge.class));
+ assertNotSame(bridge, bridge2);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3f0f373f/eventbridges/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPModule.java
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPModule.java b/eventbridges/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPModule.java
index 83c8f0a..4e02504 100644
--- a/eventbridges/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPModule.java
+++ b/eventbridges/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPModule.java
@@ -66,6 +66,6 @@ public class XMPPModule implements Module {
// init properties' defaults
contributeChatService(binder, XMPPBridge.DEFAULT_CHAT_SERVICE);
- binder.bind(EventBridge.class).toProvider(XMPPBridgeProvider.class);
+ binder.bind(EventBridge.class).toProvider(XMPPBridgeProvider.class).withoutScope();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3f0f373f/eventbridges/cayenne-xmpp/src/test/java/org/apache/cayenne/event/XMPPModuleIT.java
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-xmpp/src/test/java/org/apache/cayenne/event/XMPPModuleIT.java b/eventbridges/cayenne-xmpp/src/test/java/org/apache/cayenne/event/XMPPModuleIT.java
index 45173bb..1eaa82c 100644
--- a/eventbridges/cayenne-xmpp/src/test/java/org/apache/cayenne/event/XMPPModuleIT.java
+++ b/eventbridges/cayenne-xmpp/src/test/java/org/apache/cayenne/event/XMPPModuleIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.di.Module;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertThat;
/**
@@ -45,9 +46,13 @@ public class XMPPModuleIT {
};
Injector injector = DIBootstrap.createInjector(new ServerModule(), new XMPPModule(), configModule);
- EventBridge bridge = injector.getInstance(EventBridge.class);
+ EventBridge bridge = injector.getInstance(EventBridge.class);
assertThat(bridge, instanceOf(XMPPBridge.class));
+
+ EventBridge bridge2 = injector.getInstance(EventBridge.class);
+ assertThat(bridge2, instanceOf(XMPPBridge.class));
+ assertNotSame(bridge, bridge2);
}
}
[4/4] cayenne git commit: CAY-2505 EventBridge providers should be
bound without scope - release notes
Posted by nt...@apache.org.
CAY-2505 EventBridge providers should be bound without scope
- release notes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a07cd1c9
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a07cd1c9
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a07cd1c9
Branch: refs/heads/STABLE-4.0
Commit: a07cd1c987f412d00f5c884b7594a1de257ad522
Parents: 60c990d
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Dec 19 10:44:30 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Dec 19 10:44:30 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a07cd1c9/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 473122f..3017dde 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -37,6 +37,7 @@ CAY-2472 Clear cached replacement query on mutation in all indirect queries
CAY-2480 cayenne:cdbgen and cayenne:cgen have identical text in cayenne-maven-plugin
CAY-2497 Modeler: SQL Scripts tab isn't scrollable
CAY-2504 Broken detection logic of NoopEventBridge in DataRowStoreFactory
+CAY-2505 EventBridge providers should be bound without scope
----------------------------------
Release: 4.0
[3/4] cayenne git commit: CAY-2504 Broken detection logic of
NoopEventBridge in DataRowStoreFactory - release notes
Posted by nt...@apache.org.
CAY-2504 Broken detection logic of NoopEventBridge in DataRowStoreFactory
- release notes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/60c990d8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/60c990d8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/60c990d8
Branch: refs/heads/STABLE-4.0
Commit: 60c990d85a13cb0fe94b8215c89d69782d89b4f9
Parents: 3f0f373
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Dec 19 10:44:05 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Dec 19 10:44:05 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/60c990d8/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index a0b47a3..473122f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -36,6 +36,7 @@ CAY-2470 Can't bind SQLExec parameters in a loop
CAY-2472 Clear cached replacement query on mutation in all indirect queries
CAY-2480 cayenne:cdbgen and cayenne:cgen have identical text in cayenne-maven-plugin
CAY-2497 Modeler: SQL Scripts tab isn't scrollable
+CAY-2504 Broken detection logic of NoopEventBridge in DataRowStoreFactory
----------------------------------
Release: 4.0