Factored out Server support

kwakeroni · Nov 16, 2018 · aef2b08 · aef2b08
1 parent 60e02ac
commit aef2b08
Show file tree

Hide file tree

Showing 28 changed files with 976 additions and 307 deletions.
diff --git a/parameters-adapter/parameters-adapter-direct/pom.xml b/parameters-adapter/parameters-adapter-direct/pom.xml
@@ -58,6 +58,10 @@
             <groupId>be.kwakeroni.parameters.core</groupId>
             <artifactId>parameters-core-support</artifactId>
         </dependency>
+        <dependency>
+            <groupId>be.kwakeroni.parameters.core</groupId>
+            <artifactId>parameters-core-support</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/...e/kwakeroni/parameters/adapter/direct/factory/DirectBusinessParametersServiceFactory.java b/...e/kwakeroni/parameters/adapter/direct/factory/DirectBusinessParametersServiceFactory.java
@@ -13,7 +13,12 @@
 import be.kwakeroni.parameters.core.support.backend.DefaultBackendWireFormatterContext;
 import be.kwakeroni.parameters.core.support.client.DefaultClientWireFormatterContext;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.function.Predicate;
 
 import static be.kwakeroni.parameters.core.support.service.BusinessParameterServices.loadServices;
@@ -33,12 +38,12 @@ public void setBackendType(Predicate<? super BusinessParametersBackendFactory> b
     }
 
     @Override
