Merge branch 'master' into master

2017-08-09 07:48:06 +03:00
parent 207f88b597 415b80d03f
commit 1fdbaa24d7
185 changed files with 3682 additions and 803 deletions
@@ -0,0 +1,11 @@
+log:
+  level: warn
+  appenders:
+    - type: file
+      logFormat: '%c{20}: %m%n'
+      file: /home/logger.log
+
+jetty:
+  context: /hello
+  connector:
+    port: 10001
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>bootique-parent</artifactId>
+    <groupId>io.bootique.parent</groupId>
+    <version>0.12</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.baeldung.bootique</groupId>
+  <artifactId>bootique</artifactId>
+  <name>bootique</name>
+  <version>1.0-SNAPSHOT</version>
+  <url>http://maven.apache.org</url>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.bootique</groupId>
+      <artifactId>bootique-test</artifactId>
+      <version>0.23</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.bootique.bom</groupId>
+        <artifactId>bootique-bom</artifactId>
+        <version>0.23</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <properties>
+    <main.class>com.baeldung.bootique.App</main.class>
+  </properties>
+</project>
+
@@ -0,0 +1,66 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.baeldung.bootique</groupId>
+	<artifactId>bootique</artifactId>
+	<packaging>jar</packaging>
+	<version>1.0-SNAPSHOT</version>
+	<name>bootique</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<main.class>com.baeldung.bootique.App</main.class>
+	</properties>
+
+	<parent>
+		<groupId>io.bootique.parent</groupId>
+		<artifactId>bootique-parent</artifactId>
+		<version>0.12</version>
+	</parent>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>io.bootique.bom</groupId>
+				<artifactId>bootique-bom</artifactId>
+				<version>0.23</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>io.bootique.jersey</groupId>
+			<artifactId>bootique-jersey</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.bootique.logback</groupId>
+			<artifactId>bootique-logback</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.bootique</groupId>
+			<artifactId>bootique-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
@@ -0,0 +1,41 @@
+package com.baeldung.bootique;
+
+import com.baeldung.bootique.module.ModuleBinder;
+import com.baeldung.bootique.router.IndexController;
+import com.baeldung.bootique.router.SaveController;
+import com.google.inject.Module;
+import io.bootique.Bootique;
+import io.bootique.jersey.JerseyModule;
+import io.bootique.log.BootLogger;
+
+import java.util.function.Supplier;
+
+public class App {
+
+    public static void main(String[] args) {
+        Module module = binder -> JerseyModule.extend(binder).addResource(IndexController.class)
+          .addResource(SaveController.class);
+        Bootique.app(args).module(module).module(ModuleBinder.class).bootLogger(new BootLogger() {
+            @Override
+            public void trace(Supplier<String> arg0) {
+                // ...
+            }
+
+            @Override
+            public void stdout(String arg0) {
+                // ...
+            }
+
+            @Override
+            public void stderr(String arg0, Throwable arg1) {
+                // ...
+            }
+
+            @Override
+            public void stderr(String arg0) {
+                // ...
+            }
+        }).autoLoadModules().exec();
+    }
+
+}
@@ -0,0 +1,15 @@
+package com.baeldung.bootique.module;
+
+import com.baeldung.bootique.service.HelloService;
+import com.baeldung.bootique.service.impl.HelloServiceImpl;
+import com.google.inject.Binder;
+import com.google.inject.Module;
+
+public class ModuleBinder implements Module {
+
+    @Override
+    public void configure(Binder binder) {
+        binder.bind(HelloService.class).to(HelloServiceImpl.class);
+    }
+
+}
@@ -0,0 +1,13 @@
+package com.baeldung.bootique.module;
+
+import com.google.inject.Module;
+import io.bootique.BQModuleProvider;
+
+public class ModuleProvider implements BQModuleProvider {
+
+    @Override
+    public Module module() {
+        return new ModuleBinder();
+    }
+
+}
@@ -0,0 +1,14 @@
+package com.baeldung.bootique.router;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/")
+public class IndexController {
+
+    @GET
+    public String index() {
+        return "Hello, baeldung!";
+    }
+
+}
@@ -0,0 +1,20 @@
+package com.baeldung.bootique.router;
+
+import com.baeldung.bootique.service.HelloService;
+import com.google.inject.Inject;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+@Path("/save")
+public class SaveController {
+
+    @Inject
+    HelloService helloService;
+
+    @POST
+    public String save() {
+        return "Data Saved!";
+    }
+
+}
@@ -0,0 +1,7 @@
+package com.baeldung.bootique.service;
+
+public interface HelloService {
+
+	boolean save();
+
+}
@@ -0,0 +1,12 @@
+package com.baeldung.bootique.service.impl;
+
+import com.baeldung.bootique.service.HelloService;
+
+public class HelloServiceImpl implements HelloService {
+
+	@Override
+	public boolean save() {
+		return true;
+	}
+
+}
@@ -0,0 +1 @@
+com.baeldung.bootique.module.ModuleProvider
@@ -0,0 +1,27 @@
+package com.baeldung.bootique;
+
+import com.baeldung.bootique.service.HelloService;
+import io.bootique.BQRuntime;
+import io.bootique.test.junit.BQDaemonTestFactory;
+import io.bootique.test.junit.BQTestFactory;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class AppTest {
+
+    @Rule
+    public BQTestFactory bqTestFactory = new BQTestFactory();
+
+    @Rule
+    public BQDaemonTestFactory bqDaemonTestFactory = new BQDaemonTestFactory();
+
+    @Test
+    public void givenService_expectBoolen() {
+        BQRuntime runtime = bqTestFactory.app("--server").autoLoadModules().createRuntime();
+        HelloService service = runtime.getInstance(HelloService.class);
+        assertEquals(true, service.save());
+    }
+
+}
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.hashcode</groupId>
-    <artifactId>hashcode</artifactId>
-    <version>1.0</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,30 +0,0 @@
-package com.baeldung.application;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
-
-public class ApplicationTest {
-
-    private ByteArrayOutputStream outContent;
-
-    @Before
-    public void setUpPrintStreamInstance() throws Exception {
-        this.outContent = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(outContent));
-    }
-
-    @After
-    public void tearDownByteArrayOutputStream() throws Exception {
-        outContent = null;
-    }
-
-    @Test
-    public void main_NoInputState_TextPrintedToConsole() throws Exception {
-        Application.main(new String[]{});
-        assertEquals("User found in the collection", outContent.toString());
-    }
-}
@@ -80,7 +80,11 @@
        </dependency>

        <!-- logging -->
