Tweak the startup and injection strategies.

Modify resource docs.
splendidbits · Mar 25, 2018 · fa2defd · fa2defd
1 parent 42276d8
commit fa2defd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 55 deletions.
diff --git a/app/injection/modules/ApplicationModule.java b/app/injection/modules/ApplicationModule.java
@@ -1,7 +1,6 @@
 package injection.modules;
 
 import com.google.inject.AbstractModule;
-import injection.providers.LifecycleListenerProvider;
 import main.LifecycleListener;
 
 /**
@@ -13,7 +12,6 @@ public class ApplicationModule extends AbstractModule {
     @Override
     protected void configure() {
         bind(LifecycleListener.class)
-                .toProvider(LifecycleListenerProvider.class)
                 .asEagerSingleton();
     }
 }
diff --git a/app/injection/providers/LifecycleListenerProvider.java b/app/injection/providers/LifecycleListenerProvider.java
diff --git a/app/main/LifecycleListener.java b/app/main/LifecycleListener.java
@@ -1,18 +1,18 @@
 package main;
 
+import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import io.ebean.EbeanServer;
 import play.inject.ApplicationLifecycle;
-import services.pushservices.TaskQueue;
 
 import java.util.concurrent.CompletableFuture;
 
 @Singleton
 public class LifecycleListener {
-    public LifecycleListener(EbeanServer ebeanServer, ApplicationLifecycle applicationLifecycle, TaskQueue taskQueue) {
-        taskQueue.startup();
 
-        applicationLifecycle.addStopHook(() -> CompletableFuture.runAsync(() -> {
+    @Inject
+    public LifecycleListener(EbeanServer ebeanServer, ApplicationLifecycle applicationLifecycle) {
+            applicationLifecycle.addStopHook(() -> CompletableFuture.runAsync(() -> {
             ebeanServer.shutdown(true, false);
         }));
     }

diff --git a/build.sbt b/build.sbt
@@ -25,7 +25,7 @@ libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-ws-standalone-json" % "1.0.1",
   "com.typesafe.play" %% "play-ws-standalone-xml" % "1.0.1",
   "com.typesafe.play" %% "play-json" % "2.6.1",
-  "org.avaje" % "avaje-agentloader" % "2.1.2",
+  "io.ebean" % "ebean-agent" % "10.1.6",
   "org.postgresql" % "postgresql" % "42.2.2",
   "org.jetbrains" % "annotations" % "13.0",
   "org.jsoup" % "jsoup" % "1.10.1",
@@ -34,9 +34,6 @@ libraryDependencies ++= Seq(
   "org.mockito" % "mockito-all" % "2.0.2-beta" % Test
 )
 
-dependencyOverrides += "org.avaje.ebeanorm" % "avaje-ebeanorm" % "8.1.1"
-dependencyOverrides += "org.avaje.ebeanorm" % "avaje-ebeanorm-agent" % "8.1.1"
-
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-q")
 //resolvers += ("Local Maven Repository" at "/Users/daniel/.ivy2/cache")
 

diff --git a/resources/DATABASES_UP b/resources/DATABASES_UP
@@ -6,9 +6,6 @@ GRANT ALL PRIVILEGES ON DATABASE commutealerts to splendidbits;
 CREATE DATABASE pushservices;
 GRANT ALL PRIVILEGES ON DATABASE pushservices to splendidbits;
 
-CREATE DATABASE fluffylog;
-GRANT ALL PRIVILEGES ON DATABASE fluffylog to splendidbits;
-
 -----
 
 
@@ -52,16 +49,3 @@ GRANT ALL ON SCHEMA pushservices TO splendidbits;
 GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA pushservices to splendidbits;
 GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA pushservices TO splendidbits;
 
------
-
-
-CREATE SCHEMA fluffylog;
-
-GRANT USAGE ON SCHEMA fluffylog TO splendidbits;
-GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA fluffylog TO splendidbits;
-ALTER DEFAULT PRIVILEGES IN SCHEMA fluffylog GRANT ALL ON TABLES TO splendidbits;
-
-GRANT ALL ON SCHEMA fluffylog TO splendidbits;
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA fluffylog to splendidbits;
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA fluffylog TO splendidbits;
-