Merge branch 'dev-1.x' into release-1.x

Author: mercyblitz

microsphere-resilience4j-compatible/src/main/java/io/github/resilience4j/package-info.java

@@ -21,4 +21,4 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
  * @since 1.0.0
  */
-package io.github.resilience4j;
+package io.github.resilience4j;

microsphere-resilience4j-plugins/microsphere-resilience4j-spring-web/src/main/java/io/microsphere/resilience4j/spring/web/Resilience4jHandlerMethodInterceptor.java

@@ -121,7 +121,6 @@ protected void initEntryCache(WebEndpointMappingsReadyEvent event) {
         Collection<WebEndpointMapping> webEndpointMappings = event.getMappings();
         int size = webEndpointMappings.size();
 
-
         Map<Method, String> methodEntryNamesCache = newFixedHashMap(size);
         this.methodEntryNamesCache = methodEntryNamesCache;
 

microsphere-resilience4j-spring/src/main/java/io/microsphere/resilience4j/spring/common/Resilience4jUtils.java

@@ -79,4 +79,4 @@ public static void registerSpelResolverConfiguration(BeanDefinitionRegistry regi
 
     private Resilience4jUtils() {
     }
-}
+}

microsphere-resilience4j-spring/src/test/java/io/microsphere/resilience4j/spring/LazyResilience4jFacadeTest.java

@@ -17,7 +17,6 @@
 
 package io.microsphere.resilience4j.spring;
 
-
 import io.microsphere.resilience4j.common.Resilience4jContext;
 import io.microsphere.resilience4j.common.Resilience4jFacade;
 import io.microsphere.resilience4j.spring.bulkhead.annotation.EnableBulkhead;

microsphere-resilience4j-spring/src/test/java/io/microsphere/resilience4j/spring/common/event/EventConsumerMethodFilterTest.java

@@ -17,7 +17,6 @@
 
 package io.microsphere.resilience4j.spring.common.event;
 
-
 import io.github.resilience4j.bulkhead.Bulkhead;
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.github.resilience4j.core.EventPublisher;

microsphere-resilience4j-spring/src/test/java/io/microsphere/resilience4j/spring/context/CommonConfigurationsApplicationContextInitializer.java

@@ -43,4 +43,4 @@ public void initialize(ConfigurableApplicationContext context) {
         BeanDefinitionRegistry registry = asBeanDefinitionRegistry(beanFactory);
         registerCommonConfigurations(registry);
     }
-}
+}