Apply feedback

Signed-off-by: gabriel-farache <[email protected]>

Author: gabriel-farache

client/integration-tests/auth-provider/src/test/java/io/quarkiverse/openapi/generator/it/auth/KeycloakServiceMock.java

@@ -58,16 +58,18 @@ public Map<String, String> start() {
     }
 
     private static String getTokenResult() {
-        return "{\n" +
-                "    \"access_token\": \"" + KEYCLOAK_ACCESS_TOKEN + "\",\n" +
-                "    \"expires_in\": 300,\n" +
-                "    \"refresh_expires_in\": 1800,\n" +
-                "    \"refresh_token\": \"" + KEYCLOAK_REFRESH_TOKEN + "\",\n" +
-                "    \"token_type\": \"bearer\",\n" +
-                "    \"not-before-policy\": 0,\n" +
-                "    \"session_state\": \"" + KEYCLOAK_SESSION_STATE + "\",\n" +
-                "    \"scope\": \"email profile\"\n" +
-                "}";
+        return """
+                {
+                    "access_token": "%s",
+                    "expires_in": 300,
+                    "refresh_expires_in": 1800,
+                    "refresh_token": "%s",
+                    "token_type": "bearer",
+                    "not-before-policy": 0,
+                    "session_state": "%s",
+                    "scope": "email profile"
+                }
+                """.formatted(KEYCLOAK_ACCESS_TOKEN, KEYCLOAK_REFRESH_TOKEN, KEYCLOAK_SESSION_STATE);
     }
 
     @Override

client/integration-tests/auth-provider/src/test/java/io/quarkiverse/openapi/generator/it/auth/TokenExternalServicesMock.java

@@ -25,7 +25,7 @@ public class TokenExternalServicesMock implements QuarkusTestResourceLifecycleMa
 
     public static final String AUTHORIZATION_TOKEN = "AUTHORIZATION_TOKEN";
     public static final String SERVICE3_AUTHORIZATION_TOKEN = "BEARER_TOKEN";
-    public static final String token_external_service_MOCK_URL = "propagation-external-service-mock.url";
+    public static final String TOKEN_EXTERNAL_SERVICE_MOCK_URL = "propagation-external-service-mock.url";
     private static final String BEARER = "Bearer ";
     private static final Logger LOGGER = LoggerFactory.getLogger(TokenExternalServicesMock.class);
     private WireMockServer wireMockServer;
@@ -60,7 +60,7 @@ public Map<String, String> start() {
         // configured. The token will be overridden by the custom credential provider
         stubForExternalService("/token-external-service5/executeQuery5", KEYCLOAK_ACCESS_TOKEN + "_TEST");
 
-        return Map.of(token_external_service_MOCK_URL, wireMockServer.baseUrl());
+        return Map.of(TOKEN_EXTERNAL_SERVICE_MOCK_URL, wireMockServer.baseUrl());
     }
 
     @Override

client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/KeycloakServiceMock.java

@@ -58,16 +58,18 @@ public Map<String, String> start() {
     }
 
     private static String getTokenResult() {
-        return "{\n" +
-                "    \"access_token\": \"" + KEYCLOAK_ACCESS_TOKEN + "\",\n" +
-                "    \"expires_in\": 300,\n" +
-                "    \"refresh_expires_in\": 1800,\n" +
-                "    \"refresh_token\": \"" + KEYCLOAK_REFRESH_TOKEN + "\",\n" +
-                "    \"token_type\": \"bearer\",\n" +
-                "    \"not-before-policy\": 0,\n" +
-                "    \"session_state\": \"" + KEYCLOAK_SESSION_STATE + "\",\n" +
-                "    \"scope\": \"email profile\"\n" +
-                "}";
+        return """
+                {
+                    "access_token": "%s",
+                    "expires_in": 300,
+                    "refresh_expires_in": 1800,
+                    "refresh_token": "%s",
+                    "token_type": "bearer",
+                    "not-before-policy": 0,
+                    "session_state": "%s",
+                    "scope": "email profile"
+                }
+                """.formatted(KEYCLOAK_ACCESS_TOKEN, KEYCLOAK_REFRESH_TOKEN, KEYCLOAK_SESSION_STATE);
     }
 
     @Override

client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/OAuth2AuthenticationProviderTest.java

@@ -69,11 +69,11 @@ void setUp() {
 
     }
 
-    protected OAuth2AuthenticationProvider createClassicProvider() {
+    private OAuth2AuthenticationProvider createClassicProvider() {
         return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, classicDelegate, List.of());
     }
 
-    protected void assertHeader(MultivaluedMap<String, Object> headers, String headerName, String value) {
+    private void assertHeader(MultivaluedMap<String, Object> headers, String headerName, String value) {
         Assertions.assertThat(headers.getFirst(headerName))
                 .isNotNull()
                 .isEqualTo(value);