Google Java Format

vmware · Aug 14, 2023 · 321425c · 321425c
1 parent 2cc7766
commit 321425c
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 104 deletions.
diff --git a/...service/src/main/java/com/vmware/taurus/authorization/provider/AuthorizationProvider.java b/...service/src/main/java/com/vmware/taurus/authorization/provider/AuthorizationProvider.java
@@ -94,7 +94,8 @@ public String getAccessToken() {
 
     if (authentication instanceof JwtAuthenticationToken) {
       JwtAuthenticationToken oauthToken = (JwtAuthenticationToken) authentication;
-      accessToken = Optional.ofNullable(oauthToken.getToken())
+      accessToken =
+          Optional.ofNullable(oauthToken.getToken())
               .map(AbstractOAuth2Token::getTokenValue)
               .orElse(null);
     }

diff --git a/...e/src/main/java/com/vmware/taurus/authorization/webhook/AuthorizationWebHookProvider.java b/...e/src/main/java/com/vmware/taurus/authorization/webhook/AuthorizationWebHookProvider.java
@@ -33,13 +33,20 @@ public class AuthorizationWebHookProvider extends WebHookService<AuthorizationBo
 
   public AuthorizationWebHookProvider(
       @Value("${datajobs.authorization.webhook.endpoint}") String webHookEndpoint,
-      @Value("${datajobs.authorization.webhook.internal.errors.retries:1}")
-          int retriesOn5xxErrors,
-      @Value("${datajobs.authorization.webhook.authentication.enabled:false}") boolean authenticationEnabled,
+      @Value("${datajobs.authorization.webhook.internal.errors.retries:1}") int retriesOn5xxErrors,
+      @Value("${datajobs.authorization.webhook.authentication.enabled:false}")
+          boolean authenticationEnabled,
       RestTemplate restTemplate,
       FeatureFlags featureFlags,
       AuthorizationProvider authorizationProvider) {
-    super(webHookEndpoint, retriesOn5xxErrors, authenticationEnabled, log, restTemplate, featureFlags, authorizationProvider);
+    super(
+        webHookEndpoint,
+        retriesOn5xxErrors,
+        authenticationEnabled,
+        log,
+        restTemplate,
+        featureFlags,
+        authorizationProvider);
   }
 
   @Override

diff --git a/...l_service/src/main/java/com/vmware/taurus/datajobs/webhook/PostCreateWebHookProvider.java b/...l_service/src/main/java/com/vmware/taurus/datajobs/webhook/PostCreateWebHookProvider.java
@@ -28,10 +28,18 @@ public class PostCreateWebHookProvider extends WebHookService<WebHookRequestBody
   public PostCreateWebHookProvider(
       @Value("${datajobs.post.create.webhook.endpoint}") String webHookEndpoint,
       @Value("${datajobs.post.create.webhook.internal.errors.retries:-1}") int retriesOn5xxErrors,
-      @Value("${datajobs.post.create.webhook.authentication.enabled:false}") boolean authenticationEnabled,
+      @Value("${datajobs.post.create.webhook.authentication.enabled:false}")
+          boolean authenticationEnabled,
       RestTemplate restTemplate,
       FeatureFlags featureFlags,
       AuthorizationProvider authorizationProvider) {
-    super(webHookEndpoint, retriesOn5xxErrors, authenticationEnabled, log, restTemplate, featureFlags, authorizationProvider);
+    super(
+        webHookEndpoint,
+        retriesOn5xxErrors,
+        authenticationEnabled,
+        log,
+        restTemplate,
+        featureFlags,
+        authorizationProvider);
   }
 }
diff --git a/...l_service/src/main/java/com/vmware/taurus/datajobs/webhook/PostDeleteWebHookProvider.java b/...l_service/src/main/java/com/vmware/taurus/datajobs/webhook/PostDeleteWebHookProvider.java
@@ -10,7 +10,6 @@
 import com.vmware.taurus.service.webhook.WebHookRequestBody;
 import com.vmware.taurus.service.webhook.WebHookService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -29,10 +28,18 @@ public class PostDeleteWebHookProvider extends WebHookService<WebHookRequestBody
   public PostDeleteWebHookProvider(
       @Value("${datajobs.post.delete.webhook.endpoint}") String webHookEndpoint,
       @Value("${datajobs.post.delete.webhook.internal.errors.retries:-1}") int retriesOn5xxErrors,
-      @Value("${datajobs.post.delete.webhook.authentication.enabled:false}") boolean authenticationEnabled,
+      @Value("${datajobs.post.delete.webhook.authentication.enabled:false}")
+          boolean authenticationEnabled,
       RestTemplate restTemplate,
       FeatureFlags featureFlags,
       AuthorizationProvider authorizationProvider) {
-    super(webHookEndpoint, retriesOn5xxErrors, authenticationEnabled, log, restTemplate, featureFlags, authorizationProvider);
+    super(
+        webHookEndpoint,
+        retriesOn5xxErrors,
+        authenticationEnabled,
+        log,
+        restTemplate,
+        featureFlags,
+        authorizationProvider);
   }
 }
