Applying PR review suggestions

Author: LikeTheSalad

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/connectivity/http/HttpErrorException.java

@@ -5,28 +5,13 @@
 
 package io.opentelemetry.opamp.client.internal.connectivity.http;
 
-import java.util.Objects;
-
 public class HttpErrorException extends Exception {
   private final int errorCode;
 
   private static final long serialVersionUID = 1L;
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof HttpErrorException)) {
-      return false;
-    }
-    HttpErrorException that = (HttpErrorException) o;
-    return errorCode == that.errorCode && Objects.equals(getMessage(), that.getMessage());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(errorCode, getMessage());
+  public int getErrorCode() {
+    return errorCode;
   }
 
   /**

opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java

@@ -40,6 +40,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -181,7 +182,7 @@ void verifySendingRequest_whenThereIsAGenericHttpError() {
 
     httpRequestService.run();
 
-    verify(callback).onRequestFailed(new HttpErrorException(500, "Error message"));
+    verifyRequestFailedCallback(500);
     verifyNoInteractions(executor);
   }
 
@@ -195,7 +196,7 @@ void verifySendingRequest_whenThereIsATooManyRequestsError() {
 
     httpRequestService.run();
 
-    verify(callback).onRequestFailed(new HttpErrorException(429, "Error message"));
+    verifyRequestFailedCallback(429);
     verify(executor).setPeriodicDelay(periodicRetryDelay);
     verify(periodicRetryDelay, never()).suggestDelay(any());
   }
@@ -211,7 +212,7 @@ void verifySendingRequest_whenThereIsATooManyRequestsError_withSuggestedDelay()
 
     httpRequestService.run();
 
-    verify(callback).onRequestFailed(new HttpErrorException(429, "Error message"));
+    verifyRequestFailedCallback(429);
     verify(executor).setPeriodicDelay(periodicRetryDelay);
     verify(periodicRetryDelay).suggestDelay(Duration.ofSeconds(5));
   }
@@ -267,7 +268,7 @@ void verifySendingRequest_whenThereIsAServiceUnavailableError() {
 
     httpRequestService.run();
 
-    verify(callback).onRequestFailed(new HttpErrorException(503, "Error message"));
+    verifyRequestFailedCallback(503);
     verify(executor).setPeriodicDelay(periodicRetryDelay);
     verify(periodicRetryDelay, never()).suggestDelay(any());
   }
@@ -283,11 +284,18 @@ void verifySendingRequest_whenThereIsAServiceUnavailableError_withSuggestedDelay
 
     httpRequestService.run();
 
-    verify(callback).onRequestFailed(new HttpErrorException(503, "Error message"));
+    verifyRequestFailedCallback(503);
     verify(executor).setPeriodicDelay(periodicRetryDelay);
     verify(periodicRetryDelay).suggestDelay(Duration.ofSeconds(2));
   }
 
+  private void verifyRequestFailedCallback(int errorCode) {
+    ArgumentCaptor<HttpErrorException> captor = ArgumentCaptor.forClass(HttpErrorException.class);
+    verify(callback).onRequestFailed(captor.capture());
+    assertThat(captor.getValue().getErrorCode()).isEqualTo(errorCode);
+    assertThat(captor.getValue().getMessage()).isEqualTo("Error message");
+  }
+
   @Test
   void verifySendingRequest_duringRegularMode() {
     httpRequestService.sendRequest();