gradle stuff

build.gradle

@@ -45,3 +45,40 @@ dependencies {
 test {
     useJUnitPlatform()
 }
+
+def webappDir = "$projectDir/src/main/webapp"
+
+processResources {
+    dependsOn "buildAngular"
+}
+
+task buildAngular(type: Exec) {
+    // installAngular should be run prior to this task
+    dependsOn "installAngular"
+    workingDir "$webappDir"
+    inputs.dir "$webappDir"
+    // Add task to the standard build group
+    group = BasePlugin.BUILD_GROUP
+    // ng doesn't exist as a file in windows -> ng.cmd
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
+        commandLine "ng.cmd", "build"
+    } else {
+        commandLine "ng", "build"
+    }
+
+    copy {
+        from "$webappDir/dist/webapp"
+        into "$projectDir/src/main/resources/public"
+    }
+}
+
+task installAngular(type: Exec) {
+    workingDir "$webappDir"
+    inputs.dir "$webappDir"
+    group = BasePlugin.BUILD_GROUP
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
+        commandLine "npm.cmd", "install"
+    } else {
+        commandLine "npm", "install"
+    }
+}

docker-compose.yml

@@ -9,4 +9,4 @@ services:
   kibana:
     image: docker.elastic.co/kibana/kibana:7.6.0
     ports:
-      - 5601:5601
+      - 5601:5601

src/main/java/org/z/geojsontranslator/ElasticQueries.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -24,9 +25,11 @@
 /**
  * very original name
  */
+@PropertySource("classpath:application.properties")
 @Service
 public class ElasticQueries {
     public static final int QUERY_MAX_SIZE = 1500;
+
     @Value("${spring.elasticsearch.rest.index}")
     private String index;
 

src/main/resources/application.properties

@@ -1,3 +1,5 @@
 spring.elasticsearch.rest.uris=${ELASTIC_HOST:localhost:9200}
+spring.elasticsearch.rest.username=${ELASTIC_USER}
+spring.elasticsearch.rest.password=${ELASTIC_PASS}
 spring.elasticsearch.rest.index=${ELASTIC_INDEX:india_marine_vessels}
 prod=${PRODUCTION:false}