Revert some of the HttpStatusCode changes

Author: snf2ye

src/main/java/bio/terra/app/configuration/OpenIDConnectConfiguration.java

@@ -15,7 +15,6 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
@@ -64,8 +63,7 @@ void init() {
       if (!metadataConfig.getStatusCode().is2xxSuccessful()) {
         throw new ServiceInitializationException(
             String.format(
-                "Error reading OIDC configuration endpoint: %s",
-                HttpStatus.valueOf(metadataConfig.getStatusCode().value()).getReasonPhrase()));
+                "Error reading OIDC configuration endpoint: %s", metadataConfig.getStatusCode()));
       }
       OpenIDProviderMetadata response = metadataConfig.getBody();
       if (response == null) {

src/main/java/bio/terra/app/controller/ApiValidationExceptionHandler.java

@@ -41,11 +41,13 @@ protected ResponseEntity<Object> handleExceptionInternal(
     if (status.is5xxServerError()) {
       request.setAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE, ex, WebRequest.SCOPE_REQUEST);
     }
-
-    var responseBody =
-        new ErrorModel()
-            .message(status + " - see error details")
-            .addErrorDetailItem(ex.getMessage());
+    Object responseBody = body;
+    if (responseBody == null) {
+      responseBody =
+          new ErrorModel()
+              .message(status + " - see error details")
+              .addErrorDetailItem(ex.getMessage());
+    }
 
     return new ResponseEntity<>(responseBody, headers, status);
   }
@@ -64,7 +66,7 @@ protected ResponseEntity<Object> handleMethodArgumentNotValid(
     ErrorModel errorModel =
         new ErrorModel().message("Validation errors - see error details").errorDetail(errorDetails);
 
-    return new ResponseEntity<>(errorModel, HttpStatusCode.valueOf(HttpStatus.BAD_REQUEST.value()));
+    return new ResponseEntity<>(errorModel, HttpStatus.BAD_REQUEST);
   }
 
   @Override

src/main/java/bio/terra/app/usermetrics/BardClient.java

@@ -15,7 +15,6 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -65,10 +64,7 @@ public void logEvent(AuthenticatedUserRequest userReq, BardEvent event) {
           restTemplate.exchange(
               getApiUrl(), HttpMethod.POST, new HttpEntity<>(event, authedHeaders), Void.class);
       if (!eventCall.getStatusCode().is2xxSuccessful()) {
-        logger.warn(
-            "Error logging event {}%n{}",
-            event.getEvent(),
-            HttpStatus.valueOf(eventCall.getStatusCode().value()).getReasonPhrase());
+        logger.warn("Error logging event {}%n{}", event.getEvent(), eventCall.getStatusCode());
       }
     } catch (Exception e) {
       logger.warn("Error logging event {}", event.getEvent(), e);
@@ -103,9 +99,7 @@ boolean syncProfile(AuthenticatedUserRequest userReq) {
               getSyncPathUrl(), HttpMethod.POST, new HttpEntity<>(null, authedHeaders), Void.class);
       if (!syncCall.getStatusCode().is2xxSuccessful()) {
         logger.warn(
-            "Error calling sync for user {}%n{}",
-            userReq.getEmail(),
-            HttpStatus.valueOf(syncCall.getStatusCode().value()).getReasonPhrase());
+            "Error calling sync for user {}%n{}", userReq.getEmail(), syncCall.getStatusCode());
       } else {
         result = true;
       }