pr comments - cleaned up imports and added service exception

Author: nabeelamirch

src/main/java/uk/gov/companieshouse/orders/api/config/MongoConfig.java

@@ -4,7 +4,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.convert.*;
+import org.springframework.data.mongodb.core.convert.DbRefResolver;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
+import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import uk.gov.companieshouse.orders.api.converter.EnumToStringConverterFactory;
 import uk.gov.companieshouse.orders.api.converter.StringToEnumConverterFactory;

src/main/java/uk/gov/companieshouse/orders/api/exception/ServiceException.java

@@ -0,0 +1,9 @@
+package uk.gov.companieshouse.orders.api.exception;
+
+public class ServiceException extends RuntimeException {
+
+    public ServiceException(String message) {
+        super(message);
+    }
+
+}

src/main/java/uk/gov/companieshouse/orders/api/service/ApiClientService.java

@@ -5,6 +5,7 @@
 import uk.gov.companieshouse.api.handler.regex.URIValidator;
 import uk.gov.companieshouse.api.model.order.item.CertificateApi;
 import uk.gov.companieshouse.orders.api.client.ApiClient;
+import uk.gov.companieshouse.orders.api.exception.ServiceException;
 import uk.gov.companieshouse.orders.api.mapper.ApiToCertificateMapper;
 import uk.gov.companieshouse.orders.api.model.Item;
 
@@ -27,7 +28,7 @@ public Item getItem(String itemUri) throws Exception {
             certificate.setItemUri(itemUri);
             return certificate;
         } else {
-            throw new Exception("Unrecognised uri pattern for "+itemUri);
+            throw new ServiceException("Unrecognised uri pattern for "+itemUri);
         }
     }
 

src/test/java/uk/gov/companieshouse/orders/api/controller/BasketControllerIntegrationTest.java

@@ -12,7 +12,12 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import uk.gov.companieshouse.orders.api.dto.AddToBasketRequestDTO;
-import uk.gov.companieshouse.orders.api.model.*;
+import uk.gov.companieshouse.orders.api.model.Basket;
+import uk.gov.companieshouse.orders.api.model.BasketData;
+import uk.gov.companieshouse.orders.api.model.BasketItem;
+import uk.gov.companieshouse.orders.api.model.Certificate;
+import uk.gov.companieshouse.orders.api.model.Checkout;
+import uk.gov.companieshouse.orders.api.model.Item;
 import uk.gov.companieshouse.orders.api.repository.BasketRepository;
 import uk.gov.companieshouse.orders.api.repository.CheckoutRepository;
 import uk.gov.companieshouse.orders.api.service.ApiClientService;

src/test/java/uk/gov/companieshouse/orders/api/service/ApiClientServiceTest.java

@@ -11,6 +11,7 @@
 import uk.gov.companieshouse.api.model.ApiResponse;
 import uk.gov.companieshouse.api.model.order.item.CertificateApi;
 import uk.gov.companieshouse.orders.api.client.ApiClient;
+import uk.gov.companieshouse.orders.api.exception.ServiceException;
 import uk.gov.companieshouse.orders.api.mapper.ApiToCertificateMapper;
 import uk.gov.companieshouse.orders.api.model.Certificate;
 import uk.gov.companieshouse.orders.api.model.Item;
@@ -64,8 +65,8 @@ public void shouldGetCertificateItemIfUriIsValid() throws Exception {
     }
 
     @Test
-    public void shouldThrowExceptionIfCertificateItemUriIsInvalid() throws Exception {
-        Exception exception = assertThrows(Exception.class, () -> {
+    public void shouldThrowExceptionIfCertificateItemUriIsInvalid() throws ServiceException {
+        ServiceException exception = assertThrows(ServiceException.class, () -> {
             Item item = serviceUnderTest.getItem(INVALID_CERTIFICATE_URI);
         });
         assertEquals("Unrecognised uri pattern for "+INVALID_CERTIFICATE_URI, exception.getMessage());