Refactoring - clean code

Author: anitsh

src/main/java/hackerrank/api/BarcodeNotFoundException.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.net.httpserver.HttpHandler;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -12,22 +11,25 @@
 
 public class BarcodeReader   {
 
-    private final static String TAG = HttpHandler.class.getSimpleName();
+    private final static String TAG = BarcodeReader.class.getSimpleName();
     private final static Logger logger =
             Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
-    private final static String barcodeURI = "https://jsonmock.hackerrank.com/api/inventory?barcode=";
+    private final static String inventoryURI = "https://jsonmock.hackerrank.com/api/inventory";
 
-    public Inventory read(int barcode)
-            throws BarcodeNotFoundException {
-        Inventory[] inventories = null;
+    public Inventory read(int barcode) {
+        Inventory inventory = null;
+        String barcodeURI = inventoryURI + "?barcode=";
 
         try {
             String inventoryJSONString = InputStreamConverter.toString(
-                    HttpRequests.get(barcodeURI+barcode))
-                    .toString();
+                    HttpRequests.get(barcodeURI+barcode));
 
-            inventories =  getInventories(inventoryJSONString);
+            inventory =  getInventories(inventoryJSONString)[0];
 
+        } catch (InventoryNotFoundException e) {
+            if (logger.isLoggable(Level.INFO)) {
+                logger.log(Level.INFO, TAG + " InventoryNotFoundException: " + e.getMessage());
+            }
         } catch (MalformedURLException e) {
             if (logger.isLoggable(Level.SEVERE)) {
                 logger.log(Level.SEVERE, TAG + " MalformedURLException: " + e.getMessage());
@@ -37,19 +39,15 @@ public Inventory read(int barcode)
                 logger.severe(TAG + " IOException: " + e.getMessage());
             }
         } catch (Exception e) {
-            if (logger.isLoggable(Level.SEVERE)) {
-                logger.severe(TAG + " Exception: " + e.getMessage());
+            if (logger.isLoggable(Level.INFO)) {
+                logger.info(TAG + " Exception: " + e.getMessage());
             }
         }
 
-        if ( inventories.length == 0 ) {
-            throw new BarcodeNotFoundException("Barcode Not Found!");
-        }
-
-        return inventories[0];
+        return inventory;
     }
 
-    private Inventory[] getInventories(String inventories)
+    private Inventory[] getInventories(String jsonInventories)
             throws JsonProcessingException {
 
         ObjectMapper objectMapper = new ObjectMapper();
@@ -58,7 +56,7 @@ private Inventory[] getInventories(String inventories)
         objectMapper.configure(DeserializationFeature.USE_JAVA_ARRAY_FOR_JSON_ARRAY, true);
 
         return objectMapper
-                .readValue(inventories,
+                .readValue(jsonInventories,
                         Inventory[].class);
     }
 

src/main/java/hackerrank/api/BarcodeReader.java

@@ -10,7 +10,8 @@
 
 public abstract class InputStreamConverter {
 
-    public static String toString(InputStream is) {
+    public static String toString(InputStream is)
+            throws InventoryNotFoundException {
 
         StringBuilder sb = new StringBuilder();
         String jsonString = null;
@@ -25,6 +26,11 @@ public static String toString(InputStream is) {
 
             JSONObject json = new JSONObject(sb.toString());
             JSONArray dataArray = (JSONArray) json.get("data");
+
+            if ( dataArray.isEmpty() ) {
+                throw new InventoryNotFoundException("Inventory Not Found!");
+            }
+
             jsonString = dataArray.toString();
 
         } catch (IOException e) {

src/main/java/hackerrank/api/InputStreamConverter.java

@@ -0,0 +1,7 @@
+package hackerrank.api;
+
+public class InventoryNotFoundException extends NullPointerException {
+    public InventoryNotFoundException(String errorMessage) {
+        super(errorMessage);
+    }
+}

src/main/java/hackerrank/api/InventoryNotFoundException.java

@@ -1,6 +1,5 @@
 package hackerranktest.api;
 
-import hackerrank.api.BarcodeNotFoundException;
 import hackerrank.api.BarcodeReader;
 import hackerrank.api.Inventory;
 import org.junit.jupiter.api.Assertions;
@@ -19,16 +18,12 @@ void givenBarCodeListData() {
     }
 
     @Test
-    void barcodeEmptyException() {
-        Exception exception = Assertions.assertThrows(
-                BarcodeNotFoundException.class, () -> {
-                    BarcodeReader br = new BarcodeReader();
-                    br.read(0);
-                });
+    void givenBarcodeNotListed() {
 
-        String expectedMessage = "Barcode Not Found!";
-        String actualMessage = exception.getMessage();
+        int barcode = 0;
+        BarcodeReader obj = new BarcodeReader();
+        Inventory actualArr = obj.read(barcode);
 
-        Assertions.assertTrue(actualMessage.contains(expectedMessage));
+        Assertions.assertNull(actualArr);
     }
 }