Refine bean get

apache · Dec 1, 2024 · a355c96 · a355c96
1 parent 8a966e6
commit a355c96
Show file tree

Hide file tree

Showing 31 changed files with 299 additions and 155 deletions.
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ClusterScopeModelInitializer.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ClusterScopeModelInitializer.java
@@ -21,10 +21,10 @@
 import org.apache.dubbo.rpc.cluster.support.ClusterUtils;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
-import org.apache.dubbo.rpc.model.ModuleModel;
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;
 
 public class ClusterScopeModelInitializer implements ScopeModelInitializer {
+
     @Override
     public void initializeFrameworkModel(FrameworkModel frameworkModel) {
         ScopeBeanFactory beanFactory = frameworkModel.getBeanFactory();
@@ -36,7 +36,4 @@ public void initializeApplicationModel(ApplicationModel applicationModel) {
         ScopeBeanFactory beanFactory = applicationModel.getBeanFactory();
         beanFactory.registerBean(ClusterUtils.class);
     }
-
-    @Override
-    public void initializeModuleModel(ModuleModel moduleModel) {}
 }
diff --git a/...ter/src/main/java/org/apache/dubbo/rpc/cluster/MergeableClusterScopeModelInitializer.java b/...ter/src/main/java/org/apache/dubbo/rpc/cluster/MergeableClusterScopeModelInitializer.java
@@ -19,20 +19,13 @@
 import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
 import org.apache.dubbo.rpc.cluster.merger.MergerFactory;
 import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.apache.dubbo.rpc.model.FrameworkModel;
-import org.apache.dubbo.rpc.model.ModuleModel;
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;
 
 public class MergeableClusterScopeModelInitializer implements ScopeModelInitializer {
-    @Override
-    public void initializeFrameworkModel(FrameworkModel frameworkModel) {}
 
     @Override
     public void initializeApplicationModel(ApplicationModel applicationModel) {
         ScopeBeanFactory beanFactory = applicationModel.getBeanFactory();
         beanFactory.registerBean(MergerFactory.class);
     }
-
-    @Override
-    public void initializeModuleModel(ModuleModel moduleModel) {}
 }
diff --git a/...ter/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/MeshScopeModelInitializer.java b/...ter/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/MeshScopeModelInitializer.java
@@ -18,17 +18,10 @@
 
 import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
 import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleManager;
-import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.apache.dubbo.rpc.model.FrameworkModel;
 import org.apache.dubbo.rpc.model.ModuleModel;
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;
 
 public class MeshScopeModelInitializer implements ScopeModelInitializer {
-    @Override
-    public void initializeFrameworkModel(FrameworkModel frameworkModel) {}
-
-    @Override
-    public void initializeApplicationModel(ApplicationModel applicationModel) {}
 
     public void initializeModuleModel(ModuleModel moduleModel) {
         ScopeBeanFactory beanFactory = moduleModel.getBeanFactory();

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/beans/factory/ScopeBeanFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/beans/factory/ScopeBeanFactory.java
@@ -24,10 +24,12 @@
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.resource.Disposable;
+import org.apache.dubbo.common.resource.Initializable;
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.common.utils.ConcurrentHashSet;
 import org.apache.dubbo.common.utils.Pair;
 import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.utils.TypeUtils;
 import org.apache.dubbo.rpc.model.ScopeModelAccessor;
 
 import java.util.ArrayList;
@@ -39,6 +41,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_DESTROY_INVOKER;
@@ -55,6 +58,7 @@ public final class ScopeBeanFactory {
     private final List<ExtensionPostProcessor> extensionPostProcessors;
     private final Map<Class<?>, AtomicInteger> beanNameIdCounterMap = CollectionUtils.newConcurrentHashMap();
     private final List<BeanInfo> registeredBeanInfos = new CopyOnWriteArrayList<>();
+    private final List<BeanDefinition<?>> registeredBeanDefinitions = new CopyOnWriteArrayList<>();
     private InstantiationStrategy instantiationStrategy;
     private final AtomicBoolean destroyed = new AtomicBoolean();
     private final Set<Class<?>> registeredClasses = new ConcurrentHashSet<>();
@@ -87,6 +91,27 @@ public <T> T registerBean(String name, Class<T> clazz) throws ScopeBeanException
         return getOrRegisterBean(name, clazz);
     }
 
+    public <T> void registerBeanDefinition(Class<T> bean) {
+        registerBeanDefinition(null, bean);
+    }
+
+    public <T> void registerBeanDefinition(String name, Class<T> bean) {
+        registeredBeanDefinitions.add(new BeanDefinition<>(name, bean));
+    }
+
+    public <T> void registerBeanFactory(Supplier<T> factory) {
+        registerBeanFactory(null, factory);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> void registerBeanFactory(String name, Supplier<T> factory) {
+        Class<T> clazz = (Class<T>) TypeUtils.getSuperGenericType(factory.getClass(), 0);
+        if (clazz == null) {
+            throw new ScopeBeanException("unable to determine bean class from factory's superclass or interface");
+        }
+        registeredBeanDefinitions.add(new BeanDefinition<>(name, clazz, factory));
+    }
+
     private <T> T createAndRegisterBean(String name, Class<T> clazz) {
         checkDestroyed();
         T instance = getBean(name, clazz);
@@ -174,6 +199,9 @@ private void initializeBean(String name, Object bean) {
             for (ExtensionPostProcessor processor : extensionPostProcessors) {
                 processor.postProcessAfterInitialization(bean, name);
             }
+            if (bean instanceof Initializable) {
+                ((Initializable) bean).initialize(extensionAccessor);
+            }
         } catch (Exception e) {
             throw new ScopeBeanException(
                     "register bean failed! name=" + name + ", type="
@@ -182,9 +210,48 @@ private void initializeBean(String name, Object bean) {
         }
     }
 
+    @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
+    private void initializeBeanDefinitions(Class<?> type) {
+        for (int i = 0, size = registeredBeanDefinitions.size(); i < size; i++) {
+            BeanDefinition<?> definition = registeredBeanDefinitions.get(i);
+            if (definition.initialized) {
+                continue;
+            }
+
+            Class<?> beanClass = definition.beanClass;
+            if (!type.isAssignableFrom(beanClass)) {
+                continue;
+            }
+            synchronized (type) {
+                if (definition.initialized) {
+                    continue;
+                }
+
+                Object bean;
+                Supplier<?> factory = definition.beanFactory;
+                if (factory == null) {
+                    try {
+                        bean = instantiationStrategy.instantiate(beanClass);
+                    } catch (Throwable e) {
+                        throw new ScopeBeanException("create bean instance failed, type=" + beanClass.getName(), e);
+                    }
+                } else {
+                    initializeBean(definition.name, factory);
+                    try {
+                        bean = factory.get();
+                    } catch (Exception e) {
+                        throw new ScopeBeanException("create bean instance failed, type=" + beanClass.getName(), e);
+                    }
+                }
+                registerBean(definition.name, bean);
+                definition.initialized = true;
+            }
+        }
+    }
+
     private boolean containsBean(String name, Object bean) {
         for (BeanInfo beanInfo : registeredBeanInfos) {
-            if (beanInfo.instance == bean && (name == null || StringUtils.isEquals(name, beanInfo.name))) {
+            if (beanInfo.instance == bean && (name == null || name.equals(beanInfo.name))) {
                 return true;
             }
         }
@@ -199,6 +266,8 @@ private int getNextId(Class<?> beanClass) {
 
     @SuppressWarnings("unchecked")
     public <T> List<T> getBeansOfType(Class<T> type) {
+        initializeBeanDefinitions(type);
+
         List<T> currentBeans = (List<T>) registeredBeanInfos.stream()
                 .filter(beanInfo -> type.isInstance(beanInfo.instance))
                 .map(beanInfo -> beanInfo.instance)
@@ -244,6 +313,9 @@ private <T> T getBeanInternal(String name, Class<T> type) {
         if (type == Object.class) {
             return null;
         }
+
+        initializeBeanDefinitions(type);
+
         List<BeanInfo> candidates = null;
         BeanInfo firstCandidate = null;
         for (BeanInfo beanInfo : registeredBeanInfos) {
@@ -301,6 +373,7 @@ public void destroy() {
                 }
             }
             registeredBeanInfos.clear();
+            registeredBeanDefinitions.clear();
             beanCache.clear();
         }
     }
@@ -315,16 +388,36 @@ private void checkDestroyed() {
         }
     }
 
-    static class BeanInfo {
+    static final class BeanInfo {
         private final String name;
         private final Object instance;
 
-        public BeanInfo(String name, Object instance) {
+        BeanInfo(String name, Object instance) {
             this.name = name;
             this.instance = instance;
         }
     }
 
+    static final class BeanDefinition<T> {
+
+        private final String name;
+        private final Class<T> beanClass;
+        private final Supplier<T> beanFactory;
+        private volatile boolean initialized;
+
+        BeanDefinition(String name, Class<T> beanClass) {
+            this.name = name;
+            this.beanClass = beanClass;
+            beanFactory = null;
+        }
+
+        BeanDefinition(String name, Class<T> beanClass, Supplier<T> beanFactory) {
+            this.name = name;
+            this.beanClass = beanClass;
+            this.beanFactory = beanFactory;
+        }
+    }
+
     public Set<Class<?>> getRegisteredClasses() {
         return registeredClasses;
     }

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionAccessor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionAccessor.java
@@ -46,14 +46,6 @@ default <T> T getDefaultExtension(Class<T> type) {
         return extensionLoader != null ? extensionLoader.getDefaultExtension() : null;
     }
 
-    default <T> T getDefaultExtensionOrNull(Class<T> type) {
-        ExtensionLoader<T> extensionLoader = getExtensionLoader(type);
-        if (extensionLoader == null) {
-            return null;
-        }
-        return extensionLoader.getExtension(extensionLoader.getDefaultExtensionName(), true);
-    }
-
     default <T> List<T> getActivateExtensions(Class<T> type) {
         ExtensionLoader<T> extensionLoader = getExtensionLoader(type);
         return extensionLoader != null ? extensionLoader.getActivateExtensions() : Collections.emptyList();

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/resource/Initializable.java b/dubbo-common/src/main/java/org/apache/dubbo/common/resource/Initializable.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.resource;
+
+import org.apache.dubbo.common.extension.ExtensionAccessor;
+
+/**
+ * An interface for Initializing resources
+ */
+public interface Initializable {
+
+    default void initialize(ExtensionAccessor accessor) {
+        initialize();
+    }
+
+    default void initialize() {}
+}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModelInitializer.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModelInitializer.java
@@ -22,9 +22,12 @@
 @SPI(scope = ExtensionScope.SELF)
 public interface ScopeModelInitializer {
 
-    void initializeFrameworkModel(FrameworkModel frameworkModel);
+    default void initializeFrameworkModel(FrameworkModel frameworkModel) {}
+    ;
 
-    void initializeApplicationModel(ApplicationModel applicationModel);
+    default void initializeApplicationModel(ApplicationModel applicationModel) {}
+    ;
 
-    void initializeModuleModel(ModuleModel moduleModel);
+    default void initializeModuleModel(ModuleModel moduleModel) {}
+    ;
 }
diff --git a/...ata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataScopeModelInitializer.java b/...ata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataScopeModelInitializer.java
@@ -18,20 +18,13 @@
 
 import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
 import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.apache.dubbo.rpc.model.FrameworkModel;
-import org.apache.dubbo.rpc.model.ModuleModel;
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;
 
 public class MetadataScopeModelInitializer implements ScopeModelInitializer {
-    @Override
-    public void initializeFrameworkModel(FrameworkModel frameworkModel) {}
 
     @Override
     public void initializeApplicationModel(ApplicationModel applicationModel) {
         ScopeBeanFactory beanFactory = applicationModel.getBeanFactory();
         beanFactory.registerBean(MetadataReportInstance.class);
     }
-
-    @Override
-    public void initializeModuleModel(ModuleModel moduleModel) {}
 }
diff --git a/...-metrics-default/src/main/java/org/apache/dubbo/metrics/MetricsScopeModelInitializer.java b/...-metrics-default/src/main/java/org/apache/dubbo/metrics/MetricsScopeModelInitializer.java
@@ -19,21 +19,13 @@
 import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
 import org.apache.dubbo.metrics.event.MetricsDispatcher;
 import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.apache.dubbo.rpc.model.FrameworkModel;
-import org.apache.dubbo.rpc.model.ModuleModel;
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;
 
 public class MetricsScopeModelInitializer implements ScopeModelInitializer {
 
-    @Override
-    public void initializeFrameworkModel(FrameworkModel frameworkModel) {}
-
     @Override
     public void initializeApplicationModel(ApplicationModel applicationModel) {
         ScopeBeanFactory beanFactory = applicationModel.getBeanFactory();
         beanFactory.registerBean(MetricsDispatcher.class);
     }
-
-    @Override
-    public void initializeModuleModel(ModuleModel moduleModel) {}
 }
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/QosScopeModelInitializer.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/QosScopeModelInitializer.java
@@ -22,10 +22,10 @@
 import org.apache.dubbo.qos.server.Server;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
-import org.apache.dubbo.rpc.model.ModuleModel;
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;
 
 public class QosScopeModelInitializer implements ScopeModelInitializer {
+
     @Override
     public void initializeFrameworkModel(FrameworkModel frameworkModel) {
         ScopeBeanFactory beanFactory = frameworkModel.getBeanFactory();
@@ -38,7 +38,4 @@ public void initializeApplicationModel(ApplicationModel applicationModel) {
         ScopeBeanFactory beanFactory = applicationModel.getBeanFactory();
         beanFactory.registerBean(ActuatorCommandExecutor.class);
     }
-
-    @Override
-    public void initializeModuleModel(ModuleModel moduleModel) {}
 }
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/GetOpenAPI.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/GetOpenAPI.java
@@ -45,7 +45,7 @@ public GetOpenAPI(FrameworkModel frameworkModel) {
 
     @Override
     public String execute(CommandContext commandContext, String[] args) {
-        OpenAPIService openAPIService = frameworkModel.getDefaultExtensionOrNull(OpenAPIService.class);
+        OpenAPIService openAPIService = frameworkModel.getBean(OpenAPIService.class);
         if (openAPIService == null) {
             return "OpenAPI is not available";
         }