From 7ead62bb64d04c95fd8c4c5f23ff02f50d29b5b2 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 21 Dec 2014 00:42:21 +0100
Subject: [PATCH] fix generic handling of extension processor

---
 scm-core/src/main/java/sonia/scm/Priorities.java         | 9 +++++----
 .../main/java/sonia/scm/plugin/ExtensionProcessor.java   | 9 +++++----
 .../src/main/java/sonia/scm/ScmContextListener.java      | 2 +-
 .../src/main/java/sonia/scm/ScmSecurityModule.java       | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/Priorities.java b/scm-core/src/main/java/sonia/scm/Priorities.java
index 906ea7cd61..d863d12312 100644
--- a/scm-core/src/main/java/sonia/scm/Priorities.java
+++ b/scm-core/src/main/java/sonia/scm/Priorities.java
@@ -98,9 +98,10 @@ public final class Priorities
    *
    * @return sorted class list
    */
-  public static <T> List<Class<T>> sort(Iterable<Class<T>> unordered)
+  public static <T> List<Class<? extends T>> sort(
+    Iterable<Class<? extends T>> unordered)
   {
-    return new PriorityOrdering().sortedCopy(unordered);
+    return new PriorityOrdering<T>().sortedCopy(unordered);
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -133,7 +134,7 @@ public final class Priorities
    *
    * @param <T> type of class
    */
-  public static class PriorityOrdering<T> extends Ordering<Class<T>>
+  public static class PriorityOrdering<T> extends Ordering<Class<? extends T>>
   {
 
     /**
@@ -146,7 +147,7 @@ public final class Priorities
      * @return compare value
      */
     @Override
-    public int compare(Class<T> left, Class<T> right)
+    public int compare(Class<? extends T> left, Class<? extends T> right)
     {
       return Ints.compare(getPriority(left), getPriority(right));
     }
diff --git a/scm-core/src/main/java/sonia/scm/plugin/ExtensionProcessor.java b/scm-core/src/main/java/sonia/scm/plugin/ExtensionProcessor.java
index 80ad42642d..b059238eba 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/ExtensionProcessor.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/ExtensionProcessor.java
@@ -50,10 +50,11 @@ public interface ExtensionProcessor
    *
    * @param <T> type of extension
    * @param extensionPoint extension point
-   * 
+   *
    * @return extensions
    */
-  public <T> Iterable<Class<T>> byExtensionPoint(Class<T> extensionPoint);
+  public <T> Iterable<Class<? extends T>> byExtensionPoint(
+    Class<T> extensionPoint);
 
   /**
    * Returns single extension by its extension point.
@@ -61,10 +62,10 @@ public interface ExtensionProcessor
    *
    * @param <T> type of extension
    * @param extensionPoint extension point
-   * 
+   *
    * @return extension
    */
-  public <T> Class<T> oneByExtensionPoint(Class<T> extensionPoint);
+  public <T> Class<? extends T> oneByExtensionPoint(Class<T> extensionPoint);
 
   /**
    * Process auto bind extensions.
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
index 1990d3bfb6..2ad6bc72d6 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
@@ -217,7 +217,7 @@ public class ScmContextListener extends GuiceServletContextListener
    */
   private void appendModules(ExtensionProcessor ep, List<Module> moduleList)
   {
-    for (Class<Module> module : ep.byExtensionPoint(Module.class))
+    for (Class<? extends Module> module : ep.byExtensionPoint(Module.class))
     {
       try
       {
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java b/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java
index 0a8a4f7a7a..1d323cc777 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java
@@ -102,7 +102,7 @@ public class ScmSecurityModule extends ShiroWebModule
     expose(PasswordService.class);
 
     // bind realm
-    for (Class<Realm> realm : extensionProcessor.byExtensionPoint(Realm.class))
+    for (Class<? extends Realm> realm : extensionProcessor.byExtensionPoint(Realm.class))
     {
       logger.info("bind security realm {}", realm);
       bindRealm().to(realm);