From 00fd7e248c7f3253097b9f5765560415ba37e6ef Mon Sep 17 00:00:00 2001 From: "david.hammerton" Date: Fri, 28 Feb 2020 15:30:49 +0000 Subject: [PATCH 1/6] first pull build --- src/main/java/com/inmarsat/esb/ServiceApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/inmarsat/esb/ServiceApplication.java b/src/main/java/com/inmarsat/esb/ServiceApplication.java index 48fd56b..015b3bb 100644 --- a/src/main/java/com/inmarsat/esb/ServiceApplication.java +++ b/src/main/java/com/inmarsat/esb/ServiceApplication.java @@ -32,7 +32,7 @@ ServletRegistrationBean servletRegistrationBean() { final ServletRegistrationBean servlet = new ServletRegistrationBean(new CamelHttpTransportServlet(), apiPath.endsWith("/") ? apiPath + "*" : apiPath + "/*"); servlet.setName("CamelServlet"); String s; - System.out.println("Hello World"); + System.out.println("Hello World 2"); return servlet; } } From 74ed2d2dfe991d961f724d9d641269d252fb5580 Mon Sep 17 00:00:00 2001 From: "david.hammerton" Date: Fri, 28 Feb 2020 15:38:32 +0000 Subject: [PATCH 2/6] failing build --- src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java b/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java index 6a56fce..065fd87 100644 --- a/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java +++ b/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java @@ -22,6 +22,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @@ -50,4 +51,9 @@ public void sampleBlackBoxTest() throws UnirestException { // do something useful here... } -} \ No newline at end of file + + @Test + public void brokenTest() { + assertTrue(false); + } +} From b6f493e4caf277505f63f0718560efffd5118d8f Mon Sep 17 00:00:00 2001 From: "david.hammerton" Date: Fri, 28 Feb 2020 15:43:31 +0000 Subject: [PATCH 3/6] fixed broken test --- src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java b/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java index 065fd87..a1197e7 100644 --- a/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java +++ b/src/test/java/com/inmarsat/esb/ExampleBlackBoxTest.java @@ -52,8 +52,5 @@ public void sampleBlackBoxTest() throws UnirestException { // do something useful here... } - @Test - public void brokenTest() { - assertTrue(false); - } + } From b55461bb9770c85a3a59193bce95c34584066177 Mon Sep 17 00:00:00 2001 From: "david.hammerton" Date: Thu, 5 Mar 2020 13:33:31 +0000 Subject: [PATCH 4/6] fixed broken test --- src/main/java/com/inmarsat/esb/ServiceApplication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/inmarsat/esb/ServiceApplication.java b/src/main/java/com/inmarsat/esb/ServiceApplication.java index 015b3bb..1a8da68 100644 --- a/src/main/java/com/inmarsat/esb/ServiceApplication.java +++ b/src/main/java/com/inmarsat/esb/ServiceApplication.java @@ -33,6 +33,8 @@ ServletRegistrationBean servletRegistrationBean() { servlet.setName("CamelServlet"); String s; System.out.println("Hello World 2"); + + System.out.println("Hello team"); return servlet; } } From 9678b9e2b32e368d7571788d8c395c1bf6bf95ee Mon Sep 17 00:00:00 2001 From: "david.hammerton" Date: Thu, 5 Mar 2020 16:53:07 +0000 Subject: [PATCH 5/6] fixed broken test --- src/main/java/com/inmarsat/esb/ServiceApplication.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/inmarsat/esb/ServiceApplication.java b/src/main/java/com/inmarsat/esb/ServiceApplication.java index 1a8da68..63c3e1c 100644 --- a/src/main/java/com/inmarsat/esb/ServiceApplication.java +++ b/src/main/java/com/inmarsat/esb/ServiceApplication.java @@ -34,7 +34,6 @@ ServletRegistrationBean servletRegistrationBean() { String s; System.out.println("Hello World 2"); - System.out.println("Hello team"); return servlet; } } From dc0ae24613f03f741b7c44938d18fb48591a3515 Mon Sep 17 00:00:00 2001 From: David Hammerton Date: Thu, 14 Apr 2022 15:42:53 +0100 Subject: [PATCH 6/6] Update ServiceApplication.java --- src/main/java/com/inmarsat/esb/ServiceApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/inmarsat/esb/ServiceApplication.java b/src/main/java/com/inmarsat/esb/ServiceApplication.java index 63c3e1c..5eed2f0 100644 --- a/src/main/java/com/inmarsat/esb/ServiceApplication.java +++ b/src/main/java/com/inmarsat/esb/ServiceApplication.java @@ -19,6 +19,7 @@ public class ServiceApplication { // NOSONAR public int i; + public int j; @PropertyInject("api.base.path") private String apiPath;