Merge pull request #1248 from stianst/master

Added isPrivate to Spi

broker/core/src/main/java/org/keycloak/broker/provider/IdentityProviderMapperSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class IdentityProviderMapperSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return false;
+    }
+
     @Override
     public String getName() {
         return "identity-provider-mapper";

broker/core/src/main/java/org/keycloak/broker/provider/IdentityProviderSpi.java

@@ -28,6 +28,11 @@ public class IdentityProviderSpi implements Spi {
 
     public static final String IDENTITY_PROVIDER_SPI_NAME = "identity_provider";
 
+    @Override
+    public boolean isPrivate() {
+        return false;
+    }
+
     @Override
     public String getName() {
         return IDENTITY_PROVIDER_SPI_NAME;

connections/file/src/main/java/org/keycloak/connections/file/FileConnectionSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class FileConnectionSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "connectionsFile";

connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class HttpClientSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "connectionsHttpClient";

connections/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class InfinispanConnectionSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "connectionsInfinispan";

connections/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class JpaConnectionSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "connectionsJpa";

connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class JpaUpdaterSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "connectionsJpaUpdater";

connections/mongo/src/main/java/org/keycloak/connections/mongo/MongoConnectionSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class MongoConnectionSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "connectionsMongo";

connections/mongo/src/main/java/org/keycloak/connections/mongo/updater/MongoUpdaterSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class MongoUpdaterSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "connectionsMongoUpdater";

events/api/src/main/java/org/keycloak/events/EventListenerSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class EventListenerSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return false;
+    }
+
     @Override
     public String getName() {
         return "eventsListener";

events/api/src/main/java/org/keycloak/events/EventStoreSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class EventStoreSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "eventsStore";

export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class ExportSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "export";

export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class ImportSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "import";

forms/account-api/src/main/java/org/keycloak/account/AccountSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class AccountSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "account";

forms/common-freemarker/src/main/java/org/keycloak/freemarker/ThemeSpi.java

@@ -8,6 +8,12 @@ import org.keycloak.provider.Spi;
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
  */
 public class ThemeSpi implements Spi {
+
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "theme";

forms/email-api/src/main/java/org/keycloak/email/EmailSpi.java

@@ -8,6 +8,12 @@ import org.keycloak.provider.Spi;
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
  */
 public class EmailSpi implements Spi {
+
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "email";

forms/login-api/src/main/java/org/keycloak/login/LoginFormsSpi.java

@@ -8,6 +8,12 @@ import org.keycloak.provider.Spi;
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
  */
 public class LoginFormsSpi implements Spi {
+
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "login";

model/api/src/main/java/org/keycloak/migration/MigrationSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class MigrationSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "migration";

model/api/src/main/java/org/keycloak/models/RealmSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class RealmSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "realm";

model/api/src/main/java/org/keycloak/models/UserFederationSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class UserFederationSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return false;
+    }
+
     @Override
     public String getName() {
         return "userFederation";

model/api/src/main/java/org/keycloak/models/UserSessionSpi.java

@@ -11,6 +11,11 @@ public class UserSessionSpi implements Spi {
 
     public static final String NAME = "userSessions";
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return NAME;

model/api/src/main/java/org/keycloak/models/UserSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class UserSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "user";

model/api/src/main/java/org/keycloak/provider/Spi.java

@@ -5,6 +5,7 @@ package org.keycloak.provider;
  */
 public interface Spi {
 
+    public boolean isPrivate();
     public String getName();
     public Class<? extends Provider> getProviderClass();
     public Class<? extends ProviderFactory> getProviderFactoryClass();

model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java

@@ -10,6 +10,11 @@ import org.keycloak.provider.Spi;
  */
 public class CacheRealmProviderSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "realmCache";

model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java

@@ -10,6 +10,11 @@ import org.keycloak.provider.Spi;
  */
 public class CacheUserProviderSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "userCache";

services/src/main/java/org/keycloak/exportimport/ClientImportSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class ClientImportSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "client-import";

services/src/main/java/org/keycloak/protocol/LoginProtocolSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class LoginProtocolSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "login-protocol";

services/src/main/java/org/keycloak/protocol/ProtocolMapperSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class ProtocolMapperSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return false;
+    }
+
     @Override
     public String getName() {
         return "protocol-mapper";

services/src/main/java/org/keycloak/wellknown/WellKnownSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class WellKnownSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "well-known";

social/core/src/main/java/org/keycloak/social/SocialProviderSpi.java

@@ -28,6 +28,11 @@ public class SocialProviderSpi implements Spi {
 
     public static final String SOCIAL_SPI_NAME = "social";
 
+    @Override
+    public boolean isPrivate() {
+        return false;
+    }
+
     @Override
     public String getName() {
         return SOCIAL_SPI_NAME;

testsuite/integration/src/test/java/org/keycloak/testsuite/utils/ListSpi.java

@@ -0,0 +1,34 @@
+package org.keycloak.testsuite.utils;
+
+import org.keycloak.provider.Spi;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ServiceLoader;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class ListSpi {
+
+    public static void main(String[] args) {
+        List<String> l = new LinkedList<>();
+        for (Spi s : ServiceLoader.load(Spi.class)) {
+            l.add(fixedLength(s.getName()) + s.isPrivate());
+        }
+        Collections.sort(l);
+        System.out.println(fixedLength("SPI") + "Private");
+        System.out.println("-------------------------------------");
+        for (String s : l) {
+            System.out.println(s);
+        }
+    }
+
+    public static String fixedLength(String s) {
+        while (s.length() < 30) {
+            s = s + " ";
+        }
+        return s;
+    }
+}

timer/api/src/main/java/org/keycloak/timer/TimerSpi.java

@@ -8,6 +8,12 @@ import org.keycloak.provider.Spi;
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
  */
 public class TimerSpi implements Spi {
+
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "timer";