Allow the creation of utility by class without registration

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@801851 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 3 deletions

diff --git a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 2ab50cf414..a395352e4f 100644
--- a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
@@ -177,9 +177,13 @@ public class DefaultUtilityExtensionPoint implements UtilityExtensionPoint {
             try {
                 ServiceDeclaration utilityDeclaration =
                     ServiceDiscovery.getInstance().getServiceDeclaration(utilityType.getName());
+                Class<?> utilityClass = null;
                 if (utilityDeclaration != null) {
-                    Class<?> utilityClass = utilityDeclaration.loadClass();
-
+                    utilityClass = utilityDeclaration.loadClass();
+                } else if (isConcreteClass(utilityType)) {
+                    utilityClass = utilityType;
+                }
+                if (utilityClass != null) {
                     // Construct the utility
                     Constructor<?>[] constructors = utilityClass.getConstructors();
                     Constructor<?> constructor = getConstructor(constructors, ExtensionPointRegistry.class, Map.class);
@@ -218,7 +222,13 @@ public class DefaultUtilityExtensionPoint implements UtilityExtensionPoint {
             }
         }
         return utilityType.cast(utility);
-    }    
+    }
+
+    private boolean isConcreteClass(Class<?> utilityType) {
+        int modifiers = utilityType.getModifiers();
+        return !utilityType.isInterface() && Modifier.isPublic(modifiers) && !Modifier.isAbstract(modifiers);
+    }
+
     public void start() {
         // NOOP
     }