SED-4770 handle more keyword types

step-ap-ide/src/main/resources/step.properties

@@ -36,21 +36,21 @@ plugins.EncryptionManagerDependencyPlugin.enabled=false
 plugins.EntityLockingPlugin.enabled=false
 plugins.ExportManagerPlugin.enabled=false
 plugins.FunctionPackagePlugin.enabled=false
-plugins.GeneralScriptFunctionControllerPlugin.enabled=false
+plugins.GeneralScriptFunctionControllerPlugin.enabled=true
 plugins.InteractivePlugin.enabled=false
-plugins.JMeterPlugin.enabled=false
+plugins.JMeterPlugin.enabled=true
 plugins.LiveReportingControllerPlugin.enabled=false
 plugins.MeasurementControllerPlugin.enabled=false
 plugins.MigrationManagerTasksPlugin.enabled=false
 plugins.MigrationTasksRegistrationPlugin.enabled=false
-plugins.NodePlugin.enabled=false
+plugins.NodePlugin.enabled=true
 plugins.QuotaManagerControllerPlugin.enabled=false
 plugins.RawMeasurementsControllerPlugin.enabled=false
 plugins.ReferenceFinderPlugin.enabled=false
 plugins.RemoteCollectionPlugin.enabled=false
 plugins.ResourceManagerControllerPlugin.enabled=false
 plugins.ReportLayoutPlugin.enabled=false
-plugins.ScriptEditorPlugin.enabled=false
+plugins.ScriptEditorPlugin.enabled=true
 plugins.StagingRepositoryPlugin.enabled=false
 plugins.StreamingResourcesControllerPlugin.enabled=false
 plugins.ThreadManagerControllerPlugin.enabled=false

step-automation-packages/step-automation-packages-collections/src/main/java/step/core/collections/AutomationPackagePlanCollection.java → step-automation-packages/step-automation-packages-collections/src/main/java/step/core/collections/AutomationPackageCollection.java

@@ -19,41 +19,41 @@
 package step.core.collections;
 
 import step.automation.packages.yaml.AutomationPackageYamlFragmentManager;
+import step.core.accessors.AbstractOrganizableObject;
 import step.core.collections.inmemory.InMemoryCollection;
-import step.core.plans.Plan;
-import step.plans.parser.yaml.YamlPlan;
 
