keycloak-memoizeit

Cleanup

1/5/2016 6:32:38 PM

Details

diff --git a/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java b/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java
index c92ede0..c17350a 100644
--- a/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java
+++ b/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java
@@ -18,8 +18,6 @@
 package org.keycloak.partialimport;
 
 import java.util.List;
-import org.jboss.resteasy.spi.NotFoundException;
-import org.keycloak.models.IdentityProviderMapperModel;
 import org.keycloak.models.IdentityProviderModel;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
@@ -27,7 +25,6 @@ import org.keycloak.models.utils.KeycloakModelUtils;
 import org.keycloak.models.utils.RepresentationToModel;
 import org.keycloak.representations.idm.IdentityProviderRepresentation;
 import org.keycloak.representations.idm.PartialImportRepresentation;
-import org.keycloak.services.resources.admin.IdentityProviderResource;
 
 /**
  *
diff --git a/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java b/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java
index 43f4eb0..7a8eeb0 100644
--- a/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java
+++ b/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java
@@ -52,29 +52,17 @@ public class PartialImportManager {
     private final PartialImportRepresentation rep;
     private final KeycloakSession session;
     private final RealmModel realm;
-    //private final UriInfo uriInfo;
     private final AdminEventBuilder adminEvent;
 
-    //private final Set<UserRepresentation> usersToOverwrite = new HashSet<>();
-    //private final Set<ClientRepresentation> clientsToOverwrite = new HashSet<>();
-    //private final Set<IdentityProviderRepresentation> idpsToOverwrite = new HashSet<>();
-
-    //private int added = 0;
-    //private int skipped = 0;
-    //private int overwritten = 0;
-
     public PartialImportManager(PartialImportRepresentation rep, KeycloakSession session,
                                 RealmModel realm, AdminEventBuilder adminEvent) {
         this.rep = rep;
         this.session = session;
         this.realm = realm;
-        //this.uriInfo = uriInfo;
         this.adminEvent = adminEvent;
 
         // Do not change the order of these!!!
         partialImports.add(new ClientsPartialImport());
-       // partialImports.add(new RealmRolesPartialImport());
-       // partialImports.add(new ClientRolesPartialImport());
         partialImports.add(new RolesPartialImport());
         partialImports.add(new UsersPartialImport());
         partialImports.add(new IdentityProvidersPartialImport());
diff --git a/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java b/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java
index 1c335a9..ec5004a 100644
--- a/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java
+++ b/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java
@@ -92,19 +92,7 @@ public class RealmRolesPartialImport extends AbstractPartialImport<RoleRepresent
         RoleHelper helper = new RoleHelper(realm);
         helper.deleteRole(role);
     }
-/*
-    private void checkForComposite(RoleRepresentation roleRep) {
-        if (roleRep.isComposite()) {
-            throw new IllegalArgumentException("Composite role '" + getName(roleRep) + "' can not be partially imported");
-        }
-    }
 
-    private void checkForOverwriteComposite(RoleModel role) {
-        if (role.isComposite()) {
-            throw new IllegalArgumentException("Composite role '" + role.getName() + "' can not be overwritten.");
-        }
-    }
-*/
     @Override
     public void create(RealmModel realm, KeycloakSession session, RoleRepresentation roleRep) {
         //checkForComposite(roleRep);