From 589a2c1fca4349b8d26ed81dba229c1b950938ea Mon Sep 17 00:00:00 2001 From: ravincpatil <87229315+ravincpatil@users.noreply.github.com> Date: Sun, 25 Jul 2021 16:46:39 +0530 Subject: [PATCH 1/3] Add files via upload --- Procfile | 1 + README.md | 3 +- pom.xml | 61 +++++++++++++++++++ .../buddy/samples/WorksWithHerokuServlet.java | 19 ++++++ src/main/webapp/WEB-INF/web.xml | 18 ++++++ .../samples/WorksWithHerokuServletTest.java | 41 +++++++++++++ test | 1 + 7 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 Procfile create mode 100644 pom.xml create mode 100644 src/main/java/works/buddy/samples/WorksWithHerokuServlet.java create mode 100644 src/main/webapp/WEB-INF/web.xml create mode 100644 src/test/java/works/buddy/samples/WorksWithHerokuServletTest.java create mode 100644 test diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..e69342e --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: java $JAVA_OPTS -jar target/dependency/jetty-runner.jar --port $PORT target/*.war diff --git a/README.md b/README.md index 581ae95..fd0fd7b 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# JavaRepo \ No newline at end of file +# Simple Java Project +This is a demo project that you can use with [Buddy Continuous Deployment](https://buddy.works). diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..faeb2ad --- /dev/null +++ b/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + works.buddy.samples + works-with-heroku + 1.0 + war + + + javax.servlet + servlet-api + 2.5 + provided + + + junit + junit + 4.12 + test + + + org.mockito + mockito-all + 1.10.19 + test + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.3 + + + package + copy + + 1.6 + 1.6 + + 1.6 + 1.6 + + + + org.eclipse.jetty + jetty-runner + 9.3.3.v20150827 + jetty-runner.jar + + + + + + + + + diff --git a/src/main/java/works/buddy/samples/WorksWithHerokuServlet.java b/src/main/java/works/buddy/samples/WorksWithHerokuServlet.java new file mode 100644 index 0000000..f8b0ee3 --- /dev/null +++ b/src/main/java/works/buddy/samples/WorksWithHerokuServlet.java @@ -0,0 +1,19 @@ +package works.buddy.samples; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + +public class WorksWithHerokuServlet extends HttpServlet { + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/plain"); + response.setStatus(404); + PrintWriter writer = response.getWriter(); + writer.print("WEB APP WORKING"); + writer.close(); + } +} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..1c789e3 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,18 @@ + + + + Works with Heroku + + + WorksWithHerokuServlet + works.buddy.samples.WorksWithHerokuServlet + + + + WorksWithHerokuServlet + / + + + diff --git a/src/test/java/works/buddy/samples/WorksWithHerokuServletTest.java b/src/test/java/works/buddy/samples/WorksWithHerokuServletTest.java new file mode 100644 index 0000000..f3e4c66 --- /dev/null +++ b/src/test/java/works/buddy/samples/WorksWithHerokuServletTest.java @@ -0,0 +1,41 @@ +package works.buddy.samples; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; +import java.io.PrintWriter; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; + +public class WorksWithHerokuServletTest { + + private WorksWithHerokuServlet servlet; + + @Mock + private HttpServletRequest request; + + @Mock + private HttpServletResponse response; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + servlet = new WorksWithHerokuServlet(); + } + + @Test + public void testDoGet() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + PrintWriter writer = new PrintWriter(out); + when(response.getWriter()).thenReturn(writer); + + servlet.doGet(request, response); + assertEquals("WEB APP WORKING", new String( out.toByteArray(), "UTF-8")); + } +} diff --git a/test b/test new file mode 100644 index 0000000..6e7ae51 --- /dev/null +++ b/test @@ -0,0 +1 @@ +THis is to Check Github Webhook Trigger 2 From 18cbd85be4c90552be6eb8b9c412698c641c3e7d Mon Sep 17 00:00:00 2001 From: ravincpatil <87229315+ravincpatil@users.noreply.github.com> Date: Thu, 5 Aug 2021 19:00:40 +0530 Subject: [PATCH 2/3] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index faeb2ad..6d56051 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ 1.6 1.6 - 1.6 - 1.6 + 1.8 + 1.8 From 37d852608c361f35ecc0537043fbd4a2d4d584cf Mon Sep 17 00:00:00 2001 From: ravincpatil <87229315+ravincpatil@users.noreply.github.com> Date: Thu, 5 Aug 2021 20:02:05 +0530 Subject: [PATCH 3/3] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6d56051..7bfebaf 100644 --- a/pom.xml +++ b/pom.xml @@ -38,8 +38,8 @@ package copy - 1.6 - 1.6 + 1.8 + 1.8 1.8 1.8