diff --git a/...lines_control_service/src/main/java/com/vmware/taurus/service/webhook/WebHookService.java b/...lines_control_service/src/main/java/com/vmware/taurus/service/webhook/WebHookService.java
@@ -8,20 +8,14 @@
 import com.vmware.taurus.authorization.provider.AuthorizationProvider;
 import com.vmware.taurus.base.FeatureFlags;
 import com.vmware.taurus.exception.ExternalSystemError;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClientResponseException;
 import org.springframework.web.client.RestTemplate;
 
@@ -54,13 +48,14 @@ public abstract class WebHookService<T extends WebHookRequestBody> implements In
 
   private final AuthorizationProvider authorizationProvider;
 
-  public WebHookService(String webHookEndpoint,
-                        int retriesOn5xxErrors,
-                        boolean authenticationEnabled,
-                        Logger log,
-                        RestTemplate restTemplate,
-                        FeatureFlags featureFlags,
-                        AuthorizationProvider authorizationProvider) {
+  public WebHookService(
+      String webHookEndpoint,
+      int retriesOn5xxErrors,
+      boolean authenticationEnabled,
+      Logger log,
+      RestTemplate restTemplate,
+      FeatureFlags featureFlags,
+      AuthorizationProvider authorizationProvider) {
     this.webHookEndpoint = webHookEndpoint;
     this.retriesOn5xxErrors = retriesOn5xxErrors;
     this.authenticationEnabled = authenticationEnabled;

diff --git a/...c/test/java/com/vmware/taurus/authorization/webhook/AuthorizationWebHookProviderTest.java b/...c/test/java/com/vmware/taurus/authorization/webhook/AuthorizationWebHookProviderTest.java
@@ -16,45 +16,34 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.*;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestClientResponseException;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.UnsupportedEncodingException;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(
-        webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-        classes = ControlplaneApplication.class)
+    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
+    classes = ControlplaneApplication.class)
 @ActiveProfiles({"MockKubernetes", "MockKerberos", "unittest", "MockGit", "MockTelemetry"})
 public class AuthorizationWebHookProviderTest {
 
-  @MockBean
-  private RestTemplate restTemplate;
+  @MockBean private RestTemplate restTemplate;
 
-  @MockBean
-  private FeatureFlags featureFlags;
+  @MockBean private FeatureFlags featureFlags;
 
-  @MockBean
-  private AuthorizationProvider authorizationProvider;
+  @MockBean private AuthorizationProvider authorizationProvider;
 
-  @Autowired
-  private AuthorizationWebHookProvider webhookProvider;
+  @Autowired private AuthorizationWebHookProvider webhookProvider;
 
   private AuthorizationBody authzBody;
 

diff --git a/...rol_service/src/test/java/com/vmware/taurus/datajobs/webhook/BaseWebHookProviderTest.java b/...rol_service/src/test/java/com/vmware/taurus/datajobs/webhook/BaseWebHookProviderTest.java
@@ -5,7 +5,6 @@
 
 package com.vmware.taurus.datajobs.webhook;
 
-import com.vmware.taurus.authorization.provider.AuthorizationProvider;
 import com.vmware.taurus.base.FeatureFlags;
 import com.vmware.taurus.exception.ExternalSystemError;
 import com.vmware.taurus.service.webhook.WebHookRequestBody;
@@ -14,21 +13,14 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestClientResponseException;
 import org.springframework.web.client.RestTemplate;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 public abstract class BaseWebHookProviderTest {
@@ -64,8 +56,8 @@ public void testBadRequestStatus() {
             "Bad request: The post create action needs more parameters",
             null,
             HttpStatus.BAD_REQUEST);
-    when(
-            getRestTemplate().exchange(
+    when(getRestTemplate()
+            .exchange(
                 Mockito.anyString(),
                 Mockito.any(HttpMethod.class),
                 Mockito.any(),
@@ -82,8 +74,8 @@ public void testBadRequestStatus() {
   @Test
   public void testWebHookSuccess() {
     ResponseEntity re = new ResponseEntity<>("Good request", null, HttpStatus.ACCEPTED);
-    when(
-            getRestTemplate().exchange(
+    when(getRestTemplate()
+            .exchange(
                 Mockito.anyString(),
                 Mockito.any(HttpMethod.class),
                 Mockito.any(),
@@ -98,14 +90,13 @@ public void testWebHookSuccess() {
 
   @Test
   public void testRestClientResponseExceptionHandling() {
-    when(
-            getRestTemplate().exchange(
+    when(getRestTemplate()
+            .exchange(
                 Mockito.anyString(),
                 Mockito.any(HttpMethod.class),
                 Mockito.any(),
                 Mockito.<Class<String>>any()))
-        .thenThrow(
-            HttpClientErrorException.create(HttpStatus.BAD_REQUEST, "", null, null, null));
+        .thenThrow(HttpClientErrorException.create(HttpStatus.BAD_REQUEST, "", null, null, null));
 
     WebHookResult webHookResult = getWebHookProvider().invokeWebHook(requestBody).get();
     Assertions.assertEquals("", webHookResult.getMessage());
@@ -116,8 +107,8 @@ public void testRestClientResponseExceptionHandling() {
   @Test
   public void testInformationalStatusCode() {
     ResponseEntity re = new ResponseEntity<>("User authorized", null, HttpStatus.CONTINUE);
-    when(
-            getRestTemplate().exchange(
+    when(getRestTemplate()
+            .exchange(
                 Mockito.anyString(),
                 Mockito.any(HttpMethod.class),
                 Mockito.any(),
@@ -131,8 +122,8 @@ public void testInformationalStatusCode() {
   @Test
   public void testRedirectionStatusCode() {
     ResponseEntity re = new ResponseEntity<>("User authorized", null, HttpStatus.MOVED_PERMANENTLY);
-    when(
-            getRestTemplate().exchange(
+    when(getRestTemplate()
+            .exchange(
                 Mockito.anyString(),
                 Mockito.any(HttpMethod.class),
                 Mockito.any(),
@@ -148,8 +139,8 @@ public void testServiceUnavailableWithRetry() {
     ReflectionTestUtils.setField(getWebHookProvider(), "retriesOn5xxErrors", ONE_RETRY);
     ResponseEntity re =
         new ResponseEntity<>("Service unavailable", null, HttpStatus.SERVICE_UNAVAILABLE);
-    when(
-            getRestTemplate().exchange(
+    when(getRestTemplate()
+            .exchange(
                 Mockito.anyString(),
                 Mockito.any(HttpMethod.class),
                 Mockito.any(),
@@ -170,8 +161,8 @@ public void testServiceUnavailableWithRetry() {
   public void testInternalErrorDefaultNoRetry() {
     ResponseEntity re =
         new ResponseEntity<>("Internal Server error", null, HttpStatus.INTERNAL_SERVER_ERROR);
-    when(
-            getRestTemplate().exchange(
+    when(getRestTemplate()
+            .exchange(
                 Mockito.anyString(),
                 Mockito.any(HttpMethod.class),
                 Mockito.any(),

diff --git a/...rvice/src/test/java/com/vmware/taurus/datajobs/webhook/PostCreateWebHookProviderTest.java b/...rvice/src/test/java/com/vmware/taurus/datajobs/webhook/PostCreateWebHookProviderTest.java
@@ -10,12 +10,7 @@
 import com.vmware.taurus.base.FeatureFlags;
 import lombok.Getter;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.ActiveProfiles;
@@ -25,28 +20,24 @@
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(
-        webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-        classes = ControlplaneApplication.class)
+    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
+    classes = ControlplaneApplication.class)
 @ActiveProfiles({"MockKubernetes", "MockKerberos", "unittest", "MockGit", "MockTelemetry"})
 @TestPropertySource(
-        properties = {
-                "datajobs.post.create.webhook.endpoint=http://localhost:4444",
-                "datajobs.post.create.webhook.internal.errors.retries=0",
-                "datajobs.post.create.webhook.authentication.enabled=false",
-                "featureflag.security.enabled=false"
-        })
+    properties = {
+      "datajobs.post.create.webhook.endpoint=http://localhost:4444",
+      "datajobs.post.create.webhook.internal.errors.retries=0",
+      "datajobs.post.create.webhook.authentication.enabled=false",
+      "featureflag.security.enabled=false"
+    })
 @Getter
 /** See {@link BaseWebHookProviderTest} for the details of the tests. */
 public class PostCreateWebHookProviderTest extends BaseWebHookProviderTest {
-  @MockBean
-  private RestTemplate restTemplate;
+  @MockBean private RestTemplate restTemplate;
 
-  @MockBean
-  private FeatureFlags featureFlags;
+  @MockBean private FeatureFlags featureFlags;
 
-  @MockBean
-  private AuthorizationProvider authorizationProvider;
+  @MockBean private AuthorizationProvider authorizationProvider;
 
-  @Autowired
-  private PostCreateWebHookProvider webHookProvider;
+  @Autowired private PostCreateWebHookProvider webHookProvider;
 }