-
+       <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
@@ -391,7 +395,7 @@
        <logback.version>1.1.7</logback.version>

        <!-- util -->
-        <guava.version>21.0</guava.version>
+        <guava.version>22.0</guava.version>
        <commons-lang3.version>3.5</commons-lang3.version>
        <bouncycastle.version>1.55</bouncycastle.version>
        <commons-codec.version>1.10</commons-codec.version>
@@ -15,14 +15,12 @@ public class CyclicBarrierDemo {
    private int NUM_PARTIAL_RESULTS;
    private int NUM_WORKERS;

-
    private void runSimulation(int numWorkers, int numberOfPartialResults) {
        NUM_PARTIAL_RESULTS = numberOfPartialResults;
        NUM_WORKERS = numWorkers;

        cyclicBarrier = new CyclicBarrier(NUM_WORKERS, new AggregatorThread());
-        System.out.println("Spawning " + NUM_WORKERS + " worker threads to compute "
-                + NUM_PARTIAL_RESULTS + " partial results each");
+        System.out.println("Spawning " + NUM_WORKERS + " worker threads to compute " + NUM_PARTIAL_RESULTS + " partial results each");
        for (int i = 0; i < NUM_WORKERS; i++) {
            Thread worker = new Thread(new NumberCruncherThread());
            worker.setName("Thread " + i);
@@ -38,8 +36,7 @@ public class CyclicBarrierDemo {
            List<Integer> partialResult = new ArrayList<>();
            for (int i = 0; i < NUM_PARTIAL_RESULTS; i++) {
                Integer num = random.nextInt(10);
-                System.out.println(thisThreadName
-                        + ": Crunching some numbers! Final result - " + num);
+                System.out.println(thisThreadName + ": Crunching some numbers! Final result - " + num);
                partialResult.add(num);
            }
            partialResults.add(partialResult);
@@ -57,13 +54,12 @@ public class CyclicBarrierDemo {
        @Override
        public void run() {
            String thisThreadName = Thread.currentThread().getName();
-            System.out.println(thisThreadName + ": Computing final sum of " + NUM_WORKERS
-                    + " workers, having " + NUM_PARTIAL_RESULTS + " results each.");
+            System.out.println(thisThreadName + ": Computing final sum of " + NUM_WORKERS + " workers, having " + NUM_PARTIAL_RESULTS + " results each.");
            int sum = 0;
            for (List<Integer> threadResult : partialResults) {
                System.out.print("Adding ");
                for (Integer partialResult : threadResult) {
-                    System.out.print(partialResult+" ");
+                    System.out.print(partialResult + " ");
                    sum += partialResult;
                }
                System.out.println();
@@ -15,7 +15,8 @@ public class Philosopher implements Runnable {
        Thread.sleep(((int) (Math.random() * 100)));
    }

-    @Override public void run() {
+    @Override
+    public void run() {
        try {
            while (true) {
                doAction(System.nanoTime() + ": Thinking"); // thinking
@@ -6,22 +6,22 @@ import java.util.concurrent.TimeUnit;

 public class ExecutorServiceDemo {

-	ExecutorService executor = Executors.newFixedThreadPool(10);
+    ExecutorService executor = Executors.newFixedThreadPool(10);

-	public void execute() {
+    public void execute() {

-		executor.submit(() -> {
-			new Task();
-		});
+        executor.submit(() -> {
+            new Task();
+        });

-		executor.shutdown();
-		executor.shutdownNow();
-		try {
-			executor.awaitTermination(20l, TimeUnit.NANOSECONDS);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
+        executor.shutdown();
+        executor.shutdownNow();
+        try {
+            executor.awaitTermination(20l, TimeUnit.NANOSECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }

-	}
+    }

 }
@@ -9,36 +9,36 @@ import java.util.concurrent.TimeoutException;

 public class FutureDemo {

-	public String invoke() {
+    public String invoke() {

-		String str = null;
+        String str = null;

-		ExecutorService executorService = Executors.newFixedThreadPool(10);
+        ExecutorService executorService = Executors.newFixedThreadPool(10);

-		Future<String> future = executorService.submit(() -> {
-			// Task
-			Thread.sleep(10000l);
-			return "Hellow world";
-		});
+        Future<String> future = executorService.submit(() -> {
+            // Task
+            Thread.sleep(10000l);
+            return "Hellow world";
+        });

-		future.cancel(false);
+        future.cancel(false);

-		try {
-			future.get(20, TimeUnit.SECONDS);
-		} catch (InterruptedException | ExecutionException | TimeoutException e1) {
-			e1.printStackTrace();
-		}
+        try {
+            future.get(20, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e1) {
+            e1.printStackTrace();
+        }

-		if (future.isDone() && !future.isCancelled()) {
-			try {
-				str = future.get();
-			} catch (InterruptedException | ExecutionException e) {
-				e.printStackTrace();
-			}
-		}
+        if (future.isDone() && !future.isCancelled()) {
+            try {
+                str = future.get();
+            } catch (InterruptedException | ExecutionException e) {
+                e.printStackTrace();
+            }
+        }

-		return str;
+        return str;

-	}
+    }

 }
@@ -4,20 +4,20 @@ import java.util.concurrent.ThreadFactory;

 public class BaeldungThreadFactory implements ThreadFactory {

-	private int threadId;
-	private String name;
+    private int threadId;
+    private String name;

-	public BaeldungThreadFactory(String name) {
-		threadId = 1;
-		this.name = name;
-	}
+    public BaeldungThreadFactory(String name) {
+        threadId = 1;
+        this.name = name;
+    }

-	@Override
-	public Thread newThread(Runnable r) {
-		Thread t = new Thread(r, name + "-Thread_" + threadId);
-		System.out.println("created new thread with id : " + threadId + " and name : " + t.getName());
-		threadId++;
-		return t;
-	}
+    @Override
+    public Thread newThread(Runnable r) {
+        Thread t = new Thread(r, name + "-Thread_" + threadId);
+        System.out.println("created new thread with id : " + threadId + " and name : " + t.getName());
+        threadId++;
+        return t;
+    }

 }
@@ -2,9 +2,9 @@ package com.baeldung.concurrent.threadfactory;

 public class Task implements Runnable {

-	@Override
-	public void run() {
-		// task details
-	}
-	
+    @Override
+    public void run() {
+        // task details
+    }
+
 }
@@ -0,0 +1,13 @@
+package com.baeldung.designpatterns.adapter;
+
+import static com.baeldung.designpatterns.util.LogerUtil.LOG;
+
+public class AdapterPatternDriver {
+    
+    public static void main(String args[]) {
+        LuxuryCarsSpeedAdapter luxuryCars = new LuxuryCarsSpeedAdapterImpl();
+        LOG.info("Bugatti Veyron Super Sport's top speed is " + luxuryCars.bugattiVeyronInKMPH() + " Kmph.");
+        LOG.info("McLaren F1 top speed is " + luxuryCars.mcLarenInKMPH() + " Kmph.");
+        LOG.info("Aston Martin One-77 top speed is " + luxuryCars.astonMartinInKMPH() + " Kmph.");
+    }
+}
@@ -0,0 +1,15 @@
+package com.baeldung.designpatterns.adapter;
+
+public class LuxuryCarsSpeed {
+    public double bugattiVeyronInMPH() {
+        return 268;
+    }
+    
+    public double mcLarenInMPH() {
+        return 241;
+    }
+    
+    public double astonMartinInMPH() {
+        return 220;
+    }
+}
@@ -0,0 +1,7 @@
+package com.baeldung.designpatterns.adapter;
+
+public interface LuxuryCarsSpeedAdapter {
+    public double bugattiVeyronInKMPH();
+    public double mcLarenInKMPH();
+    public double astonMartinInKMPH();
+}
@@ -0,0 +1,26 @@
+package com.baeldung.designpatterns.adapter;
+
+public class LuxuryCarsSpeedAdapterImpl extends LuxuryCarsSpeed implements LuxuryCarsSpeedAdapter {
+
+    @Override
+    public double bugattiVeyronInKMPH() {
+        double mph = super.bugattiVeyronInMPH();
+        return convertMPHtoKMPH(mph);
+    }
+
+    @Override
+    public double mcLarenInKMPH() {
+        double mph = super.mcLarenInMPH();
+        return convertMPHtoKMPH(mph);
+    }
+
+    @Override
+    public double astonMartinInKMPH() {
+        double mph = super.astonMartinInMPH();
+        return convertMPHtoKMPH(mph);
+    }
+
+    private double convertMPHtoKMPH(double mph) {
+        return mph * 1.60934;
+    }
+}
@@ -0,0 +1,12 @@
+package com.baeldung.designpatterns.bridge;
+
+import static com.baeldung.designpatterns.util.LogerUtil.LOG;
+
+public class Blue implements Color {
+
+    @Override
+    public void fillColor() { 
+        LOG.info("Color : Blue");
+    }
+
+}
@@ -0,0 +1,14 @@
+package com.baeldung.designpatterns.bridge;
+
+public class BridgePatternDriver {
+
+    public static void main(String[] args) {
+        //a square with red color
+        Shape square = new Square(new Red());
+        square.drawShape();
+        
+        //a triangle with blue color
+        Shape triangle = new Triangle(new Blue());
+        triangle.drawShape();
+    }
+}
@@ -0,0 +1,5 @@
+package com.baeldung.designpatterns.bridge;
+
+public interface Color {
+    public void fillColor();
+}
@@ -0,0 +1,12 @@
+package com.baeldung.designpatterns.bridge;
+
+import static com.baeldung.designpatterns.util.LogerUtil.LOG;
+
+public class Red implements Color {
+
+    @Override
+    public void fillColor() {
+        LOG.info("Color : Red");
+    }
+
+}
@@ -0,0 +1,11 @@
+package com.baeldung.designpatterns.bridge;
+
+public abstract class Shape {
+    protected Color color;
+    
+    public Shape(Color color) {
+        this.color = color;
+    }
+    
+    abstract public void drawShape();
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`com.baeldung.bootique.module.ModuleProvider`