Merge 0ebf6f1 into ac5be1d

sofastack · Sep 21, 2018 · ff82b8b · ff82b8b
2 parents ac5be1d + 0ebf6f1
commit ff82b8b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/...fa-boot-starter/src/test/java/com/alipay/sofa/runtime/beans/FactoryBeanPostProcessor.java b/...fa-boot-starter/src/test/java/com/alipay/sofa/runtime/beans/FactoryBeanPostProcessor.java
@@ -16,6 +16,7 @@
  */
 package com.alipay.sofa.runtime.beans;
 
+import com.alipay.sofa.runtime.spring.configuration.SofaRuntimeAutoConfiguration;
 import com.alipay.sofa.runtime.spring.factory.ReferenceFactoryBean;
 import com.alipay.sofa.runtime.util.StateMessage;
 import org.springframework.aop.TargetSource;
@@ -37,7 +38,10 @@ protected Object[] getAdvicesAndAdvisorsForBean(Class<?> beanClass, String beanN
     @Override
     protected Object wrapIfNecessary(final Object bean, String beanName, Object cacheKey) {
         if (bean instanceof ReferenceFactoryBean) {
-            StateMessage.setMessage("aop");
+            StateMessage.setFactoryMessage("aop");
+        }
+        if (bean instanceof SofaRuntimeAutoConfiguration) {
+            StateMessage.setConfigMessage("config");
         }
         return bean;
     }

diff --git a/...integration/ReferenceFactoryBeanTest.java → ...me/integration/BeanPostProcessorTest.java b/...integration/ReferenceFactoryBeanTest.java → ...me/integration/BeanPostProcessorTest.java
@@ -25,9 +25,10 @@
  * @author qilong.zql
  * @since 2.4.1
  */
-public class ReferenceFactoryBeanTest extends AbstractTestBase {
+public class BeanPostProcessorTest extends AbstractTestBase {
     @Test
     public void test() {
-        Assert.isTrue("aop".equals(StateMessage.getMessage()));
+        Assert.isTrue("aop".equals(StateMessage.getFactoryMessage()));
+        Assert.isTrue("config".equals(StateMessage.getConfigMessage()));
     }
 }
diff --git a/runtime-sofa-boot-starter/src/test/java/com/alipay/sofa/runtime/util/StateMessage.java b/runtime-sofa-boot-starter/src/test/java/com/alipay/sofa/runtime/util/StateMessage.java
@@ -21,13 +21,23 @@
  * @since 2.4.1
  */
 public class StateMessage {
-    private static String message = "UNDO";
+    private static String factoryMessage = "UNDO";
 
-    public static void setMessage(String message) {
-        StateMessage.message = message;
+    private static String configMessage  = "UNDO";
+
+    public static void setFactoryMessage(String factoryMessage) {
+        StateMessage.factoryMessage = factoryMessage;
+    }
+
+    public static String getFactoryMessage() {
+        return StateMessage.factoryMessage;
+    }
+
+    public static String getConfigMessage() {
+        return configMessage;
     }
 
-    public static String getMessage() {
-        return StateMessage.message;
+    public static void setConfigMessage(String configMessage) {
+        StateMessage.configMessage = configMessage;
     }
 }