Make further improvements

balins · balins · commit c738e724d008 · 2020-01-16T22:57:43.000+01:00
diff --git a/server/src/main/java/com/balinski/api_project/Main.java b/server/src/main/java/com/balinski/api_project/Main.java
@@ -12,8 +12,8 @@
 public class Main {
 
     public static void main(String[] args) {
-        testDatabase();
-//        runApplication();
+        //testDatabase();
+        runApplication();
     }
 
     static void runApplication() {
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/ActorDao.java b/server/src/main/java/com/balinski/api_project/database/dao/ActorDao.java
@@ -12,6 +12,14 @@ public ActorDao(DaoManager manager, boolean transaction) {
         super(manager, transaction);
     }
 
+    public Actor getById(int id) {
+        List<Map<String, Object>> result = manager.queryGetData(
+                "SELECT * FROM ACTOR A WHERE A.ACTOR_ID = " + id + ";"
+        );
+
+        return result.size() > 0 ? toListOfActors(result).get(0) : null;
+    }
+
     public List<Actor> getByFirstName(String firstName) {
         List<Map<String, Object>> result = manager.queryGetData(
                 "SELECT * FROM ACTOR A WHERE lower(A.FIRST_NAME) = '" + firstName.toLowerCase() + "';"
@@ -46,14 +54,6 @@ public List<Actor> getAll() {
         return toListOfActors(result);
     }
 
-    public Object getById(int id) {
-        List<Map<String, Object>> result = manager.queryGetData(
-                "SELECT * FROM ACTOR A WHERE A.ACTOR_ID = " + id + ";"
-        );
-
-        return toListOfActors(result).get(0);
-    }
-
     @Override
     public List<Actor> getIdBetween(int start, int stop) {
         List<Map<String, Object>> result = manager.queryGetData(
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/Dao.java b/server/src/main/java/com/balinski/api_project/database/dao/Dao.java
@@ -20,7 +20,6 @@ protected Dao(DaoManager manager, boolean transaction) {
 
     public abstract Integer getCount();
     public abstract List<?> getAll();
-    public abstract Object getById(int id);
     public abstract List<?> getIdBetween(int start, int stop);
     public abstract int add(Object obj);
     public abstract int addAll(List<Object> list);
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/FilmDao.java b/server/src/main/java/com/balinski/api_project/database/dao/FilmDao.java
@@ -19,6 +19,14 @@ public FilmDao(DaoManager manager, boolean transaction) {
         super(manager, transaction);
     }
 
+    public Film getById(int id) {
+        List<Map<String, Object>> result = manager.queryGetData(
+                "SELECT * FROM FILM F WHERE F.FILM_ID = " + id + ";"
+        );
+
+        return result.size() > 0 ? toListOfFilms(result).get(0) : null;
+    }
+
     public List<Film> getByTitle(String title) {
         List<Map<String, Object>> result = manager.queryGetData(
                 "SELECT * FROM FILM F WHERE lower(F.TITLE) = '" + title.toLowerCase() + "';");
@@ -151,15 +159,6 @@ public List<Film> getAll() {
         return toListOfFilms(result);
     }
 
-    @Override
-    public Object getById(int id) {
-        List<Map<String, Object>> result = manager.queryGetData(
-                "SELECT * FROM FILM F WHERE F.FILM_ID = " + id + ";"
-        );
-
-        return toListOfFilms(result).get(0);
-    }
-
     @Override
     public List<Film> getIdBetween(int start, int stop) {
         List<Map<String, Object>> result = manager.queryGetData(
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/LanguageDao.java b/server/src/main/java/com/balinski/api_project/database/dao/LanguageDao.java
@@ -12,6 +12,14 @@ public LanguageDao(DaoManager manager, boolean transaction) {
         super(manager, transaction);
     }
 
+    public Language getById(int id) {
+        List<Map<String, Object>> result = manager.queryGetData(
+                "SELECT * FROM LANGUAGE WHERE LANGUAGE_ID = " + id + ";"
+        );
+
+        return result.size() > 0 ? toListOfLanguages(result).get(0) : null;
+    }
+
     public List<Language> getByName(String name) {
         List<Map<String, Object>> result = manager.queryGetData(
                 "SELECT * FROM LANGUAGE L WHERE lower(L.NAME) = '" + name.toLowerCase() + "';"
@@ -38,15 +46,6 @@ public List<Language> getAll() {
         return toListOfLanguages(result);
     }
 
-    @Override
-    public Object getById(int id) {
-        List<Map<String, Object>> result = manager.queryGetData(
-                "SELECT * FROM LANGUAGE WHERE LANGUAGE_ID = " + id + ";"
-        );
-
-        return toListOfLanguages(result).get(0);
-    }
-
     @Override
     public List<Language> getIdBetween(int start, int stop) {
         List<Map<String, Object>> result = manager.queryGetData(
diff --git a/server/src/main/java/com/balinski/api_project/database/model/Actor.java b/server/src/main/java/com/balinski/api_project/database/model/Actor.java
@@ -2,7 +2,7 @@
 
 import java.time.LocalDateTime;
 
-public class Actor {
+public class Actor implements Jsonable {
     final int id;
     String firstName;
     String lastName;
@@ -42,4 +42,9 @@ public void setLastName(String lastName) {
     public void setLastUpdate(LocalDateTime lastUpdate) {
         this.lastUpdate = lastUpdate;
     }
+
+    public String toJson() {
+        return String.format("{\"id\":%d,\"firstName\":\"%s\",\"lastName\":\"%s\",\"lastUpdate\":\"%s\"}",
+                this.id, this.firstName, this.lastName, this.lastUpdate.toString());
+    }
 }
diff --git a/server/src/main/java/com/balinski/api_project/database/model/Film.java b/server/src/main/java/com/balinski/api_project/database/model/Film.java
@@ -3,7 +3,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-public class Film {
+public class Film implements Jsonable {
     final int id;
     String title;
     String description;
@@ -94,4 +94,13 @@ public void setLength(int length) {
     public void setLastUpdate(LocalDateTime lastUpdate) {
         this.lastUpdate = lastUpdate;
     }
+
+    public String toJson() {
+        return String.format("{\"id\":%d,\"title\":\"%s\",\"description\":\"%s\",\"releaseYear\":\"%s\"," +
+                        "\"languageId\":%d,\"rentalDuration\":%d,\"rentalRate\":%s," +
+                        "\"length\":%d,\"lastUpdate\":\"%s\"}",
+                this.id, this.title, this.description, this.releaseYear.toString(),
+                this.languageId, this.getRentalDuration(), this.rentalRate.toPlainString(),
+                this.length, this.lastUpdate);
+    }
 }
diff --git a/server/src/main/java/com/balinski/api_project/database/model/Jsonable.java b/server/src/main/java/com/balinski/api_project/database/model/Jsonable.java
@@ -0,0 +1,5 @@
+package com.balinski.api_project.database.model;
+
+public interface Jsonable {
+    String toJson();
+}
diff --git a/server/src/main/java/com/balinski/api_project/database/model/Language.java b/server/src/main/java/com/balinski/api_project/database/model/Language.java
@@ -1,8 +1,9 @@
 package com.balinski.api_project.database.model;
 
+
 import java.time.LocalDateTime;
 
-public class Language {
+public class Language implements Jsonable {
     final int id;
     String name;
     LocalDateTime lastUpdate;
@@ -32,4 +33,9 @@ public void setName(String name) {
     public void setLastUpdate(LocalDateTime lastUpdate) {
         this.lastUpdate = lastUpdate;
     }
+
+    public String toJson() {
+        return String.format("{\"id\":%d,\"name\":\"%s\",\"lastUpdate\":\"%s\"}",
+                    this.id, this.name, this.lastUpdate.toString());
+    }
 }
diff --git a/server/src/main/java/com/balinski/api_project/server/handler/WebAppContextWrapper.java b/server/src/main/java/com/balinski/api_project/server/handler/WebAppContextWrapper.java
@@ -1,6 +1,6 @@
 package com.balinski.api_project.server.handler;
 
-import com.balinski.api_project.servlet.SimpleServlet;
+import com.balinski.api_project.servlet.ActorServlet;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.*;
@@ -21,7 +21,7 @@ public WebAppContext getWebAppContext() {
     }
 
     private void registerServlets() {
-        context.addServlet(SimpleServlet.class, "/simple");
+        context.addServlet(ActorServlet.class, "/actors");
     }
 
 }
diff --git a/server/src/main/java/com/balinski/api_project/servlet/ActorServlet.java b/server/src/main/java/com/balinski/api_project/servlet/ActorServlet.java
@@ -0,0 +1,29 @@
+package com.balinski.api_project.servlet;
+
+import com.balinski.api_project.database.DaoManager;
+import com.balinski.api_project.database.dao.DaoException;
+import com.balinski.api_project.database.model.Actor;
+import com.balinski.api_project.util.JsonHelper;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+
+
+public class ActorServlet extends HttpServlet {
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        PrintWriter writer = resp.getWriter();
+        try {
+            List<Actor> actors = new DaoManager().getActorDao().getAll();
+            String response = JsonHelper.mergeFromList(actors);
+            writer.print(response);
+        } catch (DaoException e) {
+            writer.print("{\"error\":true,\"data\":[]}");
+        } catch (NullPointerException e) {
+            writer.print("{\"error\":false,\"data\":[]}");
+        }
+    }
+}
diff --git a/server/src/main/java/com/balinski/api_project/servlet/SimpleServlet.java b/server/src/main/java/com/balinski/api_project/servlet/SimpleServlet.java
diff --git a/server/src/main/java/com/balinski/api_project/util/JsonHelper.java b/server/src/main/java/com/balinski/api_project/util/JsonHelper.java
@@ -0,0 +1,26 @@
+package com.balinski.api_project.util;
+
+import com.balinski.api_project.database.model.Jsonable;
+
+import java.util.List;
+
+public class JsonHelper {
+    public static String mergeFromList(List<? extends Jsonable> list) {
+        if(list == null) {
+            return "{\"error\":true,\"data\":[]}";
+        }
+
+        StringBuilder sb = new StringBuilder("{\"error\":false,\"data\":[");
+
+        if(list.size() > 0) {
+            for (var jsonable : list)
+                sb.append(jsonable.toJson()).append(",");
+
+            sb.setLength(sb.length() - 1);
+        }
+
+        sb.append("]}");
+
+        return sb.toString();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`public class Main {`
`13`	`13`
`14`	`14`	`public static void main(String[] args) {`
`15`		`- testDatabase();`
`16`		`-// runApplication();`
	`15`	`+ //testDatabase();`
	`16`	`+ runApplication();`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`static void runApplication() {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.balinski.api_project.server.handler;`
`2`	`2`
`3`		`-import com.balinski.api_project.servlet.SimpleServlet;`
	`3`	`+import com.balinski.api_project.servlet.ActorServlet;`
`4`	`4`	`import org.eclipse.jetty.webapp.WebAppContext;`
`5`	`5`
`6`	`6`	`import java.io.*;`
`@@ -21,7 +21,7 @@ public WebAppContext getWebAppContext() {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`private void registerServlets() {`
`24`		`- context.addServlet(SimpleServlet.class, "/simple");`
	`24`	`+ context.addServlet(ActorServlet.class, "/actors");`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`}`