-public class AutomationPackagePlanCollection extends InMemoryCollection<Plan> implements Collection<Plan> {
+public class AutomationPackageCollection<BO extends AbstractOrganizableObject, T> extends InMemoryCollection<BO> implements Collection<BO> {
 
 
     private final AutomationPackageYamlFragmentManager fragmentManager;
 
-    public AutomationPackagePlanCollection(AutomationPackageYamlFragmentManager fragmentManager) {
-        super(false, YamlPlan.PLANS_ENTITY_NAME);
+    public AutomationPackageCollection(AutomationPackageYamlFragmentManager fragmentManager, Class<T> boClass) {
+        super(false);
         this.fragmentManager = fragmentManager;
-        initialzeRecordsFromFragments(fragmentManager);
+        initializeRecordsFromFragments(boClass, fragmentManager);
     }
 
-    private void initialzeRecordsFromFragments(AutomationPackageYamlFragmentManager fragmentManager) {
+    private void initializeRecordsFromFragments(Class<T> boClass, AutomationPackageYamlFragmentManager fragmentManager) {
         // initialization into the collection memory. Calls super save to avoid calling fragmentManager.savePlan
-        fragmentManager.getBusinessObjects(Plan.class).forEach(super::save);
+        Iterable<BO> list = fragmentManager.getBusinessObjects(boClass);
+        list.forEach(super::save);
     }
 
     @Override
-    public Plan save(Plan p) {
-        return fragmentManager.savePlan(super.save(p));
+    public BO save(BO p) {
+        return fragmentManager.save(super.save(p));
     }
 
     @Override
-    public void save(Iterable<Plan> iterable) {
-        for (Plan p : iterable) {
-            save(p);
+    public void save(Iterable<BO> iterable) {
+        for (BO object : iterable) {
+            save(object);
         }
     }
 
     @Override
     public void remove(Filter filter) {
-        find(filter, null, null, null, 0).forEach(fragmentManager::removePlan);
+        find(filter, null, null, null, 0).forEach(fragmentManager::remove);
         super.remove(filter);
     }
 }

step-automation-packages/step-automation-packages-collections/src/main/java/step/core/collections/AutomationPackageCollectionFactory.java

@@ -18,14 +18,20 @@
  ******************************************************************************/
 package step.core.collections;
 
+import step.automation.packages.mappers.interfaces.BusinessObjectToYamlMapper;
+import step.automation.packages.model.YamlAutomationPackageKeyword;
 import step.automation.packages.yaml.AutomationPackageYamlFragmentManager;
+import step.core.accessors.AbstractOrganizableObject;
 import step.core.collections.inmemory.InMemoryCollectionFactory;
 import step.core.plans.Plan;
 import step.functions.Function;
 import step.parameter.Parameter;
+import step.parameter.automation.AutomationPackageParameter;
+import step.plans.parser.yaml.YamlPlan;
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -44,14 +50,12 @@ public AutomationPackageCollectionFactory(Properties properties, AutomationPacka
     @SuppressWarnings("unchecked")
     public <T> Collection<T> getCollection(String name, Class<T> entityClass) {
         return (Collection<T>) collectionsByName.computeIfAbsent(name, (_name) -> {
-            if (Plan.class.isAssignableFrom(entityClass)) {
-                return new AutomationPackagePlanCollection(fragmentManager);
-            } else if (Parameter.class.isAssignableFrom(entityClass)) {
-                return new AutomationPackageParameterCollection(fragmentManager);
-            } else if (Function.class.isAssignableFrom(entityClass)) {
-                return new AutomationPackageFunctionCollection(fragmentManager);
+
+            if (!AbstractOrganizableObject.class.isAssignableFrom(entityClass)) {
+                return baseFactory.getCollection(name, entityClass);
             }
-            return baseFactory.getCollection(name, entityClass);
+
+            return new AutomationPackageCollection<>(fragmentManager, entityClass);
         });
     }
 

step-automation-packages/step-automation-packages-collections/src/test/java/step/core/collections/AutomationPackageFragmentReferenceTest.java

@@ -192,7 +192,6 @@ public void testAddPlanToNewFragmentAndRenameAndRemove() throws IOException {
 
     @Test
     public void testAddTwoPlansToNewFragmentAndRemoveOne() throws IOException {
-
         Sequence sequence = new Sequence();
         Echo echo = new Echo();
         echo.setText(new DynamicValue<>("Hello World"));

step-automation-packages/step-automation-packages-manager/src/main/java/step/automation/packages/AutomationPackageManager.java

@@ -893,7 +893,7 @@ protected void fillStaging(AutomationPackage newPackage, AutomationPackageStagin
             try {
                 boolean hooked = automationPackageHookRegistry.onPrepareStaging(
                     hookEntry.fieldName,
-                    new StagingAutomationPackageContext(newPackage, operationMode, staging.getResourceManager(), automationPackageArchive, packageContent, actorUser, enricherForIncludedEntities, extensions),
+                    new StagingAutomationPackageContext(new AutomationPackageResourceUploader(), newPackage, operationMode, staging.getResourceManager(), automationPackageArchive, packageContent, actorUser, enricherForIncludedEntities, extensions),
                     packageContent,
                     hookEntry.values,
                     oldPackage, staging, objectPredicate);
@@ -993,7 +993,7 @@ private static void propagatePackageMetadataToPlans(AutomationPackage newPackage
 
     protected List<Function> prepareFunctionsStaging(AutomationPackage newPackage, AutomationPackageArchive automationPackageArchive, AutomationPackageContent packageContent, ObjectEnricher enricher,
                                                      AutomationPackage oldPackage, ResourceManager stagingResourceManager, String actorUser) {
-        StagingAutomationPackageContext apContext = new StagingAutomationPackageContext(newPackage, operationMode, stagingResourceManager, automationPackageArchive, packageContent, actorUser, enricher, extensions);
+        StagingAutomationPackageContext apContext = new StagingAutomationPackageContext(new AutomationPackageResourceUploader(), newPackage, operationMode, stagingResourceManager, automationPackageArchive, packageContent, actorUser, enricher, extensions);
         List<Function> completeFunctions = packageContent.getKeywords().stream().map(keyword -> keyword.prepareKeyword(apContext)).collect(Collectors.toList());
 
         // get old functions with same name and reuse their ids

step-automation-packages/step-automation-packages-manager/src/main/java/step/automation/packages/AutomationPackagePlansAttributesApplier.java

@@ -67,7 +67,7 @@ public void applySpecialAttributesToPlans(AutomationPackage newPackage,
 
     protected StagingAutomationPackageContext prepareContext(AutomationPackage automationPackage, AutomationPackageOperationMode operationMode, AutomationPackageArchive automationPackageArchive, AutomationPackageContent packageContent,
                                                              String actorUser, ObjectEnricher enricher, Map<String, Object> extensions) {
-        return new StagingAutomationPackageContext(automationPackage, operationMode, resourceManager, automationPackageArchive, packageContent, actorUser, enricher, extensions);
+        return new StagingAutomationPackageContext(new AutomationPackageResourceUploader(), automationPackage, operationMode, resourceManager, automationPackageArchive, packageContent, actorUser, enricher, extensions);
     }
 
     private void applySpecialValuesForArtifact(AbstractArtefact artifact, StagingAutomationPackageContext apContext) {

step-automation-packages/step-automation-packages-manager/src/main/java/step/automation/packages/AutomationPackageReader.java

@@ -192,7 +192,9 @@ public AutomationPackageYamlFragmentManager getAutomationPackageYamlFragmentMana
                 AutomationPackageContent content = newContentInstance();
                 Set<AutomationPackageFragmentYaml> fragments = new HashSet<>();
                 fillAutomationPackageWithImportedFragments(content, descriptor, archive, fragments);
-                StagingAutomationPackageContext stagingContext = new StagingAutomationPackageContext(null, AutomationPackageOperationMode.LOCAL, new LocalResourceManagerImpl(descriptorPath.getParent().toFile()), archive, content, null, null, new HashMap<>());
+                AutomationPackage automationPackage = new AutomationPackage();
+                automationPackage.setStatus(AutomationPackageStatus.EDIT);
+                StagingAutomationPackageContext stagingContext = new StagingAutomationPackageContext(new AutomationPackageLocalResourceMapper(descriptorPath.getParent()), automationPackage, AutomationPackageOperationMode.LOCAL, null, archive, content, null, null, new HashMap<>());
                 return new AutomationPackageYamlFragmentManager(archive.getResourcePathMatchingResolver(), descriptor, fragments, getOrCreateDescriptorReader(), stagingContext);
             } catch (FileSystemNotFoundException | URISyntaxException e) {
                 throw new AutomationPackageReadingException("Failed to read automation package for editing. The most likely cause is that you were trying to load " +

step-automation-packages/step-automation-packages-yaml/src/main/java/step/automation/packages/yaml/AutomationPackageDescriptorReader.java

@@ -50,15 +50,15 @@
 
 public class AutomationPackageDescriptorReader {
 
-    protected static final Logger log = LoggerFactory.getLogger(AutomationPackageDescriptorReader.class);
+    private static final Logger log = LoggerFactory.getLogger(AutomationPackageDescriptorReader.class);
 
-    protected final ObjectMapper yamlObjectMapper;
+    private final ObjectMapper yamlObjectMapper;
 
-    protected final YamlPlanReader planReader;
+    private final YamlPlanReader planReader;
 
     private final AutomationPackageSerializationRegistry serializationRegistry;
 
-    protected String jsonSchema;
+    private String jsonSchema;
 
     public AutomationPackageDescriptorReader(String jsonSchemaPath, AutomationPackageSerializationRegistry serializationRegistry) {
         this.serializationRegistry = serializationRegistry;