Merge branch 'master' into ouf/QTDI-2893_pattern_instanceof

Author: undx

component-api/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.talend.sdk.component</groupId>
     <artifactId>component-runtime</artifactId>
-    <version>1.92.0-SNAPSHOT</version>
+    <version>1.93.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>component-api</artifactId>

…micDependenciesServiceConfiguration.java …pe/DynamicDependenciesConfiguration.javacomponent-api/src/main/java/org/talend/sdk/component/api/configuration/type/DynamicDependenciesServiceConfiguration.java renamed to component-api/src/main/java/org/talend/sdk/component/api/configuration/type/DynamicDependenciesConfiguration.java component-api/src/main/java/org/talend/sdk/component/api/configuration/type/DynamicDependenciesServiceConfiguration.java renamed to component-api/src/main/java/org/talend/sdk/component/api/configuration/type/DynamicDependenciesConfiguration.java

@@ -26,9 +26,9 @@
 
 @Target(TYPE)
 @Retention(RUNTIME)
-@ConfigurationType("dynamicDependenciesServiceConfiguration")
-@Documentation("Mark a model (complex object) as being the configuration used in services annotated with @DynamicDependencies.")
-public @interface DynamicDependenciesServiceConfiguration {
+@ConfigurationType("dynamicDependenciesConfiguration")
+@Documentation("Mark a model (complex object) as being the configuration expected to compute dynamic dependencies.")
+public @interface DynamicDependenciesConfiguration {
 
     String value() default "default";
 }

component-api/src/main/java/org/talend/sdk/component/api/service/dependency/ClassLoaderDefinition.java

@@ -0,0 +1,66 @@
+/**
+ * Copyright (C) 2006-2026 Talend Inc. - www.talend.com
+ *
+ * Licensed 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.talend.sdk.component.api.service.dependency;
+
+import java.util.function.Predicate;
+
+public interface ClassLoaderDefinition {
+
+    /**
+     *
+     * @return the parent classloader to use for the classloader to create.
+     */
+    ClassLoader getParent();
+
+    /**
+     *
+     * @return a filter to apply on the classes to load from the classloader to create. If the filter returns false for
+     * a class, the classloader to create will try to load it from its parent.
+     */
+    Predicate<String> getClassesFilter();
+
+    /**
+     *
+     * @return a filter to apply on the classes to load from the parent classloader. If the filter returns false for a
+     * class, the classloader to create will try to load it by itself instead of delegating to its parent.
+     */
+    Predicate<String> getParentClassesFilter();
+
+    /**
+     *
+     * @return a filter to apply on the resources to load from the parent classloader. The {@link String} argument of
+     * the predicate is the path of the resource as obtained from {@code URL#getFile()} (i.e. the full URL/file path),
+     * not the logical resource name used in {@link ClassLoader#getResource(String)}. If the filter returns
+     * {@code false} for a resource, the classloader to create will try to load it by itself instead of delegating to
+     * its parent.
+     */
+    Predicate<String> getParentResourcesFilter();
+
+    /**
+     *
+     * @return true if the classloader to create should support resource dependencies (i.e. the dependencies.txt can
+     * also list resources to load and not only classes). Note that if this is true, the classloader to create will try
+     * to load resources by itself instead of delegating to its parent.
+     *
+     */
+    boolean isSupportsResourceDependencies();
+
+    /**
+     *
+     * @return the resource path to the plugins mapping file ("TALEND-INF/plugins.properties").
+     */
+    String getNestedPluginMappingResource();
+}

component-api/src/main/java/org/talend/sdk/component/api/service/dependency/Resolver.java

@@ -46,6 +46,37 @@ default ClassLoaderDescriptor mapDescriptorToClassLoader(final List<String> gavs
                 new ByteArrayInputStream(String.join("\n", gavs).getBytes(StandardCharsets.UTF_8)));
     }
 
