From 3ef6c81e981654fd2c706f6c0388dd71088aff64 Mon Sep 17 00:00:00 2001
From: Alex Morel <amorel@codelutin.com>
Date: Mon, 17 Jun 2024 15:27:14 +0200
Subject: [PATCH] Wire local sonar and extract method for findById
---
build.gradle | 1 +
src/main/java/sh/libre/scim/core/Adapter.java | 6 ++++++
src/main/java/sh/libre/scim/core/ScimClient.java | 11 ++++++++---
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index ce8c838..34a263c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1'
+ id "org.sonarqube" version "5.0.0.4638"
}
group = 'sh.libre.scim'
diff --git a/src/main/java/sh/libre/scim/core/Adapter.java b/src/main/java/sh/libre/scim/core/Adapter.java
index e976212..607a7e1 100644
--- a/src/main/java/sh/libre/scim/core/Adapter.java
+++ b/src/main/java/sh/libre/scim/core/Adapter.java
@@ -13,6 +13,12 @@ import sh.libre.scim.jpa.ScimResource;
import java.util.stream.Stream;
+/**
+ * Abstract class for converting a Keycloack {@link RoleMapperModel} into a SCIM {@link ResourceNode}.
+ *
+ * @param <M> The Keycloack {@link RoleMapperModel} (e.g. GroupModel, UserModel)
+ * @param <S> the SCIM {@link ResourceNode} (e.g. Group, User)
+ */
public abstract class Adapter<M extends RoleMapperModel, S extends ResourceNode> {
protected final Logger logger;
diff --git a/src/main/java/sh/libre/scim/core/ScimClient.java b/src/main/java/sh/libre/scim/core/ScimClient.java
index 5831bf3..071251b 100644
--- a/src/main/java/sh/libre/scim/core/ScimClient.java
+++ b/src/main/java/sh/libre/scim/core/ScimClient.java
@@ -14,6 +14,7 @@ import io.github.resilience4j.retry.RetryConfig;
import io.github.resilience4j.retry.RetryRegistry;
import jakarta.persistence.EntityManager;
import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
import jakarta.ws.rs.ProcessingException;
import org.jboss.logging.Logger;
import org.keycloak.component.ComponentModel;
@@ -91,6 +92,10 @@ public class ScimClient implements AutoCloseable {
return new ScimClient(scimRequestBuilder, retryRegistry, session, model);
}
+ private static <M extends RoleMapperModel, S extends ResourceNode, A extends Adapter<M, S>> TypedQuery<ScimResource> findById(A adapter) {
+ return adapter.query("findById", adapter.getId());
+ }
+
protected EntityManager getEntityManager() {
return session.getProvider(JpaConnectionProvider.class).getEntityManager();
}
@@ -116,7 +121,7 @@ public class ScimClient implements AutoCloseable {
if (adapter.skip)
return;
// If mapping exist then it was created by import so skip.
- if (!adapter.query("findById", adapter.getId()).getResultList().isEmpty()) {
+ if (!findById(adapter).getResultList().isEmpty()) {
return;
}
Retry retry = registry.retry("create-" + adapter.getId());
@@ -148,7 +153,7 @@ public class ScimClient implements AutoCloseable {
adapter.apply(kcModel);
if (adapter.skip)
return;
- ScimResource resource = adapter.query("findById", adapter.getId()).getSingleResult();
+ ScimResource resource = findById(adapter).getSingleResult();
adapter.apply(resource);
Retry retry = registry.retry("replace-" + adapter.getId());
ServerResponse<S> response = retry.executeSupplier(() -> {
@@ -178,7 +183,7 @@ public class ScimClient implements AutoCloseable {
adapter.setId(id);
try {
- ScimResource resource = adapter.query("findById", adapter.getId()).getSingleResult();
+ ScimResource resource = findById(adapter).getSingleResult();
adapter.apply(resource);
Retry retry = registry.retry("delete-" + id);
--
GitLab