From edcdfc01f5ee30e71b26fce41e143f9b305cfab7 Mon Sep 17 00:00:00 2001 From: Xcreen Date: Wed, 26 Feb 2020 11:49:08 +0100 Subject: [PATCH] Rewrite: SMSWelcomeServlet --- .../restsms/server/SMSWelcomeServlet.java | 28 ------------------- .../restsms/server/SMSWelcomeServlet.kt | 22 +++++++++++++++ 2 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.java create mode 100644 app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.kt diff --git a/app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.java b/app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.java deleted file mode 100644 index 699106b..0000000 --- a/app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.xcreen.restsms.server; - -import java.io.IOException; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class SMSWelcomeServlet extends HttpServlet { - - private ServerLogging serverLogging; - - public SMSWelcomeServlet(ServerLogging serverLogging){ - this.serverLogging = serverLogging; - } - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { - String requestURI = request.getRequestURI(); - if(requestURI != null){ - serverLogging.log("info", "Welcome-Servlet [" + request.getMethod() + "] Request " + requestURI + " From: " + request.getRemoteAddr()); - } - else { - serverLogging.log("info", "Welcome-Servlet [" + request.getMethod() + "] Request / From: " + request.getRemoteAddr()); - } - response.getWriter().println("RestSMS-Server is running!"); - } -} diff --git a/app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.kt b/app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.kt new file mode 100644 index 0000000..ea7fd10 --- /dev/null +++ b/app/src/main/java/net/xcreen/restsms/server/SMSWelcomeServlet.kt @@ -0,0 +1,22 @@ +package net.xcreen.restsms.server + +import java.io.IOException +import javax.servlet.http.HttpServlet +import javax.servlet.http.HttpServletRequest +import javax.servlet.http.HttpServletResponse + +class SMSWelcomeServlet(private val serverLogging: ServerLogging) : HttpServlet() { + + @Throws(IOException::class) + override fun doGet(request: HttpServletRequest, response: HttpServletResponse) { + val requestURI = request.requestURI + if (requestURI != null) { + serverLogging.log("info", "Welcome-Servlet [" + request.method + "] Request " + requestURI + " From: " + request.remoteAddr) + } + else { + serverLogging.log("info", "Welcome-Servlet [" + request.method + "] Request / From: " + request.remoteAddr) + } + response.writer.println("RestSMS-Server is running!") + } + +} \ No newline at end of file