Exception added when missing http settings in config file

Author: vktr7601

bellatrix.core/src/main/java/solutions/bellatrix/core/configuration/ConfigurationService.java

@@ -36,9 +36,9 @@ public static String getEnvironment() {
 
     public static <T> T get(Class<T> configSection) {
         T mappedObject = (T)new Object();
-        if (environment==null) {
+        if (environment == null) {
             String environmentOverride = System.getProperty("environment");
-            if (environmentOverride==null) {
+            if (environmentOverride == null) {
                 InputStream input = ConfigurationService.class.getResourceAsStream("/application.properties");
                 var p = new Properties();
                 try {

bellatrix.core/src/main/java/solutions/bellatrix/core/utilities/ObjectFactory.java

@@ -22,11 +22,15 @@
 public abstract class ObjectFactory {
     protected static <T> T newInstance(Class<T> clazz, Object... args) throws InvocationTargetException, InstantiationException, IllegalAccessException, ConstructorNotFoundException {
         Constructor<T> suitableConstructor = getSuitableConstructor(clazz, args);
-
-        if (suitableConstructor.isVarArgs() && args.length < suitableConstructor.getParameterCount()) {
-            return (T)suitableConstructor.newInstance(addNullVarArgsTo(args));
-        } else
-            return (T)suitableConstructor.newInstance(args);
+        try {
+            if (suitableConstructor.isVarArgs() && args.length < suitableConstructor.getParameterCount()) {
+                return (T)suitableConstructor.newInstance(addNullVarArgsTo(args));
+            } else
+                return (T)suitableConstructor.newInstance(args);
+        } catch (Exception e) {
+            var exception = (InvocationTargetException)e;
+            throw new InvocationTargetException(exception.getTargetException());
+        }
     }
 
     private static Object[] addNullVarArgsTo(Object... args) {
@@ -77,7 +81,7 @@ private static <T> Constructor<T> findVarArgsConstructor(Class clazz, Class[] ar
             args[args.length - 1] = getVarArgsType(clazz, argumentTypes);
 
             return clazz.getDeclaredConstructor(args);
-        } catch (NoSuchMethodException|NullPointerException ignored) {
+        } catch (NoSuchMethodException | NullPointerException ignored) {
         }
 
         throw new NoSuchMethodException("No matching constructor found for the provided argument types.");
@@ -101,7 +105,7 @@ private static boolean lengthMatches(Parameter[] parameters, Class[] argumentTyp
     }
 
     private static boolean parameterTypesMatch(Parameter[] parameters, Class[] argumentTypes) {
-        for (int i = 0; i < argumentTypes.length; i ++) {
+        for (int i = 0; i < argumentTypes.length; i++) {
             if (!parameters[i].getType().equals(argumentTypes[i]))
                 return false;
         }
@@ -138,4 +142,4 @@ public ConstructorNotFoundException(String message, Throwable cause, boolean ena
             super(message, cause, enableSuppression, writableStackTrace);
         }
     }
-}
+}

bellatrix.core/src/main/java/solutions/bellatrix/core/utilities/SingletonFactory.java

@@ -38,9 +38,12 @@ public static <T> T getInstance(Class<T> classOf, Object... initargs) {
     private static <T> T tryGetInstance(Class<T> classOf, Object... initargs) {
         try {
             return newInstance(classOf, initargs);
-        } catch (InvocationTargetException | InstantiationException | IllegalAccessException |
+        } catch (InvocationTargetException e) {
+            Log.error(e.getTargetException().getMessage(), e);
+            return null;
+        } catch (InstantiationException | IllegalAccessException |
                  ConstructorNotFoundException e) {
-            Log.error("Failed to create instance of the class %s.\nException was:\n%s".formatted(classOf.getName(), e));
+            Log.error("Failed to create instance of the class %s.\nException was:\n%s".formatted(classOf.getName(), e.getMessage()));
             return null;
         }
     }
@@ -62,8 +65,8 @@ public static boolean containsKey(Class<?> classOf) {
     public static boolean containsValue(Object object) {
         return mapHolder.get().containsValue(object);
     }
-    
+
     public static void clear() {
         mapHolder.get().clear();
     }
-}
+}

bellatrix.data/src/main/java/solutions/bellatrix/data/http/authentication/AuthenticationMethod.java

@@ -17,7 +17,7 @@ public enum AuthenticationMethod {
     public static AuthenticationMethod parse(String y) {
         for (var state : values()) {
             String enumDisplayValue = state.getMethod();
-            if (enumDisplayValue!=null && enumDisplayValue.equalsIgnoreCase(y)) {
+            if (enumDisplayValue != null && enumDisplayValue.equalsIgnoreCase(y)) {
                 return state;
             }
         }

bellatrix.data/src/main/java/solutions/bellatrix/data/http/configuration/HttpSettings.java

@@ -32,6 +32,10 @@ public HttpSettings(HttpSettings httpSettings) {
 
     public static HttpSettings custom(Consumer<HttpSettings> httpSettings) {
         var settings = ConfigurationService.get(DataSettings.class).getHttpSettings();
+        if (settings == null) {
+            throw new IllegalStateException("Include the httpSettings section in your config file");
+
+        }
         httpSettings.accept(settings);
         return settings;
     }

bellatrix.data/src/main/java/solutions/bellatrix/data/http/httpContext/HttpContext.java

@@ -8,7 +8,6 @@
 import solutions.bellatrix.data.http.authentication.AuthSchemaFactory;
 import solutions.bellatrix.data.http.authentication.AuthenticationMethod;
 import solutions.bellatrix.data.http.configuration.HttpSettings;
-import solutions.bellatrix.data.http.infrastructure.Entity;
 import solutions.bellatrix.data.http.infrastructure.HTTPMethod;
 import solutions.bellatrix.data.http.infrastructure.QueryParameter;
 
@@ -68,7 +67,7 @@ private RequestSpecBuilder getRequestBuilder() {
     }
 
     public RequestSpecification requestSpecification() {
-        if (requestBody!=null) {
+        if (requestBody != null) {
             specBuilder.setBody(requestBody);
         }
 
@@ -106,7 +105,7 @@ public void addQueryParameter(QueryParameter parameter) {
     private Map<String, String> getRequestQueryParameters() {
         //todo: this logic should be extracted because create tightly coupling with settings
         LinkedHashMap<String, String> queryParams = new LinkedHashMap<>();
-        if (httpSettings.getAuthenticationMethod()==AuthenticationMethod.QUERY_PARAMETER) {
+        if (httpSettings.getAuthenticationMethod() == AuthenticationMethod.QUERY_PARAMETER) {
             var option = httpSettings.getAuthentication().getAuthenticationOptions().stream().filter(x -> x.get("type").equals("QueryParameters")).findFirst().get();
             String insertionOrder = (String)option.get("insertionOrder");
             if (insertionOrder.equals("start")) {

bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/Entity.java

@@ -18,7 +18,7 @@ public TEntity create() {
 
     public TEntity update() {
         var repository = (Repository<Entity>)RepositoryFactory.INSTANCE.getRepository(this.getClass());
-        return (TEntity)repository.update(this);`
+        return (TEntity)repository.update(this);
     }
 
     public void delete() {

bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/HttpRepository.java

@@ -18,7 +18,7 @@
 
 public abstract class HttpRepository<THttpEntity extends HttpEntity> implements Repository<THttpEntity> {
     public static final EventListener<HttpRequestEventArgs> SENDING_REQUEST = new EventListener<>();
-    public static final EventListener<ResponseProcessingEventArgs> REQUEST_SEND = new EventListener<>();
+    public static final EventListener<ResponseProcessingEventArgs> REQUEST_SENT = new EventListener<>();
     public static final EventListener<EntityCreatedEventArgs> CREATING_ENTITY = new EventListener<>();
     public static final EventListener<EntityCreatedEventArgs> ENTITY_CREATED = new EventListener<>();
     public static final EventListener<EntityUpdatedEventArgs> UPDATING_ENTITY = new EventListener<>();
@@ -44,7 +44,6 @@ public THttpEntity getById(HttpEntity entity) {
         if (entity.hasInvalidIdentifier()) {
             throw new IllegalArgumentException("Entity identifier cannot be null.");
         }
-
         updateRequestContext(requestContext -> {
             requestContext.addPathParameter(entity.getIdentifier());
             requestContext.addRequestMethod(GET);
@@ -160,7 +159,7 @@ private RequestSpecification client() {
 
     private <R> R deserializeInternal(HttpResponse response, DeserializationMode mode) {
         try {
-            if (mode==DeserializationMode.LIST) {
+            if (mode == DeserializationMode.LIST) {
                 List<THttpEntity> entities = objectConverter.fromStringToList(response.getBody(), entityType);
                 entities.forEach(entity -> entity.setResponse(response.getResponse()));
                 return (R)entities;
@@ -178,7 +177,7 @@ private Response broadcastRequest(Supplier<Response> responseSupplier) {
         try {
             SENDING_REQUEST.broadcast(new HttpRequestEventArgs(requestContext));
             Response response = responseSupplier.get();
-            REQUEST_SEND.broadcast(new ResponseProcessingEventArgs(response));
+            REQUEST_SENT.broadcast(new ResponseProcessingEventArgs(response));
             return response;
         } finally {
             restoreRequestContext();