Changing Keycloak API version to Match Keycloak Server Version

CDOT-CV · Mar 26, 2024 · b7cb9fe · b7cb9fe
1 parent 72ee7b2
commit b7cb9fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/jpo-conflictvisualizer-api/pom.xml b/jpo-conflictvisualizer-api/pom.xml
@@ -162,8 +162,7 @@
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-admin-client</artifactId>
-			<version>23.0.6</version>
-			<!-- <version>20.0.3</version> -->
+			<version>21.1.2</version> <!-- Version should match Keycloak Version specified in Conflict Monitor Dockerfile -->
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/...nflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/UserController.java b/...nflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/UserController.java
@@ -5,7 +5,9 @@
 import java.util.List;
 import java.util.Map;
 
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.core.Response;
+
+// import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.keycloak.KeycloakPrincipal;
@@ -170,19 +172,20 @@ public ResponseEntity<List<UserCreationRequest>> findUserCreationRequests(
 
 
 
-            System.out.println("Requesting New User Creation");
+            logger.info("Requesting New User Creation");
             Response response = keycloak.realm(realm).users().create(user);
-            System.out.println(response.getStatus() + " " +  response.getHeaders());
+            logger.info(response.getStatus() + " " +  response.getHeaders());
 
             if (response.getStatus() == 201) {
-                System.out.println("User Creation Successful");
+                logger.info("User Creation Successful");
 
                 Query query = userRepo.getQuery(null, null, null, newUserCreationRequest.getEmail(), null, null, null);
                 userRepo.delete(query);
 
                 return ResponseEntity.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
                     .body(newUserCreationRequest.toString());
             }else{
+
                 return ResponseEntity.status(HttpStatus.NOT_MODIFIED).contentType(MediaType.APPLICATION_JSON)
                     .body(newUserCreationRequest.toString());
             }