TESB-26696:Route - Beans package not visible to test cases (#2816 )

fix(TESB-26415): beansType is null with pure DI licence (#2725 )
fix(TESB-26415): beansType is null with pure DI licence Conflicts: main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java
2020-10-28 08:11:55 +08:00 · 2020-10-28 08:09:50 +08:00
1 changed files with 4 additions and 23 deletions
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java
@@ -25,6 +25,7 @@ import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IESBService;
 import org.talend.core.ITDQItemService;
 import org.talend.core.PluginChecker;
 import org.talend.core.hadoop.IHadoopClusterService;
@@ -33,7 +34,6 @@ import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.ProcessItem;
-import org.talend.core.model.properties.ProjectReference;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.properties.SQLPatternItem;
 import org.talend.core.model.relationship.Relation;
@@ -898,33 +898,14 @@ public final class ProcessUtils {
                    ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(property.getItem());
                    // route job
                    if (itemType != null && (itemType.equals(ERepositoryObjectType.PROCESS_ROUTE)
-                            || itemType.equals(ERepositoryObjectType.PROCESS_ROUTELET))) {
+                            || itemType.equals(ERepositoryObjectType.PROCESS_ROUTELET)
+                            || "CAMEL".equals(process.getComponentsType()))) {
                        needBeans = true;
                    }
                }
            }
        }
-
-        if (needBeans && GlobalServiceRegister.getDefault().isServiceRegistered(IProxyRepositoryService.class)) {
-            IProxyRepositoryService service = (IProxyRepositoryService) GlobalServiceRegister.getDefault()
-                    .getService(IProxyRepositoryService.class);
-            ERepositoryObjectType beansType = ERepositoryObjectType.valueOf("BEANS"); //$NON-NLS-1$
-            try {
-                IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
-                List<IRepositoryViewObject> all = factory.getAll(project, beansType);
-                List<ProjectReference> references = ProjectManager.getInstance().getCurrentProject()
-                        .getProjectReferenceList(true);
-                for (ProjectReference ref : references) {
-                    all.addAll(factory.getAll(new Project(ref.getReferencedProject()), beansType));
-                }
-                if (!all.isEmpty()) { // has bean
-                    return true;
-                }
-            } catch (PersistenceException e) {
-                ExceptionHandler.process(e);
-            }
-        }
-        return false;
+        return needBeans && GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class);
    }

    public static boolean isRequiredPigUDFs(IProcess process) {
Author	SHA1	Message	Date
SunChaoqun	66e411b6f7	TESB-26696:Route - Beans package not visible to test cases (#2816 )	2020-10-28 08:11:55 +08:00
Mike Yan	4ee3203de1	fix(TESB-26415): beansType is null with pure DI licence (#2725 ) fix(TESB-26415): beansType is null with pure DI licence Conflicts: main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java	2020-10-28 08:09:50 +08:00