W-16639197: Update spring core to v6 (mulesoft#13811)

wesleybowen · Sep 4, 2024 · edbfbe0 · edbfbe0
1 parent b7e62ce
commit edbfbe0
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 30 deletions.
diff --git a/...e/artifact/activation/internal/deployable/MavenDeployableProjectModelBuilderTestCase.java b/...e/artifact/activation/internal/deployable/MavenDeployableProjectModelBuilderTestCase.java
@@ -194,7 +194,7 @@ public void createDeployableProjectModelWithSharedLibrary() throws URISyntaxExce
   public void createDeployableProjectModelWithTransitiveSharedLibrary() throws URISyntaxException {
     DeployableProjectModel deployableProjectModel = getDeployableProjectModel(deploymentTypePrefix + "/shared-lib-transitive");
 
-    assertThat(deployableProjectModel.getSharedLibraries(), hasSize(6));
+    assertThat(deployableProjectModel.getSharedLibraries(), hasSize(8));
     assertThat(deployableProjectModel.getSharedLibraries(), hasItem(hasProperty("artifactId", equalTo("spring-context"))));
   }
 
@@ -240,7 +240,7 @@ public void createDeployableProjectModelWithTransitiveAdditionalPluginDependency
 
     assertThat(deployableProjectModel.getAdditionalPluginDependencies(), aMapWithSize(1));
     assertThat(deployableProjectModel.getAdditionalPluginDependencies(),
-               hasEntry(hasProperty("artifactId", equalTo("mule-spring-module")), hasSize(6)));
+               hasEntry(hasProperty("artifactId", equalTo("mule-spring-module")), hasSize(8)));
     assertThat(deployableProjectModel.getAdditionalPluginDependencies(),
                hasEntry(hasProperty("artifactId", equalTo("mule-spring-module")),
                         hasItem(hasProperty("descriptor", hasProperty("artifactId", equalTo("spring-context"))))));

diff --git a/.../module/artifact/activation/internal/descriptor/ApplicationDescriptorFactoryTestCase.java b/.../module/artifact/activation/internal/descriptor/ApplicationDescriptorFactoryTestCase.java
@@ -154,7 +154,7 @@ public void createApplicationDescriptorWithTransitiveAdditionalPluginDependency(
             .filter(bundleDependency -> bundleDependency.getDescriptor().getArtifactId().equals("mule-spring-module")).findAny()
             .get().getAdditionalDependenciesList();
 
-    assertThat(additionalDependencies, hasSize(6));
+    assertThat(additionalDependencies, hasSize(8));
     assertThat(additionalDependencies.get(0).getDescriptor().getArtifactId(), is("spring-context"));
 
     ArtifactPluginDescriptor springPlugin = applicationDescriptor.getPlugins()

diff --git a/...ntime/module/artifact/activation/internal/descriptor/DomainDescriptorFactoryTestCase.java b/...ntime/module/artifact/activation/internal/descriptor/DomainDescriptorFactoryTestCase.java
@@ -151,7 +151,7 @@ public void createDomainDescriptorWithTransitiveAdditionalPluginDependency() thr
             .filter(bundleDependency -> bundleDependency.getDescriptor().getArtifactId().equals("mule-spring-module")).findAny()
             .get().getAdditionalDependenciesList();
 
-    assertThat(additionalDependencies, hasSize(6));
+    assertThat(additionalDependencies, hasSize(8));
     assertThat(additionalDependencies.get(0).getDescriptor().getArtifactId(), is("spring-context"));
 
     ArtifactPluginDescriptor springPlugin = domainDescriptor.getPlugins()

diff --git a/...ntime/module/extension/internal/config/dsl/config/ConfigurationProviderObjectFactory.java b/...ntime/module/extension/internal/config/dsl/config/ConfigurationProviderObjectFactory.java
@@ -16,7 +16,6 @@
 import static java.util.Optional.ofNullable;
 
 import org.mule.runtime.api.exception.MuleException;
-import org.mule.runtime.api.exception.MuleRuntimeException;
 import org.mule.runtime.api.meta.model.ExtensionModel;
 import org.mule.runtime.api.meta.model.config.ConfigurationModel;
 import org.mule.runtime.api.meta.model.parameter.ParameterModel;
@@ -110,10 +109,11 @@ private ConfigurationProvider createInnerInstance() throws ConfigurationExceptio
         }
 
       } catch (Exception e) {
-        throw new MuleRuntimeException(
-                                       createStaticMessage(format("Could not create an implicit configuration '%s' for the extension '%s'",
-                                                                  configurationModel.getName(), extensionModel.getName())),
-                                       e);
+        throw new ConfigurationException(createStaticMessage(format("Could not create an implicit configuration '%s' for the extension '%s': %s",
+                                                                    configurationModel.getName(),
+                                                                    extensionModel.getName(),
+                                                                    e.getMessage())),
+                                         e);
       }
       return configurationProvider;
     });

diff --git a/...rc/main/java/org/mule/runtime/config/internal/context/ObjectProviderAwareBeanFactory.java b/...rc/main/java/org/mule/runtime/config/internal/context/ObjectProviderAwareBeanFactory.java
@@ -26,6 +26,7 @@
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -81,6 +82,8 @@ public Object getBean(String name) throws BeansException {
         throw new NoSuchBeanDefinitionException(name);
       }
       return bean;
