Signed-off-by: Andre Aloise <aaloise@gmail.com>

aaloise · aaloise · commit 47d709ef63b8 · 2017-08-09T16:25:51.000-04:00
diff --git a/examples/server-sent-event-example/build.gradle b/examples/server-sent-event-example/build.gradle
@@ -5,8 +5,8 @@ buildscript {
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.11.6"
-        classpath "org.grails.plugins:hibernate5:6.0.6"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.3"
+        classpath "org.grails.plugins:hibernate5:6.1.6"
     }
 }
 
@@ -42,15 +42,17 @@ dependencies {
     compile "org.grails:grails-web-boot"
     compile "org.grails.plugins:cache"
     compile "org.grails.plugins:scaffolding"
-    compile "org.grails.plugins:rx-mongodb"
-    compile "org.grails.plugins:rx-gorm-rest-client:1.0.0.M1"
-    compile project(":rxjava")
+    compile "org.grails.plugins:events"
+    compile "org.grails.plugins:async"
+    compile "org.grails.plugins:rxjava2:2.0.0"
     compile 'org.grails.plugins:quartz:2.0.9'
+    compile 'org.grails:grails-logging'
 
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.11.6"
+    runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.3"
     runtime "com.h2database:h2"
+    runtime "org.grails:grails-events-rxjava2:3.3.0"   
     testCompile "org.grails:grails-plugin-testing"
     testCompile "org.grails.plugins:geb"
     testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
diff --git a/examples/server-sent-event-example/gradle.properties b/examples/server-sent-event-example/gradle.properties
@@ -1,2 +1,3 @@
-grailsVersion=3.2.5
-gradleWrapperVersion=2.13
+grailsVersion=3.3.0
+gormVersion=6.1.6.RELEASE
+gradleWrapperVersion=3.5
diff --git a/examples/server-sent-event-example/grails-app/controllers/rxjava/demo/TickTockController.groovy b/examples/server-sent-event-example/grails-app/controllers/rxjava/demo/TickTockController.groovy
@@ -7,15 +7,12 @@ import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
-import reactor.spring.context.annotation.Consumer
-import reactor.spring.context.annotation.Selector
-
+import grails.events.annotation.*
 import java.util.concurrent.TimeUnit
 
 /**
  * Created by graemerocher on 28/07/2016.
  */
-@Consumer
 class TickTockController implements RxController {
 
     def index() {
@@ -81,8 +78,8 @@ class TickTockController implements RxController {
     Subject subject = PublishSubject.create()
     Observable publishedObservable = subject.publish().autoConnect().observeOn(Schedulers.io())
 
-    @Selector('MyJob.event')
-    void myEventListener(Object data) {
+    @Subscriber("MyJob")
+    void myEventListener(int data) {
         log.info("myEvent listener Thread ${Thread.currentThread().name}")
         subject.onNext(data)
     }
diff --git a/examples/server-sent-event-example/grails-app/jobs/rxjava/demo/MyJob.groovy b/examples/server-sent-event-example/grails-app/jobs/rxjava/demo/MyJob.groovy
@@ -1,8 +1,8 @@
 package rxjava.demo
 
-import grails.events.Events
+import grails.events.*
 
-class MyJob implements Events {
+class MyJob implements EventPublisher {
     static triggers = {
         simple name: 'mySimpleTrigger', startDelay: 1000, repeatInterval: 1000
     }
@@ -11,11 +11,10 @@ class MyJob implements Events {
 
     static int i = 0
 
-    static final String EVENT_NAME = 'MyJob.event'
+    static final String EVENT_NAME = "MyJob"
 
     def execute(){
         log.trace('MyJob.execute()')
-
-        notify EVENT_NAME, "${i++}"
+        notify(EVENT_NAME, "${i++}")
     }
-}
+}
