From 4ec7fe3f8e44cbe23a493a10fa840e0638a91b73 Mon Sep 17 00:00:00 2001
From: wu-sheng <wu.sheng@foxmail.com>
Date: Wed, 25 Oct 2017 12:11:30 +0800
Subject: [PATCH] Finish more codes about modulization.

---
 .../apm/collector/modulization/Module.java    | 15 +++++++++-----
 .../modulization/ModuleProvider.java          | 20 +++++++++++++++++--
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java b/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java
index d1cffd7a06..cebc7b8834 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java
+++ b/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java
@@ -41,6 +41,13 @@ public abstract class Module {
      */
     public abstract Class<? extends Service>[] services();
 
+    /**
+     * Run the prepare stage for the module, including finding all potential providers, and asking them to prepare.
+     *
+     * @param moduleManager of this module
+     * @param configuration of this module
+     * @throws ProviderNotFoundException when even don't find a single one providers.
+     */
     void prepare(ModuleManager moduleManager,
         ApplicationConfiguration.ModuleConfiguration configuration) throws ProviderNotFoundException {
         ServiceLoader<ModuleProvider> moduleProviderLoader = ServiceLoader.load(ModuleProvider.class);
@@ -50,16 +57,14 @@ public abstract class Module {
             if (provider.module().equals(getClass())) {
                 ModuleProvider newProvider;
                 try {
-                    newProvider = provider.getClass().getConstructor(ModuleManager.class, Module.class).newInstance(moduleManager, this);
+                    newProvider = provider.getClass().newInstance();
                 } catch (InstantiationException e) {
                     throw new ProviderNotFoundException(e);
                 } catch (IllegalAccessException e) {
                     throw new ProviderNotFoundException(e);
-                } catch (InvocationTargetException e) {
-                    throw new ProviderNotFoundException(e);
-                } catch (NoSuchMethodException e) {
-                    throw new ProviderNotFoundException(e);
                 }
+                newProvider.setManager(moduleManager);
+                newProvider.setModule(this);
                 loadedProviders.add(newProvider);
             }
         }
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java b/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java
index b6d5c2505e..abd5fecd64 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java
+++ b/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java
@@ -32,13 +32,16 @@ import java.util.Properties;
 public abstract class ModuleProvider {
     protected ModuleManager manager;
     protected Module module;
-    protected Map<Class<? extends Service>, Service> services = new HashMap<>();
+    private Map<Class<? extends Service>, Service> services = new HashMap<>();
 
     public ModuleProvider() {
     }
 
-    ModuleProvider(ModuleManager manager, Module module) {
+    void setManager(ModuleManager manager) {
         this.manager = manager;
+    }
+
+    void setModule(Module module) {
         this.module = module;
     }
 
@@ -71,10 +74,23 @@ public abstract class ModuleProvider {
      */
     public abstract String[] requiredModules();
 
+    /**
+     * Register a implementation for the service of this module provider.
+     * @param serviceType
+     * @param service
+     */
+    protected void registerServiceImplementation(Class<? extends Service> serviceType, Service service) {
+        this.services.put(serviceType, service);
+    }
+
     void requiredCheck(Class<? extends Service>[] requiredServices) throws ServiceNotProvidedException {
         if (requiredServices == null)
             return;
 
+        if (requiredServices.length != services.size()) {
+            throw new ServiceNotProvidedException("Haven't provided enough plugins.");
+        }
+
         for (Class<? extends Service> service : requiredServices) {
             if (!services.containsKey(service)) {
                 throw new ServiceNotProvidedException("Service:" + service.getName() + " not provided");
-- 
GitLab