news controller advice

server/src/main/java/com/stockr/server/exception/MissingQueryParameters.java

@@ -1,9 +0,0 @@
-package com.stockr.server.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(value = HttpStatus.BAD_REQUEST)
-public class MissingQueryParameters extends RuntimeException{
-
-}

server/src/main/java/com/stockr/server/news/NewsController.java

@@ -1,6 +1,5 @@
 package com.stockr.server.news;
 
-import com.stockr.server.exception.MissingQueryParameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,7 +12,7 @@ public class NewsController {
     NewsService ns;
 
     @GetMapping// root
-    public ArrayList<Article> getAllArticles(@RequestParam("query") String query) throws MissingQueryParameters{
+    public ArrayList<Article> getAllArticles(@RequestParam("query") String query){
         return ns.getAllArticles(query);
     }
 }

server/src/main/java/com/stockr/server/news/NewsControllerAdvice.java

@@ -0,0 +1,29 @@
+package com.stockr.server.news;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import java.io.IOException;
+
+@ControllerAdvice(basePackageClasses = NewsControllerAdvice.class)
+public class NewsControllerAdvice {
+    private ObjectMapper om = new ObjectMapper();
+
+    @ExceptionHandler(MissingServletRequestParameterException.class)
+    public ResponseEntity<Object> handleMissingParams(MissingServletRequestParameterException ex) throws IOException {
+        return ResponseEntity
+                .badRequest()
+                .body(removeStackTrace(ex));
+    }
+
+    ObjectNode removeStackTrace(Exception ex) throws IOException {
+        String exAsString = om.writeValueAsString(ex);
+        ObjectNode o = om.readValue(exAsString, ObjectNode.class);
+        o.remove("stackTrace");
+        return o;
+    }
+}

server/src/test/java/com/stockr/server/ServerApplicationTests.java

@@ -6,11 +6,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
 public class ServerApplicationTests {
 
 	@Test
-	public void contextLoads() {
+	public void ServerApplication_Should_Start() {
+		ServerApplication.main(new String[] {});
 	}
 
 }

server/src/test/java/com/stockr/server/news/ArticleTest.java

@@ -9,7 +9,7 @@ import static org.junit.Assert.*;
 
 public class ArticleTest {
     @Test
-    public void testUnpackNestedSource() throws IOException {
+    public void unpackSource_ShouldGetNestedValues() throws IOException {
         ObjectMapper om = new ObjectMapper();
         String JSON = "{\"source\":" +
                         " {\"id\": \"ID\"," +

server/src/test/java/com/stockr/server/news/NewsControllerAdviceTest.java

@@ -0,0 +1,21 @@
+package com.stockr.server.news;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+
+public class NewsControllerAdviceTest {
+    NewsControllerAdvice nca = new NewsControllerAdvice();
+
+    @Test
+    public void removeStackTrace_ShouldRemoveStackTrace() throws IOException {
+        Exception ex = new Exception();
+        ex.fillInStackTrace();
+
+        assertNull(nca.removeStackTrace(ex).get("stackTrace"));
+    }
+}

server/src/test/java/com/stockr/server/news/NewsControllerTest.java

@@ -6,12 +6,16 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -26,7 +30,7 @@ public class NewsControllerTest {
     private NewsService service;
 
     @Test
-    public void news_Should_Use_Method_getAllArticles() throws Exception {
+    public void news_ShouldUseMethod_getAllArticles() throws Exception {
         when(service.getNews("test")).thenReturn(new News());
         this.mockMvc.perform(get("/news?query=fb"))
                 .andDo(print())
@@ -34,7 +38,7 @@ public class NewsControllerTest {
     }
 
     @Test
-    public void news_Should_Return_A_Json_Array() throws Exception {
+    public void news_ShouldReturnJsonArray() throws Exception {
         when(service.getNews("test")).thenReturn(new News());
         this.mockMvc.perform(get("/news?query=fb"))
                 .andDo(print())
@@ -42,10 +46,10 @@ public class NewsControllerTest {
     }
 
     @Test
-    public void news_When_No_Queries_Throw_Exception() throws Exception {
+    public void news_ShouldHaveBadRequest_WhenNoQueries() throws Exception {
         when(service.getNews("test")).thenReturn(new News());
         this.mockMvc.perform(get("/news"))
                 .andDo(print())
-                .andExpect(content().string("[]"));
+                .andExpect(status().isBadRequest());
     }
 }

server/src/test/java/com/stockr/server/news/NewsServiceTest.java

@@ -3,14 +3,11 @@ package com.stockr.server.news;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.hamcrest.Matchers;
-import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.client.RestClientTest;
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -62,32 +59,32 @@ public class NewsServiceTest {
     }
 
     @Test
-    public void getNews_Should_Hit_The_Proper_Endpoint() {
+    public void getNews_ShouldHitTheProperEndpoint() {
         ns.getNews("test");
         mrss.verify();
     }
 
     @Test
-    public void getNews_Should_Send_XApiKey_Header() {
+    public void getNewsShouldSendXApiKeyHeader() {
         ns.getNews("test");
         mrss.verify();
     }
 
     @Test
-    public void getNews_Should_Parse_The_JSON_Properly() {
+    public void getNews_ShouldParseJsonProperly() {
         News ne = ns.getNews("test");
         assertEquals("Author Name", ne.getArticles().get(0).getAuthor());
     }
 
     @Test
-    public void getAllArticles_Should_Return_An_ArrayList() {
+    public void getAllArticles_ShouldReturnArrayList() {
         ArrayList ne = ns.getAllArticles("test");
         assertNotNull(ne);
     }
 
 
     @Test
-    public void insertQueryInUrl_Given_Query_Should_Insert_In_Url() {
+    public void insertQueryInUrl_ShouldPassQueryIntoUrl() {
         String query = "tesla";
         String expected = "https://newsapi.org/v2/everything?q=" + query +
                 "&language=en" +