fixing codacy issues

Signed-off-by: Jared Weinfurtner <[email protected]>
carbynestack · Jun 23, 2024 · 8b8d935 · 8b8d935
1 parent 5261d91
commit 8b8d935
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/src/main/java/io/carbynestack/cli/login/VcpToken.java b/src/main/java/io/carbynestack/cli/login/VcpToken.java
@@ -8,16 +8,23 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
+import lombok.AllArgsConstructor;
+import lombok.Value;
+
 import java.net.URI;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Value;
 
 @Value
 @AllArgsConstructor
 public class VcpToken {
 
+  String vcpBaseUrl;
+  String accessToken;
+  String idToken;
+  String refreshToken;
+  Date expires;
+
   public static VcpToken from(Date created, URI vcpBaseUrl, OIDCTokens tokens) {
     return new VcpToken(
         vcpBaseUrl.toString(),
@@ -32,12 +39,6 @@ public static VcpToken from(URI vcpBaseUrl, OIDCTokens tokens) {
     return from(new Date(), vcpBaseUrl, tokens);
   }
 
-  String vcpBaseUrl;
-  String accessToken;
-  String idToken;
-  String refreshToken;
-  Date expires;
-
   @JsonIgnore
   public boolean isExpired() {
     return new Date().after(expires);

diff --git a/src/test/java/io/carbynestack/cli/login/LoginCommandTest.java b/src/test/java/io/carbynestack/cli/login/LoginCommandTest.java
@@ -6,28 +6,13 @@
  */
 package io.carbynestack.cli.login;
 
-import static io.carbynestack.cli.login.BrowserLauncher.BrowserLaunchError.NOT_SUPPORTED;
-import static io.carbynestack.cli.login.BrowserLauncher.browse;
-import static io.carbynestack.cli.login.LoginCommand.DEFAULT_CALLBACK_PORTS;
-import static io.carbynestack.cli.login.LoginCommand.LoginCommandError;
-import static io.carbynestack.cli.login.VcpTokenStore.VcpTokenStoreError;
-import static io.carbynestack.cli.login.VcpTokenStore.load;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
 import com.nimbusds.oauth2.sdk.AuthorizationCode;
 import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
 import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
 import io.carbynestack.cli.TemporaryConfiguration;
 import io.carbynestack.cli.util.TokenUtils;
 import io.vavr.control.Either;
 import io.vavr.control.Option;
-import java.net.BindException;
-import java.net.SocketException;
-import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.Range;
 import org.junit.Before;
@@ -40,6 +25,22 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import java.net.BindException;
+import java.net.SocketException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static io.carbynestack.cli.login.BrowserLauncher.BrowserLaunchError.NOT_SUPPORTED;
+import static io.carbynestack.cli.login.BrowserLauncher.browse;
+import static io.carbynestack.cli.login.LoginCommand.DEFAULT_CALLBACK_PORTS;
+import static io.carbynestack.cli.login.LoginCommand.LoginCommandError;
+import static io.carbynestack.cli.login.VcpTokenStore.VcpTokenStoreError;
+import static io.carbynestack.cli.login.VcpTokenStore.load;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({BrowserLauncher.class})
 public class LoginCommandTest {
@@ -64,7 +65,7 @@ public void whenLogin_thenStoreHasBeenCreated() throws Exception {
     doReturn(Either.right(new AuthorizationCode())).when(callbackServer).getAuthorizationCode();
 
     LoginCommand command =
-        Mockito.spy(new LoginCommand(DEFAULT_CALLBACK_PORTS, (url, state) -> callbackServer));
+        spy(new LoginCommand(DEFAULT_CALLBACK_PORTS, (url, state) -> callbackServer));
     doReturn(new OIDCTokenResponse(oidcTokens)).when(command).sendTokenRequest(Mockito.any());
 
     command.login();
@@ -104,7 +105,7 @@ public void givenPortIsInUse_whenLogin_thenSucceedOnNextPort() throws Exception
     AtomicInteger attempt = new AtomicInteger(0);
     int rounds = 5;
     LoginCommand command =
-        Mockito.spy(
+        spy(
             new LoginCommand(
                 DEFAULT_CALLBACK_PORTS,
                 (cfg, state) -> {