diff --git a/src/main/java/api/Orders.java b/src/main/java/servlet/api/Orders.java
similarity index 99%
rename from src/main/java/api/Orders.java
rename to src/main/java/servlet/api/Orders.java
index a0233fa..67cc24e 100644
--- a/src/main/java/api/Orders.java
+++ b/src/main/java/servlet/api/Orders.java
@@ -1,4 +1,4 @@
-package api;
+package servlet.api;
import DTO.Order;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/form/Index.java b/src/main/java/servlet/html/Index.java
similarity index 76%
rename from src/main/java/form/Index.java
rename to src/main/java/servlet/html/Index.java
index 43a3274..e202950 100644
--- a/src/main/java/form/Index.java
+++ b/src/main/java/servlet/html/Index.java
@@ -1,4 +1,6 @@
-package form;
+package servlet.html;
+
+import util.FileUtil;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@@ -12,6 +14,7 @@ public class Index extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html; charset=utf-8");
- response.getWriter().print("Orders form");
+ String index = FileUtil.readFileFromClasspath("html/index.html");
+ response.getWriter().print(index);
}
}
diff --git a/src/main/java/form/OrdersForm.java b/src/main/java/servlet/html/OrdersForm.java
similarity index 97%
rename from src/main/java/form/OrdersForm.java
rename to src/main/java/servlet/html/OrdersForm.java
index 6976d1d..0d7850b 100644
--- a/src/main/java/form/OrdersForm.java
+++ b/src/main/java/servlet/html/OrdersForm.java
@@ -1,7 +1,7 @@
-package form;
+package servlet.html;
import DTO.Order;
-import api.Orders;
+import servlet.api.Orders;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
diff --git a/src/main/java/test/HelloServlet.java b/src/main/java/servlet/test/HelloServlet.java
similarity index 96%
rename from src/main/java/test/HelloServlet.java
rename to src/main/java/servlet/test/HelloServlet.java
index 7d68f3f..baa025e 100644
--- a/src/main/java/test/HelloServlet.java
+++ b/src/main/java/servlet/test/HelloServlet.java
@@ -1,4 +1,4 @@
-package test;
+package servlet.test;
import java.io.IOException;
import javax.servlet.ServletException;
diff --git a/src/main/java/util/FileUtil.java b/src/main/java/util/FileUtil.java
new file mode 100644
index 0000000..e2561dc
--- /dev/null
+++ b/src/main/java/util/FileUtil.java
@@ -0,0 +1,26 @@
+package util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.stream.Collectors;
+
+public class FileUtil {
+
+ public static String readFileFromClasspath(String pathOnClasspath) {
+ try (InputStream is = FileUtil.class.getClassLoader().getResourceAsStream(pathOnClasspath)) {
+ if (is == null) {
+ throw new IllegalStateException("can't load file: " + pathOnClasspath);
+ }
+
+ BufferedReader buffer = new BufferedReader(new InputStreamReader(is));
+
+ return buffer.lines().collect(Collectors.joining("\n"));
+
+ } catch (IOException e) {
+ throw new RuntimeException();
+ }
+ }
+
+}
diff --git a/src/main/resources/html/index.html b/src/main/resources/html/index.html
new file mode 100644
index 0000000..3b51e24
--- /dev/null
+++ b/src/main/resources/html/index.html
@@ -0,0 +1,9 @@
+
+
+Index
+Shop
+Menu
+
+