Merge pull request #1921 from variacode95/Rundeck-1894

1894: Enhanced error message
rundeck · Jun 30, 2016 · 9a0ba56 · 9a0ba56
2 parents 09157ec + eed53cd
commit 9a0ba56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/com/dtolabs/rundeck/core/plugins/JarPluginProviderLoader.java b/core/src/main/java/com/dtolabs/rundeck/core/plugins/JarPluginProviderLoader.java
@@ -206,8 +206,8 @@ static <T,X extends T> T createProviderForClass(final PluggableService<T> servic
         final String pluginname = annotation.name();
 
         if (!service.isValidProviderClass(cls)) {
-            throw new PluginException("Class " + cls.getName() + " was not a valid plugin class for service: "
-                    + service.getName());
+            throw new PluginException("Class " + cls.getName() + " was not a valid plugin class for service: " 
+                    + service.getName() + ". Expected class " + cls.getName() + ", with a public constructor with no parameter");
         }
         debug("Succeeded loading plugin " + cls.getName() + " for service: " + service.getName());
         return service.createProviderInstance(cls, pluginname);

diff --git a/core/src/test/java/com/dtolabs/rundeck/core/plugins/TestJarPluginProviderLoader.java b/core/src/test/java/com/dtolabs/rundeck/core/plugins/TestJarPluginProviderLoader.java
@@ -312,7 +312,7 @@ public void testLoadInvalid() throws Exception {
         } catch (ProviderLoaderException e) {
             assertTrue(e.getCause() instanceof PluginException);
             assertEquals(
-                "Class " + testProvider2.class.getName() + " was not a valid plugin class for service: TestService",
+                "Class " + testProvider2.class.getName() + " was not a valid plugin class for service: TestService. Expected class " + testProvider2.class.getName() + ", with a public constructor with no parameter",
                 e.getCause().getMessage());
 
         }
@@ -379,7 +379,7 @@ public boolean isValidProviderClass(Class clazz) {
         } catch (ProviderLoaderException e) {
             assertTrue(e.getCause() instanceof PluginException);
             assertEquals(
-                "Class " + testProvider1.class.getName() + " was not a valid plugin class for service: TestService",
+                "Class " + testProvider1.class.getName() + " was not a valid plugin class for service: TestService. Expected class " + testProvider1.class.getName() + ", with a public constructor with no parameter",
                 e.getCause().getMessage());
         }
     }
@@ -457,7 +457,7 @@ public boolean isValidProviderClass(Class clazz) {
             fail("should fail");
         } catch (PluginException e) {
             assertEquals(
-                "Class " + testProvider2.class.getName() + " was not a valid plugin class for service: TestService",
+                "Class " + testProvider2.class.getName() + " was not a valid plugin class for service: TestService. Expected class " + testProvider2.class.getName() + ", with a public constructor with no parameter",
                 e.getMessage());
         } catch (ProviderCreationException e) {
             fail("unexpected: " + e.getMessage());