From 9490c4f3f70aeeb1ceefee34536ca7bfb941947b Mon Sep 17 00:00:00 2001
From: r84160880 <ramazan.sakin@huawei.com>
Date: Wed, 22 Jul 2020 16:18:27 +0300
Subject: [PATCH 1/2] Dockerizing app & docker-compose for elasticsearch
 container

---
 Dockerfile         |  7 +++++++
 docker-compose.yml | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..aa072c8
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+# Basic Template Dockerfile
+FROM openjdk:8-jdk-alpine
+
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} app.jar
+
+ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..a881258
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,35 @@
+version: "3.8"
+services:
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.8.6
+    container_name: elasticsearch
+    restart: unless-stopped
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      cluster.name: elasticsearch
+      discovery.type: single-node
+      bootstrap.memory_lock: "true"
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    healthcheck:
+      test: "curl -f http://localhost:9200 || exit 1"
+      start_period: 1m
+
+#  elastic-boot:
+#    container_name: elastic-boot-container
+#    build:
+#      context: ./
+#      dockerfile: Dockerfile
+#    ports:
+#      - "8090:8090"
+#    depends_on: # Start the depends_on first
+#      - elasticsearch
+#    healthcheck:
+#      test: "wget --quiet --tries=1 --spider http://localhost:8090 || exit 1"
+#    restart: unless-stopped
+

From df96cc4c6ea30cd51b8f1e7638f4c93d657fedb8 Mon Sep 17 00:00:00 2001
From: Ramazan Sakin <ramazansakin63@gmail.com>
Date: Mon, 17 Aug 2020 17:30:16 +0300
Subject: [PATCH 2/2] Clean up

---
 .../elasticsearch_autocomplete/service/UserService.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/thelivelock/elasticsearch_autocomplete/service/UserService.java b/src/main/java/com/thelivelock/elasticsearch_autocomplete/service/UserService.java
index e600e16..b746fb3 100644
--- a/src/main/java/com/thelivelock/elasticsearch_autocomplete/service/UserService.java
+++ b/src/main/java/com/thelivelock/elasticsearch_autocomplete/service/UserService.java
@@ -2,18 +2,18 @@
 
 import com.thelivelock.elasticsearch_autocomplete.model.User;
 import com.thelivelock.elasticsearch_autocomplete.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
+@RequiredArgsConstructor
 public class UserService {
 
-    @Autowired
-    private UserRepository userRepository;
+    private final UserRepository userRepository;
 
     public List<User> listAll() {
         return this.userRepository.findAll();