+    /**
+     * Creates a classloader from the passed classloader configuration and descriptor (dependencies.txt).
+     *
+     * WARNING: note it is very important to close the descriptor once no more used otherwise
+     * you can leak memory.
+     *
+     * <p>
+     * The default implementation of this method is unsupported and will always throw
+     * {@link UnsupportedOperationException}. Implementations that support configurable
+     * classloader creation must override this method.
+     * </p>
+     *
+     * @param descriptor the dependencies.txt InputStream.
+     * @param configuration the classloader configuration to apply when creating the classloader.
+     * @return the classloader initialized with the configuration provided and the resolved dependencies.
+     * @throws UnsupportedOperationException if this implementation does not support configurable
+     * classloader creation.
+     */
+    default ClassLoaderDescriptor mapDescriptorToClassLoader(InputStream descriptor,
+            final ClassLoaderDefinition configuration) {
+        throw new UnsupportedOperationException(
+                "ClassLoader configuration is not supported by this implementation; "
+                        + "override mapDescriptorToClassLoader(InputStream, ClassLoaderDefinition) to provide an implementation");
+    }
+
+    default ClassLoaderDescriptor mapDescriptorToClassLoader(final List<String> gavs,
+            final ClassLoaderDefinition configuration) {
+        return mapDescriptorToClassLoader(
+                new ByteArrayInputStream(String.join("\n", gavs).getBytes(StandardCharsets.UTF_8)), configuration);
+    }
+
     /**
      * Resolves the dependencies from the descriptor passed as an InputStream.
      *

component-form/component-form-core/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.talend.sdk.component</groupId>
     <artifactId>component-form</artifactId>
-    <version>1.92.0-SNAPSHOT</version>
+    <version>1.93.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>component-form-core</artifactId>

component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/JavascriptRegex.java

@@ -15,9 +15,12 @@
  */
 package org.talend.sdk.component.form.internal.validation;
 
+import java.util.ServiceLoader;
 import java.util.function.Predicate;
 
 import org.mozilla.javascript.Context;
+import org.mozilla.javascript.RegExpLoader;
+import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
 
 public class JavascriptRegex implements Predicate<CharSequence> {
@@ -47,6 +50,15 @@ public boolean test(final CharSequence text) {
         final String script = "new RegExp(regex, indicators).test(text)";
         final Context context = Context.enter();
         try {
+            // Rhino 1.9.0+: RegExp is registered via ServiceLoader<RegExpLoader>.
+            // The ServiceLoader uses Thread.currentThread().getContextClassLoader() by default,
+            // which may not find the service in an isolated classloader context.
+            // Explicitly register RegExpProxy using Rhino's own classloader as fallback.
+            if (ScriptRuntime.getRegExpProxy(context) == null) {
+                ServiceLoader.load(RegExpLoader.class, context.getClass().getClassLoader())
+                        .findFirst()
+                        .ifPresent(loader -> ScriptRuntime.setRegExpProxy(context, loader.newProxy()));
+            }
             final Scriptable scope = context.initStandardObjects();
             scope.put("text", scope, text);
             scope.put("regex", scope, regex);

component-form/component-form-model/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.talend.sdk.component</groupId>
     <artifactId>component-form</artifactId>
-    <version>1.92.0-SNAPSHOT</version>
+    <version>1.93.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>component-form-model</artifactId>

component-form/component-uispec-mapper/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.talend.sdk.component</groupId>
     <artifactId>component-form</artifactId>
-    <version>1.92.0-SNAPSHOT</version>
+    <version>1.93.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>component-uispec-mapper</artifactId>

component-form/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.talend.sdk.component</groupId>
     <artifactId>component-runtime</artifactId>
-    <version>1.92.0-SNAPSHOT</version>
+    <version>1.93.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>component-form</artifactId>

component-runtime-beam/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.talend.sdk.component</groupId>
     <artifactId>component-runtime</artifactId>
-    <version>1.92.0-SNAPSHOT</version>
+    <version>1.93.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>component-runtime-beam</artifactId>