-    public BusinessParameters getInstance() {
-        return getWritableInstance();
+    public BusinessParameters getInstance(Map<String, String> properties) {
+        return getWritableInstance(properties);
     }
 
     @Override
-    public WritableBusinessParameters getWritableInstance() {
+    public WritableBusinessParameters getWritableInstance(Map<String, String> properties) {
 
         DefaultClientWireFormatterContext clientRegistry = new DefaultClientWireFormatterContext();
         loadServices(ClientWireFormatterFactory.class)

diff --git a/parameters-application/parameters-app-support/pom.xml b/parameters-application/parameters-app-support/pom.xml
@@ -0,0 +1,107 @@
+<?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">
+    <parent>
+        <artifactId>parameters-application</artifactId>
+        <groupId>be.kwakeroni.parameters.application</groupId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>parameters-app-support</artifactId>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>be.kwakeroni.parameters</groupId>
+                <artifactId>parameters-deps</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!--<dependency>-->
+            <!--<groupId>be.kwakeroni.parameters.management</groupId>-->
+            <!--<artifactId>parameters-management</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>pom</type>-->
+            <!--<scope>import</scope>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+            <!--<groupId>be.kwakeroni.parameters.backend</groupId>-->
+            <!--<artifactId>parameters-backend</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>pom</type>-->
+            <!--<scope>import</scope>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+            <!--<groupId>be.kwakeroni.parameters.adapter</groupId>-->
+            <!--<artifactId>parameters-adapter</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>pom</type>-->
+            <!--<scope>import</scope>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+            <!--<groupId>be.kwakeroni.parameters.basic</groupId>-->
+            <!--<artifactId>parameters-basic-backend</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>pom</type>-->
+            <!--<scope>import</scope>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+            <!--<groupId>be.kwakeroni.parameters.client</groupId>-->
+            <!--<artifactId>parameters-client</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>pom</type>-->
+            <!--<scope>import</scope>-->
+            <!--</dependency>-->
+            <dependency>
+                <groupId>be.kwakeroni.parameters.core</groupId>
+                <artifactId>parameters-core</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <!--<dependency>-->
+        <!--<groupId>com.sun.jersey</groupId>-->
+        <!--<artifactId>jersey-client</artifactId>-->
+        <!--<version>1.19.1</version>-->
+        <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+        <!--<groupId>com.sun.jersey</groupId>-->
+        <!--<artifactId>jersey-json</artifactId>-->
+        <!--<version>1.19.1</version>-->
+        <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+        <!--<groupId>com.sun.jersey</groupId>-->
+        <!--<artifactId>jersey-servlet</artifactId>-->
+        <!--<version>1.19.1</version>-->
+        <!--<scope>compile</scope>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server</artifactId>
+            <version>1.19.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>be.kwakeroni.parameters.core</groupId>
+            <artifactId>parameters-test-support</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...eters-app-support/src/main/java/be/kwakeroni/parameters/app/support/SimpleRestServer.java b/...eters-app-support/src/main/java/be/kwakeroni/parameters/app/support/SimpleRestServer.java
@@ -0,0 +1,105 @@
+package be.kwakeroni.parameters.app.support;
+
+import com.sun.jersey.api.container.ContainerFactory;
+import com.sun.jersey.api.container.httpserver.HttpServerFactory;
+import com.sun.jersey.api.core.ApplicationAdapter;
+import com.sun.jersey.api.core.ResourceConfig;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+
+public abstract class SimpleRestServer implements AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleRestServer.class);
+
+    private HttpServer httpServer;
+
+    protected abstract int getPort();
+
+    protected abstract String getContextPath();
+
+    protected abstract Collection<Object> getResources();
+
+    protected abstract String getHelloMessage();
+
+    protected synchronized void start() throws IOException {
+        if (this.httpServer != null) return;
+
+
+        String uri = String.format("http://127.0.0.1:%s/%s",
+                getPort(),
+                getContextPath());
+
+        LOG.info("Starting server at {}", uri);
+
+        this.httpServer = HttpServerFactory.create(uri,
+                ContainerFactory.createContainer(HttpHandler.class, getResourceConfig(), null));
+
+
+        this.httpServer.start();
+
+        LOG.info("Server ready at " + uri);
+    }
+
+    protected synchronized void stop() {
+        if (this.httpServer != null) {
+            this.httpServer.stop(0);
+            this.httpServer = null;
+        }
+    }
+
+
+    @Override
+    public void close() {
+        this.stop();
+    }
+
+
+    protected ResourceConfig getResourceConfig() {
+        Set<Object> resources = new HashSet<>();
+        resources.add(getRootResource());
+        resources.addAll(getResources());
+
+        Application application = new Application() {
+            @Override
+            public Set<Object> getSingletons() {
+                return resources;
+            }
+        };
+
+        ResourceConfig config = new ApplicationAdapter(application);
+        config.setPropertiesAndFeatures(Collections.singletonMap("com.sun.jersey.api.json.POJOMappingFeature", true));
+        return config;
+
+    }
+
+    protected Object getRootResource() {
+
+
+        return new Root();
+    }
+
+    @Path("/")
+    public final class Root {
+        private Root() {
+
+        }
+
+        @GET
+        public String hello() {
+            return getHelloMessage();
+        }
+    }
+
+}
diff --git a/...rameters-app-support/src/main/java/be/kwakeroni/parameters/app/support/StaticContent.java b/...rameters-app-support/src/main/java/be/kwakeroni/parameters/app/support/StaticContent.java
@@ -0,0 +1,11 @@
+package be.kwakeroni.parameters.app.support;
+
+import java.nio.file.Path;
+
+public interface StaticContent {
+
+    public Path getContentDirectory();
+
+    public String getIndexPage();
+
+}
diff --git a/...s-app-support/src/main/java/be/kwakeroni/parameters/app/support/StaticContentFactory.java b/...s-app-support/src/main/java/be/kwakeroni/parameters/app/support/StaticContentFactory.java
@@ -0,0 +1,66 @@
+package be.kwakeroni.parameters.app.support;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Objects;
+import java.util.function.Supplier;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class StaticContentFactory {
+
+    private static final Logger LOG = LoggerFactory.getLogger(StaticContentFactory.class);
+
+    private StaticContentFactory() {
+
+    }
+
+    public static StaticContent fromZip(Supplier<InputStream> zipFile, String indexFile, Path workDir) {
+        LOG.info("Buffering web application into {}", workDir);
+
+        try {
+            Files.createDirectories(workDir);
+            unzip(zipFile, workDir);
+        } catch (IOException exc) {
+            throw new UncheckedIOException(exc);
+        }
+
+        return new StaticContent() {
+            @Override
+            public Path getContentDirectory() {
+                return workDir;
+            }
+
+            @Override
+            public String getIndexPage() {
+                return indexFile;
+            }
+        };
+    }
+
+
+    private static void unzip(Supplier<InputStream> stream, java.nio.file.Path location) throws IOException {
+
+        InputStream input = Objects.requireNonNull(stream.get(), "Could not obtain zip file");
+
+        try (ZipInputStream zipStream = new ZipInputStream(input)) {
+            for (ZipEntry entry = zipStream.getNextEntry(); entry != null; entry = zipStream.getNextEntry()) {
+                java.nio.file.Path dest = location.resolve(entry.getName());
+                if (entry.isDirectory()) {
+                    Files.createDirectories(dest);
+                } else {
+                    Files.copy(zipStream, dest, StandardCopyOption.REPLACE_EXISTING);
+                }
+            }
+            zipStream.closeEntry();
+        }
+    }
+
+}
diff --git a/...akeroni/parameters/app/StaticContent.java → ...rs/app/support/StaticContentResource.java b/...akeroni/parameters/app/StaticContent.java → ...rs/app/support/StaticContentResource.java
@@ -1,4 +1,4 @@
-package be.kwakeroni.parameters.app;
+package be.kwakeroni.parameters.app.support;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,14 +13,18 @@
 import java.nio.file.Files;
 import java.util.Optional;
 
-public abstract class StaticContent {
+public abstract class StaticContentResource {
 
-    private static final Logger LOG = LoggerFactory.getLogger(StaticContent.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StaticContentResource.class);
 
     private final java.nio.file.Path contentDirectory;
     private final String indexPage;
 
-    StaticContent(java.nio.file.Path contentDirectory, String indexPage) {
+    protected StaticContentResource(StaticContent content) {
+        this(content.getContentDirectory(), content.getIndexPage());
+    }
+
+    protected StaticContentResource(java.nio.file.Path contentDirectory, String indexPage) {
         this.contentDirectory = contentDirectory.toAbsolutePath().normalize();
         this.indexPage = indexPage;
     }