refactor try-catch-blocks

Author: EddeCCC

src/main/java/rocks/inspectit/gepard/agent/configuration/http/HttpConfigurationPoller.java

@@ -2,7 +2,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import java.net.URISyntaxException;
-import java.util.concurrent.ExecutionException;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,23 +39,22 @@ public void run() {
    */
   @VisibleForTesting
   boolean pollConfiguration() {
+    SimpleHttpRequest request = createConfigurationRequest();
+
+    return HttpRequestSender.send(request, new HttpConfigurationCallback());
+  }
+
+  /**
+   * @return the created polling request
+   */
+  private SimpleHttpRequest createConfigurationRequest() {
     SimpleHttpRequest request = null;
-    // TODO try-catch in eigene Methode auslagern
     try {
       request = HttpConfigurationFactory.createConfigurationRequest(serverUrl);
     } catch (URISyntaxException e) {
       log.error("Error building HTTP URI for configuration polling", e);
     }
-    // TODO try-catch in eigene Methode auslagern
-    try {
-      return HttpRequestSender.send(request, new HttpConfigurationCallback());
-    } catch (ExecutionException e) {
-      log.error("Error executing configuration polling", e);
-    } catch (InterruptedException e) {
-      log.error("Configuration polling was interrupted", e);
-      Thread.currentThread().interrupt();
-    }
-    return false;
+    return request;
   }
 
   @Override

src/main/java/rocks/inspectit/gepard/agent/instrumentation/filling/ClassDiscoveryService.java

@@ -41,8 +41,8 @@ public void run() {
 
   /**
    * Checks all loaded classes of the Instrumentation API and adds newly discovered classes to our
-   * {@code discoveredClasses}. Additionally, the {@link PendingClassesCache} will be filled with the newly
-   * discovered classes.
+   * {@code discoveredClasses}. Additionally, the {@link PendingClassesCache} will be filled with
+   * the newly discovered classes.
    */
   void discoverClasses() {
     Set<Class<?>> newClasses = new HashSet<>();

src/main/java/rocks/inspectit/gepard/agent/instrumentation/filling/ConfigurationReceiver.java

@@ -10,7 +10,8 @@
 import rocks.inspectit.gepard.agent.internal.configuration.observer.ConfigurationReceivedObserver;
 
 /**
- * Listens to {@link ConfigurationReceivedEvent}s and updates the {@link PendingClassesCache} afterward.
+ * Listens to {@link ConfigurationReceivedEvent}s and updates the {@link PendingClassesCache}
+ * afterward.
  */
 public class ConfigurationReceiver implements ConfigurationReceivedObserver {
   private final Logger log = LoggerFactory.getLogger(ConfigurationReceiver.class);

src/main/java/rocks/inspectit/gepard/agent/instrumentation/processing/BatchInstrumenter.java

@@ -41,11 +41,10 @@ public void run() {
   }
 
   /**
-   * Retrieves the next batch out of {@link PendingClassesCache}.
-   * Currently, the batch size is fixed to 1000.
+   * Retrieves the next batch out of {@link PendingClassesCache}. Currently, the batch size is fixed
+   * to 1000.
    *
    * @param batchSize the size of the next batch
-   *
    * @return the batch of retrieved pending classes
    */
   @VisibleForTesting

src/main/java/rocks/inspectit/gepard/agent/internal/configuration/model/InspectitConfiguration.java

@@ -3,9 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import rocks.inspectit.gepard.agent.internal.configuration.model.instrumentation.InstrumentationConfiguration;
 
-/**
- * Model of an inspectit gepard configuration.
- */
+/** Model of an inspectit gepard configuration. */
 public class InspectitConfiguration {
 
   public InspectitConfiguration() {

src/main/java/rocks/inspectit/gepard/agent/internal/configuration/observer/ConfigurationReceivedSubject.java

@@ -6,7 +6,8 @@
 import rocks.inspectit.gepard.agent.internal.configuration.model.InspectitConfiguration;
 
 /**
- * Observer pattern subject, which notifies all registered listeners about {@link ConfigurationReceivedEvent}s.
+ * Observer pattern subject, which notifies all registered listeners about {@link
+ * ConfigurationReceivedEvent}s.
  */
 public class ConfigurationReceivedSubject {
 

src/main/java/rocks/inspectit/gepard/agent/internal/http/HttpRequestSender.java

@@ -8,9 +8,12 @@
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Utility class to execute HTTP requests with callbacks */
 public class HttpRequestSender {
+  private static final Logger log = LoggerFactory.getLogger(HttpRequestSender.class);
 
   /**
    * Executes the provided HTTP request as well as the callback function.
@@ -19,12 +22,27 @@ public class HttpRequestSender {
    * @param callback the callback function
    * @return True, if the HTTP request returned the status code 200
    */
-  public static boolean send(SimpleHttpRequest request, FutureCallback<SimpleHttpResponse> callback)
-      throws ExecutionException, InterruptedException {
+  public static boolean send(
+      SimpleHttpRequest request, FutureCallback<SimpleHttpResponse> callback) {
+    if (Objects.isNull(request)) return false;
+
     CloseableHttpAsyncClient client = HttpClientHolder.getClient();
     Future<SimpleHttpResponse> future = client.execute(request, callback);
-    HttpResponse response = future.get();
 
+    HttpResponse response = handleFuture(future);
     return Objects.nonNull(response) && 200 == response.getCode();
   }
+
+  private static HttpResponse handleFuture(Future<SimpleHttpResponse> future) {
+    HttpResponse response = null;
+    try {
+      response = future.get();
+    } catch (ExecutionException e) {
+      log.error("Error executing HTTP request", e);
+    } catch (InterruptedException e) {
+      log.error("Sending of HTTP request was interrupted", e);
+      Thread.currentThread().interrupt();
+    }
+    return response;
+  }
 }

src/main/java/rocks/inspectit/gepard/agent/notification/StartNotifier.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.net.URISyntaxException;
-import java.util.concurrent.ExecutionException;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,25 +19,24 @@ public class StartNotifier {
    * @return true, if the notification was executed successfully
    */
   public boolean sendNotification(String serverUrl) {
+    SimpleHttpRequest notification = createStartNotification(serverUrl);
+
+    return HttpRequestSender.send(notification, new NotificationCallback());
+  }
+
+  /**
+   * @param serverUrl the url of the configuration server
+   * @return the created start notification request
+   */
+  private SimpleHttpRequest createStartNotification(String serverUrl) {
     SimpleHttpRequest notification = null;
-    // TODO try-catch in eigene Methode auslagern
     try {
       notification = NotificationFactory.createStartNotification(serverUrl);
     } catch (URISyntaxException e) {
       log.error("Error building HTTP URI for configuration server notification", e);
     } catch (JsonProcessingException e) {
       log.error("Could not process agent information for configuration server notification", e);
     }
-
-    // TODO try-catch in eigene Methode auslagern
-    try {
-      return HttpRequestSender.send(notification, new NotificationCallback());
-    } catch (ExecutionException e) {
-      log.error("Error executing start notification for configuration server", e);
-    } catch (InterruptedException e) {
-      log.error("Start notification for configuration server was interrupted", e);
-      Thread.currentThread().interrupt();
-    }
-    return false;
+    return notification;
   }
 }