...

mulesoft · Nov 21, 2024 · 418a888 · 418a888
1 parent 8ca2f9c
commit 418a888
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.../java/org/mule/runtime/module/service/api/artifact/ServiceClassLoaderFactoryProvider.java b/.../java/org/mule/runtime/module/service/api/artifact/ServiceClassLoaderFactoryProvider.java
@@ -26,8 +26,8 @@ public static ClassLoaderConfigurationLoader serviceClassLoaderConfigurationLoad
   }
 
   public static ServiceClassLoaderFactory serviceClassLoaderFactory() {
-    LOGGER.debug("MRJAR 'ServiceClassLoaderFactoryProvider' implementation, using 'ServiceClassLoaderFactoryImpl'...");
-    final ServiceClassLoaderFactory serviceModuleLayerFactory = new ServiceClassLoaderFactoryImpl();
+    LOGGER.debug("MRJAR 'ServiceClassLoaderFactoryProvider' implementation, using 'ServiceModuleLayerFactory'...");
+    final ServiceClassLoaderFactory serviceModuleLayerFactory = new ServiceModuleLayerFactory();
     serviceModuleLayerFactory.setParentLayerFrom(ServiceClassLoaderFactoryProvider.class);
     return serviceModuleLayerFactory;
   }

diff --git a/...tifact/ServiceClassLoaderFactoryImpl.java → ...i/artifact/ServiceModuleLayerFactory.java b/...tifact/ServiceClassLoaderFactoryImpl.java → ...i/artifact/ServiceModuleLayerFactory.java
@@ -38,11 +38,11 @@
 /**
  * Creates {@link ArtifactClassLoader} for service descriptors.
  */
-public class ServiceClassLoaderFactoryImpl
+public class ServiceModuleLayerFactory
     implements
     ServiceClassLoaderFactory {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ServiceClassLoaderFactoryImpl.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(ServiceModuleLayerFactory.class);
   private static final String CONTAINER_LAYER_NAME = "Mule Container Module Layer";
 
   // prefixes of services provided by the Mule Runtime team
@@ -58,7 +58,7 @@ private MuleServiceClassLoader(String artifactId, ArtifactDescriptor artifactDes
     }
   }
 
-  private Optional<ModuleLayer> parentLayer = ofNullable(ServiceClassLoaderFactoryImpl.class.getModule().getLayer());
+  private Optional<ModuleLayer> parentLayer = ofNullable(ServiceModuleLayerFactory.class.getModule().getLayer());
 
   /**
    * {@inheritDoc}

diff --git a/.../module/service/internal/test/discoverer/FileSystemServiceProviderDiscovererTestCase.java b/.../module/service/internal/test/discoverer/FileSystemServiceProviderDiscovererTestCase.java
@@ -36,7 +36,7 @@
 import org.mule.runtime.module.artifact.api.descriptor.ClassLoaderConfigurationLoader;
 import org.mule.runtime.module.artifact.api.descriptor.DescriptorLoaderRepository;
 import org.mule.runtime.module.service.api.artifact.ServiceClassLoaderFactory;
-import org.mule.runtime.module.service.api.artifact.ServiceClassLoaderFactoryImpl;
+import org.mule.runtime.module.service.api.artifact.ServiceModuleLayerFactory;
 import org.mule.runtime.module.service.api.artifact.ServiceDescriptor;
 import org.mule.runtime.module.service.api.discoverer.ServiceAssembly;
 import org.mule.runtime.module.service.builder.ServiceFileBuilder;
@@ -66,7 +66,7 @@ public class FileSystemServiceProviderDiscovererTestCase extends AbstractMuleTes
   @Rule
   public SystemPropertyTemporaryFolder temporaryFolder = new SystemPropertyTemporaryFolder(MULE_HOME_DIRECTORY_PROPERTY);
 
-  private final ServiceClassLoaderFactory serviceClassLoaderFactory = mock(ServiceClassLoaderFactoryImpl.class);
+  private final ServiceClassLoaderFactory serviceClassLoaderFactory = mock(ServiceModuleLayerFactory.class);
   private final ArtifactClassLoader containerClassLoader = mock(ArtifactClassLoader.class);
   private final DescriptorLoaderRepository descriptorLoaderRepository = mock(DescriptorLoaderRepository.class);
   private final ArtifactDescriptorValidator artifactDescriptorValidator = mock(ArtifactDescriptorValidator.class);

diff --git a/tests/runner/src/main/java/org/mule/test/runner/classloader/IsolatedClassLoaderFactory.java b/tests/runner/src/main/java/org/mule/test/runner/classloader/IsolatedClassLoaderFactory.java
@@ -56,7 +56,7 @@
 import org.mule.runtime.module.artifact.internal.util.FileJarExplorer;
 import org.mule.runtime.module.artifact.internal.util.JarExplorer;
 import org.mule.runtime.module.artifact.internal.util.JarInfo;
-import org.mule.runtime.module.service.api.artifact.ServiceClassLoaderFactoryImpl;
+import org.mule.runtime.module.service.api.artifact.ServiceModuleLayerFactory;
 import org.mule.runtime.module.service.api.artifact.ServiceDescriptor;
 import org.mule.test.runner.api.ArtifactClassLoaderHolder;
 import org.mule.test.runner.api.ArtifactsUrlClassification;
@@ -148,7 +148,7 @@ public ArtifactClassLoaderHolder createArtifactClassLoader(List<String> extraBoo
 
       ContainerDependantArtifactClassLoaderFactory<ServiceDescriptor> serviceClassLoaderFactory = serviceClassLoaderFactory();
       serviceClassLoaderFactory.setParentLayerFrom(containerClassLoaderWrapper.getContainerClassLoader().getClassLoader()
-          .loadClass(ServiceClassLoaderFactoryImpl.class.getName()));
+          .loadClass(ServiceModuleLayerFactory.class.getName()));
       List<ArtifactClassLoader> serviceArtifactClassLoaders =
           createServiceClassLoaders(serviceClassLoaderFactory, containerClassLoaderWrapper, artifactsUrlClassification);