corrected generic types

Signed-off-by: Simon Kaufmann <[email protected]>
eclipse-archived · Feb 9, 2018 · 3d2a698 · 3d2a698
1 parent a22fb82
commit 3d2a698
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ore.test/src/test/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java b/...ore.test/src/test/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java
@@ -357,7 +357,7 @@ public void testLambdas() throws Exception {
             thingHandler.method();
         }, Runnable.class).build().run();
 
-        String res = safeCaller.create((Function<String, String>) name -> {
+        Object res = safeCaller.create((Function<String, String>) name -> {
             return "Hello " + name + "!";
         }, Function.class).build().apply("World");
         assertThat(res, is("Hello World!"));

diff --git a/...rg.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/common/SafeCaller.java b/...rg.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/common/SafeCaller.java
@@ -39,6 +39,6 @@ public interface SafeCaller {
      * @param interfaceType the interface which defines the relevant methods
      * @return a safe call builder instance.
      */
-    <T extends I, I> SafeCallerBuilder<T> create(T target, Class<I> interfaceType);
+    <T> SafeCallerBuilder<T> create(T target, Class<T> interfaceType);
 
 }
diff --git a/...arthome.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImpl.java b/...arthome.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImpl.java
@@ -71,7 +71,7 @@ public void deactivate() {
     }
 
     @Override
-    public <T extends I, I> SafeCallerBuilder<T> create(T target, Class<I> interfaceType) {
+    public <T> SafeCallerBuilder<T> create(T target, Class<T> interfaceType) {
         return new SafeCallerBuilderImpl<T>(target, new Class<?>[] { interfaceType }, manager);
     }