Merge pull request #87 from aol/boot-merge

Boot merge

micro-boot/build.gradle

@@ -12,6 +12,7 @@ dependencies {
 	testCompile project(':micro-client')
 	testCompile project(':micro-events')
 	testCompile project(':micro-jersey')
+	testCompile project(':micro-metrics')
 
 
 }

micro-boot/readme.md

@@ -2,6 +2,54 @@
 
 [micro-boot example apps](https://github.com/aol/micro-server/tree/master/micro-boot/src/test/java/app)
 
+Use Microserver and Spring Boot together. 
+
+## A simple example with one resource
+
+* Annotate your classes with @Microboot to let Spring Boot know the base package for auto-scanning Spring beans.
+
+* Create a MicroserverApp and run.
+
+* You can now use the @Microserver annotation for configuration (except for base auto-scan packages)
+
+
+```java
+@Microboot //configure this package as the base for autoscan
+//optionally use @Microserver here for more configuration options
+public class SimpleExample {
+
+	RestClient rest = new RestClient(10_000,1_000);
+
+
+	public static void main (String[] args){
+
+		new MicroserverApp(()-> "simple-app").start();
+
+		assertThat(rest.get("http://localhost:8080/simple-app/status/ping"),equalTo("ok"));
+
+	}
+
+
+
+}
+@Rest
+@Path("/status")
+public class SimpleResource{
+
+
+
+	@GET
+	@Produces("text/plain")
+	@Path("/ping")
+	public String ping() {
+
+		return "ok";
+	}
+
+
+}
+```
+
 ## To use
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-boot/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-boot)
@@ -40,13 +88,21 @@ Gradle
     public class SimpleApp {
 
         public static void main(String[] args){
-            new MicrobootApp(()->"test-app").run();
+            new MicroserverApp(()->"test-app").run();
         }
 
     }
 
 # Relationship to Microserver and Spring Boot
 
-micro-boot allows you to use Microserver  plugins & jax-rs support with Spring Boot back ends.
+micro-boot allows you to use Microserver plugins & jax-rs support with Spring Boot back ends.
+
+
+@Microboot is simply syntax sugar for 
+
+ ```java
+@Component
+@SpringBootApplication(exclude = SpringDataWebAutoConfiguration.class)
+ ```
 
-micro-boot apps are started via the MicrobootApp (equivalent to MicroserverApp) and configured via the Microboot annotation (equivalent to the Microserver annotation)
+You can also define your own SpringBoot configuration if required.

micro-boot/src/main/java/com/aol/micro/server/boot/config/Microboot.java

@@ -1,6 +1,5 @@
 package com.aol.micro.server.boot.config;
 
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -10,46 +9,10 @@
 import org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration;
 import org.springframework.stereotype.Component;
 
-import com.aol.micro.server.config.Classes;
-
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Component
 @SpringBootApplication(exclude = SpringDataWebAutoConfiguration.class)
 public @interface Microboot{
-
-
-	/**
-	 * @return Spring auto-scan base packages
-	 */
-	String[] basePackages() default {};
-
-	/**
-	 * @return Classes to be passed to initial Spring context
-	 * e.g. Classes that have Spring @Configuration or @Component annotation
-	 * 
-	 */
-	Class[] classes() default {};
-
 
-
-	/**
-	 * @return Property file name 
-	 * default value is 'application.properties'
-	 */
-	String propertiesName() default "application.properties";
-
-	/**
-	 * @return Hibernate entity scan packages
-	 */
-	String[] entityScan() default {};
-
-	/**
-	 * @return Properties to be injected into spring format is 
-	 * key,value,key,value comma separated list
-	 */
-	String[] properties() default {};
-
-
-}
-
+}

micro-boot/src/main/java/com/aol/micro/server/spring/boot/BootPlugin.java

@@ -0,0 +1,22 @@
+package com.aol.micro.server.spring.boot;
+
+import com.aol.micro.server.Plugin;
+import com.aol.micro.server.spring.SpringBuilder;
+
+/**
+ * 
+ * @author johnmcclean
+ *
+ */
+public class BootPlugin implements Plugin{
+
+
+	/**
+	 * @return Engine for building Spring Context
+	 */
+	public SpringBuilder springBuilder(){
+		return new BootApplicationConfigurator();
+	}
+
+
+}

micro-boot/src/main/resources/META-INF/services/com.aol.micro.server.Plugin

@@ -0,0 +1 @@
+com.aol.micro.server.spring.boot.BootPlugin