diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml index 51c3f85414..17897e5118 100644 --- a/libraries-3/pom.xml +++ b/libraries-3/pom.xml @@ -92,7 +92,7 @@ org.apache.velocity velocity-engine-core - 2.0 + 2.2 com.zaxxer diff --git a/libraries-3/src/main/java/com/baeldung/takes/TakesApp.java b/libraries-3/src/main/java/com/baeldung/takes/TakesApp.java index 93c34f8aff..ea81612b86 100644 --- a/libraries-3/src/main/java/com/baeldung/takes/TakesApp.java +++ b/libraries-3/src/main/java/com/baeldung/takes/TakesApp.java @@ -28,7 +28,7 @@ public final class TakesApp { new TkFallback( new TkSlf4j( new TkFork( - new FkRegex("/", "Hello, World!"), + new FkRegex("/", new TakesHelloWorld()), new FkRegex("/index", new TakesIndex()), new FkRegex("/contact", new TakesContact()), new FkRegex("/createUser", new TakesCreateUser(TakesApp.dbConnection())), @@ -46,8 +46,7 @@ public final class TakesApp { ); } }) - ), - 6060 + ), 6060 ).start(Exit.NEVER); } diff --git a/libraries-3/src/main/java/com/baeldung/takes/TakesContact.java b/libraries-3/src/main/java/com/baeldung/takes/TakesContact.java index 90789c54a9..6e2900ce67 100644 --- a/libraries-3/src/main/java/com/baeldung/takes/TakesContact.java +++ b/libraries-3/src/main/java/com/baeldung/takes/TakesContact.java @@ -1,8 +1,5 @@ package com.baeldung.takes; -import java.io.IOException; -import java.sql.SQLException; - import org.takes.Request; import org.takes.Response; import org.takes.Take; @@ -13,7 +10,7 @@ import org.takes.rs.RsWithType; public final class TakesContact implements Take { @Override - public Response act(Request req) throws IOException, SQLException { + public Response act(Request req) { return new RsWithStatus(new RsWithType(new RsWithBody("" + "" + "Takes Application - Contact" @@ -22,5 +19,4 @@ public final class TakesContact implements Take { + ""), "text/html"), 200); } - } diff --git a/libraries-3/src/main/java/com/baeldung/takes/TakesCreateUser.java b/libraries-3/src/main/java/com/baeldung/takes/TakesCreateUser.java index 5aae7f1ab4..3a17f96ca3 100644 --- a/libraries-3/src/main/java/com/baeldung/takes/TakesCreateUser.java +++ b/libraries-3/src/main/java/com/baeldung/takes/TakesCreateUser.java @@ -21,7 +21,7 @@ public final class TakesCreateUser implements Take { } @Override - public Response act(final Request req) throws IOException, SQLException { + public Response act(final Request req) throws IOException { RqForm form = new RqFormSmart(req); Iterable idParam = form.param("id"); diff --git a/libraries-3/src/main/java/com/baeldung/takes/TkRoute.java b/libraries-3/src/main/java/com/baeldung/takes/TakesHelloWorld.java similarity index 84% rename from libraries-3/src/main/java/com/baeldung/takes/TkRoute.java rename to libraries-3/src/main/java/com/baeldung/takes/TakesHelloWorld.java index 849aaa8240..9d1346d3c1 100644 --- a/libraries-3/src/main/java/com/baeldung/takes/TkRoute.java +++ b/libraries-3/src/main/java/com/baeldung/takes/TakesHelloWorld.java @@ -5,7 +5,7 @@ import org.takes.Response; import org.takes.Take; import org.takes.rs.RsText; -public final class TkRoute implements Take { +public class TakesHelloWorld implements Take { @Override public Response act(final Request request) { diff --git a/libraries-3/src/main/java/com/baeldung/takes/TakesIndex.java b/libraries-3/src/main/java/com/baeldung/takes/TakesIndex.java index 67487bf200..93c61b51ff 100644 --- a/libraries-3/src/main/java/com/baeldung/takes/TakesIndex.java +++ b/libraries-3/src/main/java/com/baeldung/takes/TakesIndex.java @@ -1,7 +1,6 @@ package com.baeldung.takes; import java.io.IOException; -import java.sql.SQLException; import org.takes.Request; import org.takes.Response; @@ -12,7 +11,7 @@ import org.takes.rs.RsVelocity; public final class TakesIndex implements Take { @Override - public Response act(final Request req) throws IOException, SQLException { + public Response act(final Request req) throws IOException { return new RsHtml(new RsVelocity(this.getClass().getResource("/templates/index.vm") ,new RsVelocity.Pair("userName", "Anshul"))); } diff --git a/libraries-3/src/main/java/com/baeldung/takes/TakesReadUser.java b/libraries-3/src/main/java/com/baeldung/takes/TakesReadUser.java index 0fc2aa188e..b06ae53428 100644 --- a/libraries-3/src/main/java/com/baeldung/takes/TakesReadUser.java +++ b/libraries-3/src/main/java/com/baeldung/takes/TakesReadUser.java @@ -18,15 +18,15 @@ import org.takes.rs.RsJson; public final class TakesReadUser implements Take { - + public static Connection con; - + TakesReadUser(Connection connection) { con = connection; } @Override - public Response act(final Request req) throws IOException, SQLException { + public Response act(final Request req) throws IOException { Href href = new RqHref.Base(req).href(); Iterable ids = href.param("id"); int id = Integer.parseInt((String) ids.iterator().next()); @@ -43,7 +43,7 @@ public final class TakesReadUser implements Take { } catch (SQLException e) { e.printStackTrace(); } - + return new RsJson(json); }