Rename start/stop to init/destroy and rename former init/destroy to o…

…nInit/onDestroy
pippo-java · Mar 5, 2015 · e18ce51 · e18ce51
1 parent cab8700
commit e18ce51
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 32 deletions.
diff --git a/pippo-core/src/main/java/ro/pippo/core/Application.java b/pippo-core/src/main/java/ro/pippo/core/Application.java
@@ -93,7 +93,7 @@ public Application(PippoSettings settings) {
         registerContentTypeEngine(JaxbEngine.class);
     }
 
-    public final void start() {
+    public final void init() {
         initializers.addAll(getInitializers());
         for (Initializer initializer : initializers) {
             log.debug("Initializing '{}'", initializer.getClass().getName());
@@ -104,11 +104,11 @@ public final void start() {
             }
         }
 
-        init();
+        onInit();
     }
 
-    public final void stop() {
+    public final void destroy() {
-        destroy();
+        onDestroy();
         for (Initializer initializer : initializers) {
             log.debug("Destroying '{}'", initializer.getClass().getName());
             try {
@@ -119,10 +119,10 @@ public final void stop() {
         }
     }
 
-    public void init() {
+    protected void onInit() {
     }
 
-    public void destroy() {
+    protected void onDestroy() {
     }
 
     /**

diff --git a/pippo-core/src/main/java/ro/pippo/core/PippoFilter.java b/pippo-core/src/main/java/ro/pippo/core/PippoFilter.java
@@ -103,7 +103,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
             log.debug("Serving application on context path '{}'", contextPath);
 
             log.debug("Initializing application '{}'", application);
-            application.start();
+            application.init();
 
             routeContextFactory = getRouteContextFactory();
             routeContextFactory.init(application);
@@ -206,7 +206,7 @@ public void setFilterPath(String filterPath) {
     public void destroy() {
         if (application != null) {
             try {
-                application.stop();
+                application.destroy();
 
                 log.info("Pippo destroyed");
             } finally {

diff --git a/pippo-demo/pippo-demo-basic/src/main/java/ro/pippo/demo/basic/BasicApplication.java b/pippo-demo/pippo-demo-basic/src/main/java/ro/pippo/demo/basic/BasicApplication.java
@@ -35,8 +35,7 @@ public class BasicApplication extends Application {
     private final static Logger log = LoggerFactory.getLogger(BasicApplication.class);
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         getRouter().ignorePaths("/favicon.ico");
 

diff --git a/...o/pippo-demo-controller/src/main/java/ro/pippo/demo/controller/ControllerApplication.java b/...o/pippo-demo-controller/src/main/java/ro/pippo/demo/controller/ControllerApplication.java
@@ -25,8 +25,7 @@
 public class ControllerApplication extends Application {
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());

diff --git a/pippo-demo/pippo-demo-crud/src/main/java/ro/pippo/demo/crud/CrudApplication.java b/pippo-demo/pippo-demo-crud/src/main/java/ro/pippo/demo/crud/CrudApplication.java
@@ -37,8 +37,7 @@ public class CrudApplication extends Application {
     private ContactService contactService;
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());

diff --git a/pippo-demo/pippo-demo-crudng/src/main/java/ro/pippo/demo/crudng/CrudNgApplication.java b/pippo-demo/pippo-demo-crudng/src/main/java/ro/pippo/demo/crudng/CrudNgApplication.java
@@ -41,8 +41,7 @@ public ContactService getContactService() {
     }
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());

diff --git a/pippo-demo/pippo-demo-custom/src/main/java/ro/pippo/demo/custom/CustomApplication.java b/pippo-demo/pippo-demo-custom/src/main/java/ro/pippo/demo/custom/CustomApplication.java
@@ -23,8 +23,7 @@
 public class CustomApplication extends Application {
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         // use a custom route context
         GET("/", new CustomContextHandler() {

diff --git a/pippo-demo/pippo-demo-guice/src/main/java/ro/pippo/demo/guice/GuiceApplication.java b/pippo-demo/pippo-demo-guice/src/main/java/ro/pippo/demo/guice/GuiceApplication.java
@@ -28,8 +28,7 @@
 public class GuiceApplication extends Application {
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());

diff --git a/pippo-demo/pippo-demo-guice/src/main/java/ro/pippo/demo/guice/GuiceApplication2.java b/pippo-demo/pippo-demo-guice/src/main/java/ro/pippo/demo/guice/GuiceApplication2.java
@@ -30,8 +30,7 @@ public class GuiceApplication2 extends Application {
     private ContactService contactService;
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());

diff --git a/pippo-demo/pippo-demo-spring/src/main/java/ro/pippo/demo/spring/SpringApplication.java b/pippo-demo/pippo-demo-spring/src/main/java/ro/pippo/demo/spring/SpringApplication.java
@@ -28,8 +28,7 @@
 public class SpringApplication extends Application {
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());

diff --git a/pippo-demo/pippo-demo-spring/src/main/java/ro/pippo/demo/spring/SpringApplication2.java b/pippo-demo/pippo-demo-spring/src/main/java/ro/pippo/demo/spring/SpringApplication2.java
@@ -31,8 +31,7 @@ public class SpringApplication2 extends Application {
     private ContactService contactService;
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());

diff --git a/pippo-demo/pippo-demo-template/src/main/java/ro/pippo/demo/template/TemplateApplication.java b/pippo-demo/pippo-demo-template/src/main/java/ro/pippo/demo/template/TemplateApplication.java
@@ -43,8 +43,7 @@ public TemplateApplication(TemplateEngine engine, String template) {
     }
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         // add classpath resource handlers
         GET(new WebjarsResourceHandler());

diff --git a/pippo-demo/pippo-demo-upload/src/main/java/ro/pippo/demo/upload/UploadApplication.java b/pippo-demo/pippo-demo-upload/src/main/java/ro/pippo/demo/upload/UploadApplication.java
@@ -30,8 +30,7 @@
 public class UploadApplication extends Application {
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
 //        setMaximumUploadSize(100 * 1024); // 100k
 

diff --git a/...o/pippo-demo-validation/src/main/java/ro/pippo/demo/validation/ValidationApplication.java b/...o/pippo-demo-validation/src/main/java/ro/pippo/demo/validation/ValidationApplication.java
@@ -34,8 +34,7 @@
 public class ValidationApplication extends Application {
 
     @Override
-    public void init() {
+    protected void onInit() {
-        super.init();
 
         GET(new WebjarsResourceHandler());
         GET(new PublicResourceHandler());