+    } catch (BeanCreationException e) {
+      throw unwrapBeanCreationException(e);
     } catch (NoSuchBeanDefinitionException e) {
       Optional<Object> objectFound =
           objectProviders.stream().map(objectProvider -> objectProvider.getObject(name))
@@ -91,6 +94,32 @@ public Object getBean(String name) throws BeansException {
     }
   }
 
+  /**
+   * Make sure the root cause message is easily available on the message shown to the user.
+   */
+  private BeanCreationException unwrapBeanCreationException(BeanCreationException beanCreationException) {
+    StringBuilder messageBuilder = new StringBuilder();
+
+    Throwable currentCause = beanCreationException;
+    while (currentCause != null && currentCause instanceof BeanCreationException) {
+      if (messageBuilder.length() > 0) {
+        messageBuilder.append("; nested exception is ");
+      }
+      messageBuilder.append(currentCause.getMessage());
+
+      currentCause = currentCause.getCause();
+    }
+
+    if (currentCause != null) {
+      if (messageBuilder.length() > 0) {
+        messageBuilder.append("; nested exception is ");
+      }
+      messageBuilder.append(currentCause.getMessage());
+    }
+
+    return new BeanCreationException(messageBuilder.toString(), beanCreationException);
+  }
+
   @Override
   public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
     return doWithFallbackInObjectProvider(() -> super.isSingleton(name), objectProvider -> {

diff --git a/...t/java/org/mule/runtime/config/internal/lazy/LazyComponentInitializerAdapterTestCase.java b/...t/java/org/mule/runtime/config/internal/lazy/LazyComponentInitializerAdapterTestCase.java
@@ -9,8 +9,8 @@
 import static org.mule.runtime.api.component.location.Location.builderFromStringRepresentation;
 import static org.mule.runtime.app.declaration.api.fluent.ElementDeclarer.forExtension;
 import static org.mule.runtime.app.declaration.api.fluent.ElementDeclarer.newArtifact;
-import static org.mule.runtime.core.api.extension.provider.MuleExtensionModelProvider.MULE_NAME;
 import static org.mule.runtime.config.internal.dsl.utils.DslConstants.FLOW_ELEMENT_IDENTIFIER;
+import static org.mule.runtime.core.api.extension.provider.MuleExtensionModelProvider.MULE_NAME;
 import static org.mule.test.allure.AllureConstants.ConfigurationComponentLocatorFeature.CONFIGURATION_COMPONENT_LOCATOR;
 import static org.mule.test.allure.AllureConstants.ConfigurationComponentLocatorFeature.ComponentLifeCycle.COMPONENT_LIFE_CYCLE;
 import static org.mule.test.allure.AllureConstants.LazyInitializationFeature.LAZY_INITIALIZATION;
@@ -24,6 +24,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import io.qameta.allure.Feature;
@@ -33,6 +34,7 @@
 
 @Features({@Feature(LAZY_INITIALIZATION), @Feature(CONFIGURATION_COMPONENT_LOCATOR)})
 @Story(COMPONENT_LIFE_CYCLE)
+@Ignore("W-16639192")
 public class LazyComponentInitializerAdapterTestCase extends AbstractLazyMuleArtifactContextTestCase {
 
   private final AtomicInteger initializations = new AtomicInteger(0);
@@ -87,6 +89,7 @@ public void shouldCreateBeansForSameLocationFilterRequestIfDifferentPhaseApplied
     assertThat(initializations.get(), is(2));
   }
 
+  @Override
   protected ArtifactDeclaration getArtifactDeclaration() {
     return newArtifact()
         .withGlobalElement(forExtension(MULE_NAME)

diff --git a/...ava/org/mule/runtime/config/internal/lazy/LazyMuleArtifactContextBeanFactoryTestCase.java b/...ava/org/mule/runtime/config/internal/lazy/LazyMuleArtifactContextBeanFactoryTestCase.java
@@ -9,8 +9,8 @@
 import static org.mule.runtime.api.component.location.Location.builderFromStringRepresentation;
 import static org.mule.runtime.app.declaration.api.fluent.ElementDeclarer.forExtension;
 import static org.mule.runtime.app.declaration.api.fluent.ElementDeclarer.newArtifact;
-import static org.mule.runtime.core.api.extension.provider.MuleExtensionModelProvider.MULE_NAME;
 import static org.mule.runtime.config.internal.dsl.utils.DslConstants.FLOW_ELEMENT_IDENTIFIER;
+import static org.mule.runtime.core.api.extension.provider.MuleExtensionModelProvider.MULE_NAME;
 import static org.mule.test.allure.AllureConstants.ConfigurationComponentLocatorFeature.CONFIGURATION_COMPONENT_LOCATOR;
 import static org.mule.test.allure.AllureConstants.ConfigurationComponentLocatorFeature.ComponentLifeCycle.COMPONENT_LIFE_CYCLE;
 import static org.mule.test.allure.AllureConstants.LazyInitializationFeature.LAZY_INITIALIZATION;
@@ -43,21 +43,26 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.qameta.allure.Feature;
-import io.qameta.allure.Features;
-import io.qameta.allure.Story;
-import org.hamcrest.Matcher;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.core.ResolvableType;
+
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
+import org.hamcrest.Matcher;
+
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.core.ResolvableType;
+
+import io.qameta.allure.Feature;
+import io.qameta.allure.Features;
+import io.qameta.allure.Story;
 
 /**
  * Test case for the methods of {@link org.mule.runtime.config.internal.context.lazy.LazyMuleArtifactContext} that implement
@@ -66,6 +71,7 @@
 @Features({@Feature(LAZY_INITIALIZATION), @Feature(CONFIGURATION_COMPONENT_LOCATOR)})
 @Story(COMPONENT_LIFE_CYCLE)
 @RunWith(Parameterized.class)
+@Ignore("W-16639192")
 public class LazyMuleArtifactContextBeanFactoryTestCase extends AbstractLazyMuleArtifactContextTestCase {
 
   @Parameterized.Parameters(name = "BeanFactory throws NoSuchBeanDefinition: {0}")
@@ -235,6 +241,7 @@ private void verifyInitialized(Runnable runnable) {
     verify(beanFactory).registerBeanDefinition(eq(MY_FLOW), any());
   }
 
+  @Override
   protected ArtifactDeclaration getArtifactDeclaration() {
     return newArtifact()
         .withGlobalElement(forExtension(MULE_NAME)

diff --git a/...onfig/src/test/java/org/mule/runtime/config/internal/registry/SpringRegistryTestCase.java b/...onfig/src/test/java/org/mule/runtime/config/internal/registry/SpringRegistryTestCase.java
@@ -6,6 +6,7 @@
  */
 package org.mule.runtime.config.internal.registry;
 
+import static org.mule.functional.junit4.matchers.ThrowableMessageMatcher.hasMessage;
 import static org.mule.test.allure.AllureConstants.RegistryFeature.REGISTRY;
 import static org.mule.test.allure.AllureConstants.RegistryFeature.ObjectRegistrationStory.OBJECT_REGISTRATION;
 
@@ -15,9 +16,9 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.mule.runtime.api.exception.MuleException;
@@ -28,8 +29,8 @@
 import org.mule.runtime.api.lifecycle.Stoppable;
 import org.mule.runtime.config.internal.resolvers.ConfigurationDependencyResolver;
 import org.mule.runtime.core.api.MuleContext;
-import org.mule.runtime.core.privileged.registry.RegistrationException;
 import org.mule.runtime.core.internal.lifecycle.LifecycleInterceptor;
+import org.mule.runtime.core.privileged.registry.RegistrationException;
 import org.mule.tck.junit4.AbstractMuleTestCase;
 
 import java.util.Map;
@@ -38,12 +39,16 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.context.ConfigurableApplicationContext;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import io.qameta.allure.Feature;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Story;
@@ -61,7 +66,7 @@ public class SpringRegistryTestCase extends AbstractMuleTestCase {
   @Before
   public void setUp() {
     appContext = mock(ConfigurableApplicationContext.class);
-    beanFactory = mock(DefaultListableBeanFactory.class);
+    beanFactory = new DefaultListableBeanFactory();
     when(appContext.getBeanFactory()).thenReturn(beanFactory);
     executor = Executors.newFixedThreadPool(1);
   }
@@ -78,12 +83,13 @@ public void unregisterBeanWhoseCreationFails() throws RegistrationException {
                                                  mock(MuleContext.class), mock(ConfigurationDependencyResolver.class),
                                                  mock(LifecycleInterceptor.class));
 
-    when(beanFactory.containsBeanDefinition("key")).thenReturn(true);
+    beanFactory.registerBeanDefinition("key", new GenericBeanDefinition());
     when(appContext.getBean("key")).thenThrow(BeanCreationException.class);
 
     assertThat(registry.unregisterObject("key"), is(nullValue()));
-    verify(beanFactory).removeBeanDefinition("key");
-    verify(beanFactory).destroySingleton("key");
+    assertThat(assertThrows(NoSuchBeanDefinitionException.class, () -> beanFactory.getBeanDefinition("key")),
+               hasMessage("No bean named 'key' available"));
+    assertThat(beanFactory.getSingleton("key"), nullValue());
   }
 
   @Test
@@ -139,8 +145,9 @@ private SpringRegistry buildLifeCycleTesteableSpringRegistry(LifecycleIntercepto
     singletonBeansToRegister.forEach((key, value) -> {
       when(appContext.getBean(key)).thenReturn(value);
       when(appContext.isSingleton(key)).thenReturn(true);
+
       // No dependencies for any of the registered beans.
-      when(beanFactory.getDependenciesForBean(key)).thenReturn(new String[0]);
+      beanFactory.registerBeanDefinition(key, new GenericBeanDefinition());
     });
     return new SpringRegistry(appContext, appContext,
                               null, mock(ConfigurationDependencyResolver.class),

diff --git a/modules/spring-config/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/modules/spring-config/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker