Merge pull request #11 from dartartem/master

moved swagger-ui to META-INF/static-content

eventuate-util-swagger-ui-tests/build.gradle

@@ -0,0 +1,6 @@
+dependencies {
+    testCompile project(":eventuate-util-swagger-ui")
+    testCompile "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"
+    testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
+    testCompile "junit:junit:4.12"
+}

eventuate-util-swagger-ui-tests/src/test/java/io/eventuate/util/swaggerui/tests/SwaggerUiAvailabilityTest.java

@@ -0,0 +1,38 @@
+package io.eventuate.util.swaggerui.tests;
+
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = SwaggerUiAvailabilityTest.Config.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class SwaggerUiAvailabilityTest {
+  @Configuration
+  @EnableAutoConfiguration
+  public static class Config {
+  }
+
+  @LocalServerPort
+  private int port;
+
+  @Test
+  public void testSwaggerUiAvailability() throws IOException {
+    assertUrlStatusIsOk(String.format("http://%s:%s/swagger-ui/index.html", "localhost", port));
+  }
+
+  private void assertUrlStatusIsOk(String url) throws IOException {
+    HttpURLConnection connection = (HttpURLConnection)new URL(url).openConnection();
+
+    Assert.assertEquals(200, connection.getResponseCode());
+  }
+}

eventuate-util-swagger-ui-tests/src/test/resources/application.properties

@@ -0,0 +1 @@
+spring.resources.static-locations=classpath:META-INF/static-content

eventuate-util-swagger-ui/build.gradle

@@ -30,12 +30,12 @@ jar {
     dependsOn unzipSwaggerUi
 
     from("${buildDir}/swagger-ui-unzipped/swagger-ui-${swaggerUiVersion}/dist") {
-        into "META-INF/swagger-ui"
+        into "META-INF/static-content/swagger-ui"
         exclude "index.html"
     }
 
     from("${buildDir}/swagger-ui-unzipped/swagger-ui-${swaggerUiVersion}/dist/index.html") {
-        into "META-INF/swagger-ui"
+        into "META-INF/static-content/swagger-ui"
         filter {it.replaceAll("\"https://petstore.swagger.io/v2/swagger.json\"", "window.location.origin + \"/swagger/swagger.yml\"") }
     }
 }

gradle.properties

@@ -1,7 +1,7 @@
 
 deployUrl=file:///Users/cer/.m2/testdeploy
 eventuateMavenRepoUrl=file:///Users/cer/.m2/testdeploy,https://dl.bintray.com/eventuateio-oss/eventuate-maven-release,https://snapshots.repositories.eventuate.io/repository
-springBootVersion=1.4.7.RELEASE
+springBootVersion=2.2.6.RELEASE
 swaggerUiVersion=3.17.1
 eventuatePluginsGradleVersion=0.8.0.RELEASE
-version=0.11.0-SNAPSHOT
+version=0.12.0-SNAPSHOT

settings.gradle

@@ -1,3 +1,4 @@
 include "eventuate-util-test"
 include "eventuate-util-swagger-ui"
+include "eventuate-util-swagger-ui-tests"
 include "eventuate-util-spring-swagger"