diff options
30 files changed, 1764 insertions, 323 deletions
@@ -29,7 +29,7 @@ committers: id: 'jhh' timezone: 'America/Illinois' - name: 'Liam Fallon' - email: 'liam.fallon@ericsson.com' + email: 'liam.fallon@est.tech' company: 'Ericsson' id: 'liamfallon' timezone: 'Europe/Ireland' diff --git a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditor.java b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditor.java index acfc087ac..0636bbef6 100644 --- a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditor.java +++ b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditor.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -278,19 +279,17 @@ public class CodeGeneratorCliEditor { * @param parameters any task parameter * @param contextRefs any context reference */ - public void addTaskDeclaration(final String name, final String version, final String uuid, final String description, - final List<ST> infields, final List<ST> outfields, final ST logic, final List<ST> parameters, - final List<ST> contextRefs) { + public void addTaskDeclaration(TaskDeclarationBuilder taskDeclarationBuilder) { final ST st = stg.getInstanceOf("taskDecl"); - st.add(NAME, name); - st.add(VERSION, version); - st.add(UUID, uuid); - st.add(DESCRIPTION, description); - st.add(INFIELDS, infields); - st.add(OUTFIELDS, outfields); - st.add(LOGIC, logic); - st.add(PARAMS, parameters); - st.add(CONTEXT_REFS, contextRefs); + st.add(NAME, taskDeclarationBuilder.getName()); + st.add(VERSION, taskDeclarationBuilder.getVersion()); + st.add(UUID, taskDeclarationBuilder.getUuid()); + st.add(DESCRIPTION, taskDeclarationBuilder.getDescription()); + st.add(INFIELDS, taskDeclarationBuilder.getInfields()); + st.add(OUTFIELDS, taskDeclarationBuilder.getOutfields()); + st.add(LOGIC, taskDeclarationBuilder.getLogic()); + st.add(PARAMS, taskDeclarationBuilder.getParameters()); + st.add(CONTEXT_REFS, taskDeclarationBuilder.getContextRefs()); model.add(DECLARATION, st); } diff --git a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/TaskDeclarationBuilder.java b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/TaskDeclarationBuilder.java new file mode 100644 index 000000000..566fa03d8 --- /dev/null +++ b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/TaskDeclarationBuilder.java @@ -0,0 +1,118 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Samsung Electronics Co., Ltd. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.auth.clicodegen; + +import java.util.List; +import org.stringtemplate.v4.ST; + +public class TaskDeclarationBuilder { + + private String name; + private String version; + private String uuid; + private String description; + private List<ST> infields; + private List<ST> outfields; + private ST logic; + private List<ST> parameters; + private List<ST> contextRefs; + + public String getName() { + return name; + } + + public String getVersion() { + return version; + } + + public String getUuid() { + return uuid; + } + + public String getDescription() { + return description; + } + + public List<ST> getInfields() { + return infields; + } + + public List<ST> getOutfields() { + return outfields; + } + + public ST getLogic() { + return logic; + } + + public List<ST> getParameters() { + return parameters; + } + + public List<ST> getContextRefs() { + return contextRefs; + } + + public TaskDeclarationBuilder setName(String name) { + this.name = name; + return this; + } + + public TaskDeclarationBuilder setVersion(String version) { + this.version = version; + return this; + } + + public TaskDeclarationBuilder setUuid(String uuid) { + this.uuid = uuid; + return this; + } + + public TaskDeclarationBuilder setDescription(String description) { + this.description = description; + return this; + } + + public TaskDeclarationBuilder setInfields(List<ST> infields) { + this.infields = infields; + return this; + } + + public TaskDeclarationBuilder setOutfields(List<ST> outfields) { + this.outfields = outfields; + return this; + } + + public TaskDeclarationBuilder setLogic(ST logic) { + this.logic = logic; + return this; + } + + public TaskDeclarationBuilder setParameters(List<ST> parameters) { + this.parameters = parameters; + return this; + } + + public TaskDeclarationBuilder setContextRefs(List<ST> contextRefs) { + this.contextRefs = contextRefs; + return this; + } +} diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java index e1bf3b298..615f2e903 100644 --- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java +++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -120,8 +121,11 @@ public class CodeGeneratorCliEditorTest { final List<ST> parameters = getParametersForTask(codeGen, t); final List<ST> contextRefs = getCtxtRefsForTask(codeGen, t); - codeGen.addTaskDeclaration(kig.getName(key), kig.getVersion(key), kig.getUuid(key), kig.getDesc(key), - infields, outfields, logic, parameters, contextRefs); + codeGen.addTaskDeclaration( + new TaskDeclarationBuilder().setName(kig.getName(key)).setVersion(kig.getVersion(key)) + .setUuid(kig.getUuid(key)).setDescription(kig.getDesc(key)).setInfields(infields) + .setOutfields(outfields).setLogic(logic).setParameters(parameters) + .setContextRefs(contextRefs)); } // 3: events diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java index fae1d5951..12b415ad9 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java @@ -5,15 +5,15 @@ * 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. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -931,36 +931,36 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateFinalizerLogic(name, version, stateName, finalizerLogicName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateTaskRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String, java.lang.String) - */ - @Override - // CHECKSTYLE:OFF: checkstyle:parameterNumber - public ApexApiResult createPolicyStateTaskRef( - final String name, - final String version, - final String stateName, - final String taskLocalName, - final String taskName, - final String taskVersion, - final String outputType, - final String outputName) { - return policyFacade.createPolicyStateTaskRef( - new CreatePolicyStateTaskRefBuilder() - .setName(name) - .setVersion(version) - .setStateName(stateName) - .setTaskLocalName(taskLocalName) - .setTaskName(taskName) - .setTaskVersion(taskVersion) - .setOutputType(outputType) - .setOutputName(outputName)); - } + /* + * (non-Javadoc) + * + * @see + * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateTaskRef(java.lang.String, + * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, + * java.lang.String, java.lang.String) + */ + @Override + // CHECKSTYLE:OFF: checkstyle:parameterNumber + public ApexApiResult createPolicyStateTaskRef( + final String name, + final String version, + final String stateName, + final String taskLocalName, + final String taskName, + final String taskVersion, + final String outputType, + final String outputName) { + return policyFacade.createPolicyStateTaskRef( + new CreatePolicyStateTaskRefBuilder() + .setName(name) + .setVersion(version) + .setStateName(stateName) + .setTaskLocalName(taskLocalName) + .setTaskName(taskName) + .setTaskVersion(taskVersion) + .setOutputType(outputType) + .setOutputName(outputName)); + } // CHECKSTYLE:ON: checkstyle:parameterNumber /* diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRefBuilder.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRefBuilder.java index d313c9d24..f56c24f38 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRefBuilder.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRefBuilder.java @@ -21,84 +21,84 @@ package org.onap.policy.apex.model.modelapi.impl; public class CreatePolicyStateTaskRefBuilder { - private String name; - private String version; - private String stateName; - private String taskLocalName; - private String taskName; - private String taskVersion; - private String outputType; - private String outputName; - - public String getName() { - return name; - } - - public String getVersion() { - return version; - } - - public String getStateName() { - return stateName; - } - - public String getTaskLocalName() { - return taskLocalName; - } - - public String getTaskName() { - return taskName; - } - - public String getTaskVersion() { - return taskVersion; - } - - public String getOutputType() { - return outputType; - } - - public String getOutputName() { - return outputName; - } - - public CreatePolicyStateTaskRefBuilder setName(String name) { - this.name = name; - return this; - } - - public CreatePolicyStateTaskRefBuilder setVersion(String version) { - this.version = version; - return this; - } - - public CreatePolicyStateTaskRefBuilder setStateName(String stateName) { - this.stateName = stateName; - return this; - } - - public CreatePolicyStateTaskRefBuilder setTaskLocalName(String taskLocalName) { - this.taskLocalName = taskLocalName; - return this; - } - - public CreatePolicyStateTaskRefBuilder setTaskName(String taskName) { - this.taskName = taskName; - return this; - } - - public CreatePolicyStateTaskRefBuilder setTaskVersion(String taskVersion) { - this.taskVersion = taskVersion; - return this; - } - - public CreatePolicyStateTaskRefBuilder setOutputType(String outputType) { - this.outputType = outputType; - return this; - } - - public CreatePolicyStateTaskRefBuilder setOutputName(String outputName) { - this.outputName = outputName; - return this; - } + private String name; + private String version; + private String stateName; + private String taskLocalName; + private String taskName; + private String taskVersion; + private String outputType; + private String outputName; + + public String getName() { + return name; + } + + public String getVersion() { + return version; + } + + public String getStateName() { + return stateName; + } + + public String getTaskLocalName() { + return taskLocalName; + } + + public String getTaskName() { + return taskName; + } + + public String getTaskVersion() { + return taskVersion; + } + + public String getOutputType() { + return outputType; + } + + public String getOutputName() { + return outputName; + } + + public CreatePolicyStateTaskRefBuilder setName(String name) { + this.name = name; + return this; + } + + public CreatePolicyStateTaskRefBuilder setVersion(String version) { + this.version = version; + return this; + } + + public CreatePolicyStateTaskRefBuilder setStateName(String stateName) { + this.stateName = stateName; + return this; + } + + public CreatePolicyStateTaskRefBuilder setTaskLocalName(String taskLocalName) { + this.taskLocalName = taskLocalName; + return this; + } + + public CreatePolicyStateTaskRefBuilder setTaskName(String taskName) { + this.taskName = taskName; + return this; + } + + public CreatePolicyStateTaskRefBuilder setTaskVersion(String taskVersion) { + this.taskVersion = taskVersion; + return this; + } + + public CreatePolicyStateTaskRefBuilder setOutputType(String outputType) { + this.outputType = outputType; + return this; + } + + public CreatePolicyStateTaskRefBuilder setOutputName(String outputName) { + this.outputName = outputName; + return this; + } } diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java index d43ef3bd0..8ab4d02d7 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java @@ -5,15 +5,15 @@ * 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. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -1010,90 +1010,89 @@ public class PolicyFacade { } } - /** - * Create a policy state task reference. - * - * @param CreatePolicyStateTaskRefBuilder - - * @return result of the operation - */ - public ApexApiResult createPolicyStateTaskRef(CreatePolicyStateTaskRefBuilder builder) { - try { - Assertions.argumentNotNull(builder.getStateName(), STATE_NAME_MAY_NOT_BE_NULL); - Assertions.argumentNotNull(builder.getOutputName(), "outputName may not be null"); - - final AxPolicy policy = - apexModel.getPolicyModel().getPolicies().get(builder.getName(), builder.getVersion()); - if (policy == null) { - return new ApexApiResult( - ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, - CONCEPT + builder.getName() + ':' + builder.getVersion() + DOES_NOT_EXIST); - } - - final AxState state = policy.getStateMap().get(builder.getStateName()); - if (state == null) { - return new ApexApiResult( - ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, - CONCEPT + policy.getKey().getId() + ':' + builder.getStateName() + DOES_NOT_EXIST); - } - - final AxTask task = - apexModel - .getPolicyModel() - .getTasks() - .get(builder.getTaskName(), builder.getTaskVersion()); - if (task == null) { - return new ApexApiResult( - ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, - CONCEPT + builder.getTaskName() + ':' + builder.getTaskVersion() + DOES_NOT_EXIST); - } - - if (state.getTaskReferences().containsKey(task.getKey())) { - return new ApexApiResult( - ApexApiResult.Result.CONCEPT_EXISTS, - "task " - + task.getKey().getId() - + " already has reference with output " - + state.getTaskReferences().get(task.getKey())); - } - - AxReferenceKey refKey; - if (builder.getTaskLocalName() == null) { - refKey = new AxReferenceKey(state.getKey(), state.getKey().getParentKeyName()); - } else { - refKey = new AxReferenceKey(state.getKey(), builder.getTaskLocalName()); - } - - // The reference to the output we're using here - final AxReferenceKey outputRefKey = - new AxReferenceKey(state.getKey(), builder.getOutputName()); - - final AxStateTaskOutputType stateTaskOutputType = - AxStateTaskOutputType.valueOf(builder.getOutputType()); - if (stateTaskOutputType.equals(AxStateTaskOutputType.DIRECT)) { - if (!state.getStateOutputs().containsKey(outputRefKey.getLocalName())) { - return new ApexApiResult( - ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, - "state output concept " + outputRefKey.getId() + DOES_NOT_EXIST); - } - } else if (stateTaskOutputType.equals(AxStateTaskOutputType.LOGIC)) { - if (!state.getStateFinalizerLogicMap().containsKey(outputRefKey.getLocalName())) { - return new ApexApiResult( - ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, - "state finalizer logic concept " + outputRefKey.getId() + DOES_NOT_EXIST); + /** + * Create a policy state task reference. + * + * @param builder builder for the state task reference + * @return result of the operation + */ + public ApexApiResult createPolicyStateTaskRef(CreatePolicyStateTaskRefBuilder builder) { + try { + Assertions.argumentNotNull(builder.getStateName(), STATE_NAME_MAY_NOT_BE_NULL); + Assertions.argumentNotNull(builder.getOutputName(), "outputName may not be null"); + + final AxPolicy policy = + apexModel.getPolicyModel().getPolicies().get(builder.getName(), builder.getVersion()); + if (policy == null) { + return new ApexApiResult( + ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, + CONCEPT + builder.getName() + ':' + builder.getVersion() + DOES_NOT_EXIST); + } + + final AxState state = policy.getStateMap().get(builder.getStateName()); + if (state == null) { + return new ApexApiResult( + ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, + CONCEPT + policy.getKey().getId() + ':' + builder.getStateName() + DOES_NOT_EXIST); + } + + final AxTask task = + apexModel + .getPolicyModel() + .getTasks() + .get(builder.getTaskName(), builder.getTaskVersion()); + if (task == null) { + return new ApexApiResult( + ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, + CONCEPT + builder.getTaskName() + ':' + builder.getTaskVersion() + DOES_NOT_EXIST); + } + + if (state.getTaskReferences().containsKey(task.getKey())) { + return new ApexApiResult( + ApexApiResult.Result.CONCEPT_EXISTS, + "task " + + task.getKey().getId() + + " already has reference with output " + + state.getTaskReferences().get(task.getKey())); + } + + AxReferenceKey refKey; + if (builder.getTaskLocalName() == null) { + refKey = new AxReferenceKey(state.getKey(), state.getKey().getParentKeyName()); + } else { + refKey = new AxReferenceKey(state.getKey(), builder.getTaskLocalName()); + } + + // The reference to the output we're using here + final AxReferenceKey outputRefKey = + new AxReferenceKey(state.getKey(), builder.getOutputName()); + + final AxStateTaskOutputType stateTaskOutputType = + AxStateTaskOutputType.valueOf(builder.getOutputType()); + if (stateTaskOutputType.equals(AxStateTaskOutputType.DIRECT)) { + if (!state.getStateOutputs().containsKey(outputRefKey.getLocalName())) { + return new ApexApiResult( + ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, + "state output concept " + outputRefKey.getId() + DOES_NOT_EXIST); + } + } else if (stateTaskOutputType.equals(AxStateTaskOutputType.LOGIC)) { + if (!state.getStateFinalizerLogicMap().containsKey(outputRefKey.getLocalName())) { + return new ApexApiResult( + ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, + "state finalizer logic concept " + outputRefKey.getId() + DOES_NOT_EXIST); + } + } else { + return new ApexApiResult( + ApexApiResult.Result.FAILED, "output type " + builder.getOutputType() + " invalid"); + } + + state + .getTaskReferences() + .put(task.getKey(), new AxStateTaskReference(refKey, stateTaskOutputType, outputRefKey)); + return new ApexApiResult(); + } catch (final Exception e) { + return new ApexApiResult(ApexApiResult.Result.FAILED, e); } - } else { - return new ApexApiResult( - ApexApiResult.Result.FAILED, "output type " + builder.getOutputType() + " invalid"); - } - - state - .getTaskReferences() - .put(task.getKey(), new AxStateTaskReference(refKey, stateTaskOutputType, outputRefKey)); - return new ApexApiResult(); - } catch (final Exception e) { - return new ApexApiResult(ApexApiResult.Result.FAILED, e); - } } /** @@ -1333,7 +1332,7 @@ public class PolicyFacade { final Set<AxArtifactKey> deleteSet = new TreeSet<>(); for (final AxArtifactKey albumKey : state.getContextAlbumReferences()) { - + if ((contextAlbumName != null && !albumKey.getName().equals(contextAlbumName)) || (contextAlbumVersion != null && !albumKey.getVersion().equals(contextAlbumVersion))) { diff --git a/packages/apex-pdp-docker/src/main/docker/Dockerfile b/packages/apex-pdp-docker/src/main/docker/Dockerfile index cd6839333..1423c8714 100644 --- a/packages/apex-pdp-docker/src/main/docker/Dockerfile +++ b/packages/apex-pdp-docker/src/main/docker/Dockerfile @@ -1,19 +1,13 @@ # -# Docker file to build an image that runs APEX on Java 8 in Ubuntu +# Docker file to build an image that runs APEX on Java 8 in alpine # -FROM ubuntu:16.04 +FROM alpine:3.9 -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y zip unzip curl wget ssh iproute2 iputils-ping vim && \ - apt-get install -y software-properties-common && \ - add-apt-repository ppa:openjdk-r/ppa -y && \ - apt-get update && \ - apt-get install -y openjdk-8-jdk +RUN apk add --no-cache --update bash zip unzip curl wget openssh iproute2 iputils vim openjdk8 # Create apex user and group -RUN groupadd apexuser -RUN useradd --create-home -g apexuser apexuser +RUN addgroup -S apexuser && adduser -S apexuser -G apexuser + # Add Apex-specific directories and set ownership as the Apex admin user RUN mkdir -p /opt/app/policy/apex-pdp @@ -33,8 +27,6 @@ RUN chmod a+x /opt/app/policy/apex-pdp/bin/* # Copy examples to Apex user area RUN cp -pr /opt/app/policy/apex-pdp/examples /home/apexuser - -RUN apt-get clean RUN chown -R apexuser:apexuser /home/apexuser/* diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java index aaccbebab..5c62cf8b0 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java @@ -99,11 +99,7 @@ public class JrubyStateFinalizerExecutor extends StateFinalizerExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java index 8019259bd..8d2ccffe1 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java @@ -99,11 +99,7 @@ public class JrubyTaskExecutor extends TaskExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java index 0e239f7bc..02ae0d8e4 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java @@ -100,11 +100,7 @@ public class JrubyTaskSelectExecutor extends TaskSelectExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyExecutorParametersTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyExecutorParametersTest.java new file mode 100644 index 000000000..6e35aafb3 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyExecutorParametersTest.java @@ -0,0 +1,34 @@ +/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 Ericsson. All rights reserved.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.apex.plugins.executor.jruby;
+
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+
+/**
+ * Test the JrubyExecutorParameters class.
+ */
+public class JrubyExecutorParametersTest {
+ @Test
+ public void testJrubyExecutorParameters() {
+ assertNotNull(new JrubyExecutorParameters());
+ }
+}
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutorTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutorTest.java new file mode 100644 index 000000000..1c2ea1cd6 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutorTest.java @@ -0,0 +1,141 @@ +/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 Ericsson. All rights reserved.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.apex.plugins.executor.jruby;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.policy.apex.context.ContextException;
+import org.onap.policy.apex.context.parameters.ContextParameterConstants;
+import org.onap.policy.apex.context.parameters.DistributorParameters;
+import org.onap.policy.apex.context.parameters.LockManagerParameters;
+import org.onap.policy.apex.context.parameters.PersistorParameters;
+import org.onap.policy.apex.core.engine.EngineParameterConstants;
+import org.onap.policy.apex.core.engine.EngineParameters;
+import org.onap.policy.apex.core.engine.context.ApexInternalContext;
+import org.onap.policy.apex.core.engine.event.EnEvent;
+import org.onap.policy.apex.core.engine.executor.StateExecutor;
+import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
+import org.onap.policy.apex.core.engine.executor.impl.ExecutorFactoryImpl;
+import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
+import org.onap.policy.apex.model.eventmodel.concepts.AxEvent;
+import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
+import org.onap.policy.apex.model.policymodel.concepts.AxState;
+import org.onap.policy.apex.model.policymodel.concepts.AxStateFinalizerLogic;
+import org.onap.policy.common.parameters.ParameterService;
+
+/**
+ * Test the JrubyStateFinalizerExecutor class.
+ *
+ */
+public class JrubyStateFinalizerExecutorTest {
+ /**
+ * Initiate Parameters.
+ */
+ @Before
+ public void initiateParameters() {
+ ParameterService.register(new DistributorParameters());
+ ParameterService.register(new LockManagerParameters());
+ ParameterService.register(new PersistorParameters());
+ ParameterService.register(new EngineParameters());
+ }
+
+ /**
+ * Clear down Parameters.
+ */
+ @After
+ public void clearParameters() {
+ ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
+ ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME);
+ ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
+ ParameterService.deregister(EngineParameterConstants.MAIN_GROUP_NAME);
+ }
+
+ @Test
+ public void testJrubyStateFinalizerExecutor() {
+ JrubyStateFinalizerExecutor jsfe = new JrubyStateFinalizerExecutor();
+ assertNotNull(jsfe);
+
+ try {
+ Field fieldContainer = JrubyStateFinalizerExecutor.class.getDeclaredField("container");
+ fieldContainer.setAccessible(true);
+ fieldContainer.set(jsfe, null);
+ jsfe.prepare();
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals(java.lang.NullPointerException.class, jtseException.getClass());
+ }
+ ApexInternalContext internalContext = null;
+ try {
+ internalContext = new ApexInternalContext(new AxPolicyModel());
+ } catch (ContextException e) {
+ fail("test should not throw an exception here");
+ }
+
+ StateExecutor parentStateExcutor = null;
+ try {
+ parentStateExcutor = new StateExecutor(new ExecutorFactoryImpl());
+ } catch (StateMachineException e) {
+ fail("test should not throw an exception here");
+ }
+
+ AxState state = new AxState();
+ parentStateExcutor.setContext(null, state, internalContext);
+ AxStateFinalizerLogic stateFinalizerLogic = new AxStateFinalizerLogic();
+ jsfe.setContext(parentStateExcutor, stateFinalizerLogic, internalContext);
+ try {
+ jsfe.prepare();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+
+ try {
+ jsfe.execute(-1, null);
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals("execute-post: state finalizer logic execution failure on state \"NULL:0.0.0:NULL:NULL\" on "
+ + "finalizer logic NULL:0.0.0:NULL:NULL", jtseException.getMessage());
+ }
+
+ AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1"));
+ EnEvent event = new EnEvent(axEvent);
+
+ final String jrubyLogic = "if executor.executionId == -1" + "\n return false" + "\n else "
+ + "\n executor.setSelectedStateOutputName(\"SelectedOutputIsMe\")" + "\n return true" + "\n end";
+ stateFinalizerLogic.setLogic(jrubyLogic);
+
+ state.getStateOutputs().put("SelectedOutputIsMe", null);
+ try {
+ jsfe.prepare();
+ String stateOutput = jsfe.execute(0, event);
+ assertEquals("SelectedOutputIsMe", stateOutput);
+ jsfe.cleanUp();
+ } catch (Exception jtseException) {
+ jtseException.printStackTrace();
+ fail("test should not throw an exception here");
+ }
+
+ }
+}
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutorTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutorTest.java new file mode 100644 index 000000000..88227106b --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutorTest.java @@ -0,0 +1,117 @@ +/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 Ericsson. All rights reserved.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.apex.plugins.executor.jruby;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.policy.apex.context.ContextException;
+import org.onap.policy.apex.context.parameters.ContextParameterConstants;
+import org.onap.policy.apex.context.parameters.DistributorParameters;
+import org.onap.policy.apex.context.parameters.LockManagerParameters;
+import org.onap.policy.apex.context.parameters.PersistorParameters;
+import org.onap.policy.apex.core.engine.context.ApexInternalContext;
+import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
+import org.onap.policy.apex.model.policymodel.concepts.AxTask;
+import org.onap.policy.common.parameters.ParameterService;
+
+/**
+ * Test the JrubyTaskExecutor class.
+ *
+ */
+public class JrubyTaskExecutorTest {
+ /**
+ * Initiate Parameters.
+ */
+ @Before
+ public void initiateParameters() {
+ ParameterService.register(new DistributorParameters());
+ ParameterService.register(new LockManagerParameters());
+ ParameterService.register(new PersistorParameters());
+ }
+
+ /**
+ * Clear Parameters.
+ */
+ @After
+ public void clearParameters() {
+ ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
+ ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME);
+ ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
+ }
+
+ @Test
+ public void testJrubyTaskExecutor() {
+ JrubyTaskExecutor jte = new JrubyTaskExecutor();
+ assertNotNull(jte);
+ try {
+ Field fieldContainer = JrubyTaskExecutor.class.getDeclaredField("container");
+ fieldContainer.setAccessible(true);
+ fieldContainer.set(jte, null);
+ jte.prepare();
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals(java.lang.NullPointerException.class, jtseException.getClass());
+ }
+
+ AxTask task = new AxTask();
+ ApexInternalContext internalContext = null;
+ try {
+ internalContext = new ApexInternalContext(new AxPolicyModel());
+ } catch (ContextException e) {
+ fail("test should not throw an exception here");
+ }
+ jte.setContext(null, task, internalContext);
+ try {
+ jte.prepare();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+
+ Map<String, Object> incomingParameters = new HashMap<>();
+ try {
+ jte.execute(-1, incomingParameters);
+ fail("test should throw an exception here");
+ } catch (Exception jteException) {
+ assertEquals("execute-post: task logic execution failure on task \"NULL\" in model NULL:0.0.0",
+ jteException.getMessage());
+ }
+
+ final String jrubyLogic =
+ "if executor.executionId == -1" + "\n return false" + "\n else " + "\n return true" + "\n end";
+ task.getTaskLogic().setLogic(jrubyLogic);
+
+ try {
+ jte.prepare();
+ Map<String, Object> returnMap = jte.execute(0, incomingParameters);
+ assertEquals(0, returnMap.size());
+ jte.cleanUp();
+ } catch (Exception jteException) {
+ fail("test should not throw an exception here");
+ }
+ }
+}
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutorTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutorTest.java new file mode 100644 index 000000000..3914fb530 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutorTest.java @@ -0,0 +1,121 @@ +/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 Ericsson. All rights reserved.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.apex.plugins.executor.jruby;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.policy.apex.context.ContextException;
+import org.onap.policy.apex.context.parameters.ContextParameterConstants;
+import org.onap.policy.apex.context.parameters.DistributorParameters;
+import org.onap.policy.apex.context.parameters.LockManagerParameters;
+import org.onap.policy.apex.context.parameters.PersistorParameters;
+import org.onap.policy.apex.core.engine.context.ApexInternalContext;
+import org.onap.policy.apex.core.engine.event.EnEvent;
+import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
+import org.onap.policy.apex.model.eventmodel.concepts.AxEvent;
+import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
+import org.onap.policy.apex.model.policymodel.concepts.AxState;
+import org.onap.policy.common.parameters.ParameterService;
+
+/**
+ * Test the JrubyTaskSelectExecutor class.
+ *
+ */
+public class JrubyTaskSelectExecutorTest {
+ /**
+ * Initiate Parameters.
+ */
+ @Before
+ public void initiateParameters() {
+ ParameterService.register(new DistributorParameters());
+ ParameterService.register(new LockManagerParameters());
+ ParameterService.register(new PersistorParameters());
+ }
+
+ /**
+ * Clear Parameters.
+ */
+ @After
+ public void clearParameters() {
+ ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
+ ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME);
+ ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
+ }
+
+ @Test
+ public void testJrubyTaskSelectExecutor() {
+ JrubyTaskSelectExecutor jtse = new JrubyTaskSelectExecutor();
+ assertNotNull(jtse);
+ assertNotNull(jtse.getOutputEventSet());
+ try {
+ Field fieldContainer = JrubyTaskSelectExecutor.class.getDeclaredField("container");
+ fieldContainer.setAccessible(true);
+ fieldContainer.set(jtse, null);
+ jtse.prepare();
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals(java.lang.NullPointerException.class, jtseException.getClass());
+ }
+
+ AxState state = new AxState();
+ ApexInternalContext internalContext = null;
+ try {
+ internalContext = new ApexInternalContext(new AxPolicyModel());
+ } catch (ContextException e) {
+ fail("test should not throw an exception here");
+ }
+ jtse.setContext(null, state, internalContext);
+
+
+ try {
+ jtse.prepare();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+ AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1"));
+ EnEvent event = new EnEvent(axEvent);
+ try {
+ jtse.execute(-1, event);
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals("execute-post: task selection logic failed on state \"NULL:0.0.0:NULL:NULL\"",
+ jtseException.getMessage());
+ }
+
+ final String jrubyLogic =
+ "if executor.executionId == -1" + "\n return false" + "\n else " + "\n return true" + "\n end";
+ state.getTaskSelectionLogic().setLogic(jrubyLogic);
+
+ try {
+ jtse.prepare();
+ AxArtifactKey taskKey = jtse.execute(0, event);
+ assertEquals("NULL:0.0.0", taskKey.getId());
+ jtse.cleanUp();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+ }
+}
diff --git a/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonStateFinalizerExecutor.java b/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonStateFinalizerExecutor.java index ecd9f7ae1..3636d811a 100644 --- a/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonStateFinalizerExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonStateFinalizerExecutor.java @@ -21,11 +21,11 @@ package org.onap.policy.apex.plugins.executor.jython; import java.util.Map; - import org.onap.policy.apex.context.ContextException; import org.onap.policy.apex.core.engine.executor.StateFinalizerExecutor; import org.onap.policy.apex.core.engine.executor.exception.StateMachineException; import org.python.core.CompileMode; +import org.python.core.CompilerFlags; import org.python.core.Py; import org.python.core.PyCode; import org.python.core.PyException; @@ -61,8 +61,9 @@ public class JythonStateFinalizerExecutor extends StateFinalizerExecutor { super.prepare(); try { synchronized (Py.class) { - compiled = Py.compile_flags(getSubject().getLogic(), "<" + getSubject().getKey().toString() + ">", - CompileMode.exec, null); + final String logic = getSubject().getLogic(); + final String filename = "<" + getSubject().getKey().toString() + ">"; + compiled = Py.compile_flags(logic, filename, CompileMode.exec, new CompilerFlags()); } } catch (final PyException e) { LOGGER.warn("failed to compile Jython code for state finalizer " + getSubject().getKey(), e); @@ -98,7 +99,7 @@ public class JythonStateFinalizerExecutor extends StateFinalizerExecutor { // Set up the Jython engine interpreter.set("executor", getExecutionContext()); interpreter.exec(compiled); - returnValue = (boolean) interpreter.get("returnValue", java.lang.Boolean.class); + returnValue = interpreter.get("returnValue", java.lang.Boolean.class); } /* */ } catch (final Exception e) { @@ -111,11 +112,7 @@ public class JythonStateFinalizerExecutor extends StateFinalizerExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskExecutor.java b/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskExecutor.java index bddb63b42..1280fb85d 100644 --- a/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskExecutor.java @@ -21,7 +21,6 @@ package org.onap.policy.apex.plugins.executor.jython; import java.util.Map; - import org.onap.policy.apex.context.ContextException; import org.onap.policy.apex.core.engine.executor.TaskExecutor; import org.onap.policy.apex.core.engine.executor.exception.StateMachineException; @@ -113,40 +112,26 @@ public class JythonTaskExecutor extends TaskExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); + } /** * Handle the result returned by the interpreter. - * + * * @return true if the result was successful * @throws StateMachineException on interpreter failures */ private boolean handleInterpreterResult() throws StateMachineException { - boolean returnValue = false; - - try { - final Object ret = interpreter.get("returnValue", java.lang.Boolean.class); - if (ret == null) { - LOGGER.error("execute: task logic failed to set a return value for task \"" - + getSubject().getKey().getId() + "\""); - throw new StateMachineException("execute: task logic failed to set a return value for task \"" - + getSubject().getKey().getId() + "\""); - } - returnValue = (Boolean) ret; - } catch (NullPointerException | ClassCastException e) { - LOGGER.error("execute: task selection logic failed to set a correct return value for state \"" - + getSubject().getKey().getId() + "\"", e); - throw new StateMachineException( - "execute: task selection logic failed to set a return value for state \"" - + getSubject().getKey().getId() + "\"", - e); + final Object ret = interpreter.get("returnValue", java.lang.Boolean.class); + if (ret == null) { + LOGGER.error("execute: task logic failed to set a return value for task \"" + getSubject().getKey().getId() + + "\""); + throw new StateMachineException("execute: task logic failed to set a return value for task \"" + + getSubject().getKey().getId() + "\""); } - return returnValue; + return (Boolean) ret; + } /** diff --git a/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskSelectExecutor.java b/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskSelectExecutor.java index 9a2433122..d6e6dd70b 100644 --- a/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskSelectExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jython/src/main/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskSelectExecutor.java @@ -44,8 +44,8 @@ public class JythonTaskSelectExecutor extends TaskSelectExecutor { private static final XLogger LOGGER = XLoggerFactory.getXLogger(JythonTaskSelectExecutor.class); // Recurring string constants - private static final String TSL_FAILED_PREFIX = - "execute: task selection logic failed to set a return value for state \""; + private static final String TSL_FAILED_PREFIX = + "execute: task selection logic failed to set a return value for state \""; // The Jython interpreter private final PythonInterpreter interpreter = new PythonInterpreter(); @@ -117,41 +117,24 @@ public class JythonTaskSelectExecutor extends TaskSelectExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); + } /** * Handle the result returned by the interpreter. - * + * * @return true if the result was successful * @throws StateMachineException on interpreter errors */ private boolean handleInterpreterResult() throws StateMachineException { - boolean returnValue = false; - - try { - final Object ret = interpreter.get("returnValue", java.lang.Boolean.class); - if (ret == null) { - LOGGER.error(TSL_FAILED_PREFIX - + getSubject().getKey().getId() + "\""); - throw new StateMachineException( - TSL_FAILED_PREFIX - + getSubject().getKey().getId() + "\""); - } - returnValue = (Boolean) ret; - } catch (NullPointerException | ClassCastException e) { - LOGGER.error("execute: task selection logic failed to set a correct return value for state \"" - + getSubject().getKey().getId() + "\"", e); - throw new StateMachineException( - TSL_FAILED_PREFIX - + getSubject().getKey().getId() + "\"", - e); + final Object ret = interpreter.get("returnValue", java.lang.Boolean.class); + if (ret == null) { + LOGGER.error(TSL_FAILED_PREFIX + getSubject().getKey().getId() + "\""); + throw new StateMachineException(TSL_FAILED_PREFIX + getSubject().getKey().getId() + "\""); } - return returnValue; + return (Boolean) ret; + } /** diff --git a/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonExecutorParametersTest.java b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonExecutorParametersTest.java new file mode 100644 index 000000000..8bfde0aa7 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonExecutorParametersTest.java @@ -0,0 +1,35 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.jython; + +import static org.junit.Assert.assertNotNull; +import org.junit.Test; + +/** + * Test the JythonExecutorParameters class. + */ +public class JythonExecutorParametersTest { + + @Test + public void testJavaExecutorParameters() { + assertNotNull(new JythonExecutorParameters()); + } +} diff --git a/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonStateFinalizerExecutorTest.java b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonStateFinalizerExecutorTest.java new file mode 100644 index 000000000..2ae41d6e6 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonStateFinalizerExecutorTest.java @@ -0,0 +1,170 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.jython; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import java.util.Map; +import java.util.TreeMap; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.EngineParameterConstants; +import org.onap.policy.apex.core.engine.EngineParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.core.engine.event.EnEvent; +import org.onap.policy.apex.core.engine.executor.StateExecutor; +import org.onap.policy.apex.core.engine.executor.exception.StateMachineException; +import org.onap.policy.apex.core.engine.executor.impl.ExecutorFactoryImpl; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey; +import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxState; +import org.onap.policy.apex.model.policymodel.concepts.AxStateFinalizerLogic; +import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput; +import org.onap.policy.common.parameters.ParameterService; + +/** + * Test the JythonStateFinalizerExecutor class. + * + */ +public class JythonStateFinalizerExecutorTest { + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + ParameterService.register(new EngineParameters()); + } + + /** + * Clear down Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + ParameterService.deregister(EngineParameterConstants.MAIN_GROUP_NAME); + } + + @Test + public void testJythonStateFinalizerExecutor() { + JythonStateFinalizerExecutor jsfe = new JythonStateFinalizerExecutor(); + assertNotNull(jsfe); + + try { + jsfe.prepare(); + fail("test should throw an exception here"); + } catch (Exception jtseException) { + assertEquals(java.lang.NullPointerException.class, jtseException.getClass()); + } + + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + + StateExecutor parentStateExcutor = null; + try { + parentStateExcutor = new StateExecutor(new ExecutorFactoryImpl()); + } catch (StateMachineException e) { + fail("test should not throw an exception here"); + } + + AxState state = new AxState(); + Map<String, AxStateOutput> stateOutputs = new TreeMap<>(); + AxArtifactKey triggerKey = new AxArtifactKey("TriggerName", "0.0.1"); + AxStateOutput isMe = new AxStateOutput(new AxReferenceKey(), triggerKey, + new AxReferenceKey()); + stateOutputs.put("SelectedOutputIsMe", isMe); + state.setStateOutputs(stateOutputs); + + parentStateExcutor.setContext(null, state, internalContext); + AxStateFinalizerLogic stateFinalizerLogic = new AxStateFinalizerLogic(); + jsfe.setContext(parentStateExcutor, stateFinalizerLogic, internalContext); + + stateFinalizerLogic.setLogic("return false"); + + try { + jsfe.prepare(); + fail("test should throw an exception here"); + } catch (Exception jtseException) { + assertEquals( + "failed to compile Jython code for state finalizer AxReferenceKey:" + + "(parentKeyName=NULL,parentKeyVersion=0.0.0,parentLocalName=NULL,localName=NULL)", + jtseException.getMessage()); + } + + String scriptSource = "for i in range(0,10): print(i)"; + stateFinalizerLogic.setLogic(scriptSource); + try { + jsfe.prepare(); + jsfe.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception jtseException) { + assertEquals( + "failed to execute Jython code for state finalizer AxReferenceKey:(parentKeyName=NULL," + + "parentKeyVersion=0.0.0,parentLocalName=NULL,localName=NULL)", + jtseException.getMessage()); + } + + scriptSource = "setattr(executor, 'selectedStateOutputName', 'SelectedOutputIsMe')\n" + + "returnValue=('' if executor == -1 else True)"; + stateFinalizerLogic.setLogic(scriptSource); + try { + jsfe.prepare(); + } catch (Exception jteException) { + fail("test should not throw an exception here"); + } + + AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1")); + EnEvent event = new EnEvent(axEvent); + try { + jsfe.execute(0, event); + } catch (Exception jtseException) { + jtseException.printStackTrace(); + fail("test should not throw an exception here"); + } + + try { + jsfe.prepare(); + String stateOutput = jsfe.execute(0, event); + assertEquals("SelectedOutputIsMe", stateOutput); + jsfe.cleanUp(); + } catch (Exception jtseException) { + jtseException.printStackTrace(); + fail("test should not throw an exception here"); + } + } +} diff --git a/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskExecutorTest.java b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskExecutorTest.java new file mode 100644 index 000000000..97af4b154 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskExecutorTest.java @@ -0,0 +1,145 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.jython; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import java.util.HashMap; +import java.util.Map; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxTask; +import org.onap.policy.common.parameters.ParameterService; + +/** + * Test the JavaTaskExecutor class. + * + */ +public class JythonTaskExecutorTest { + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + } + + /** + * Clear Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + } + + @Test + public void testJythonTaskExecutor() { + JythonTaskExecutor jte = new JythonTaskExecutor(); + assertNotNull(jte); + + try { + jte.prepare(); + fail("test should throw an exception here"); + } catch (Exception jteException) { + assertEquals(java.lang.NullPointerException.class, jteException.getClass()); + } + + AxTask task = new AxTask(); + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + jte.setContext(null, task, internalContext); + + task.getTaskLogic().setLogic("return false"); + try { + jte.prepare(); + fail("test should throw an exception here"); + } catch (Exception jteException) { + assertEquals("failed to compile Jython code for task NULL:0.0.0", jteException.getMessage()); + } + + task.getTaskLogic().setLogic("java.lang.String"); + + try { + jte.prepare(); + } catch (Exception jteException) { + fail("test should not throw an exception here"); + } + + try { + jte.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception jteException) { + assertEquals(java.lang.NullPointerException.class, jteException.getClass()); + } + + Map<String, Object> incomingParameters = new HashMap<>(); + try { + jte.execute(-1, incomingParameters); + fail("test should throw an exception here"); + } catch (Exception jteException) { + assertEquals("failed to execute Jython code for task NULL:0.0.0", jteException.getMessage()); + } + + String scriptSource = "for i in range(0,10): print(i)"; + task.getTaskLogic().setLogic(scriptSource); + AxArtifactKey taskKey = new AxArtifactKey("String", "0.0.1"); + task.setKey(taskKey); + + try { + jte.prepare(); + Map<String, Object> returnMap = jte.execute(-1, incomingParameters); + assertEquals(0, returnMap.size()); + jte.cleanUp(); + fail("test should throw an exception here"); + } catch (Exception jteException) { + assertEquals("failed to execute Jython code for task String:0.0.1", jteException.getMessage()); + } + + scriptSource = "returnValue=('' if executor == -1 else True)"; + task.getTaskLogic().setLogic(scriptSource); + try { + jte.prepare(); + Map<String, Object> returnMap = jte.execute(0, incomingParameters); + assertEquals(0, returnMap.size()); + jte.cleanUp(); + } catch (Exception jteException) { + fail("test should not throw an exception here"); + } + } +} diff --git a/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskSelectExecutorTest.java b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskSelectExecutorTest.java new file mode 100644 index 000000000..d54887a65 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jython/src/test/java/org/onap/policy/apex/plugins/executor/jython/JythonTaskSelectExecutorTest.java @@ -0,0 +1,128 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.jython; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.core.engine.event.EnEvent; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxState; +import org.onap.policy.common.parameters.ParameterService; + +/** + * Test the JythonTaskSelectExecutor class. + * + */ +public class JythonTaskSelectExecutorTest { + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + } + + /** + * Clear Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + } + + @Test + public void testJythonTaskSelectExecutor() { + JythonTaskSelectExecutor jtse = new JythonTaskSelectExecutor(); + assertNotNull(jtse); + + try { + jtse.prepare(); + fail("test should throw an exception here"); + } catch (Exception jtseException) { + assertEquals(java.lang.NullPointerException.class, jtseException.getClass()); + } + + AxState state = new AxState(); + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + jtse.setContext(null, state, internalContext); + + state.getTaskSelectionLogic().setLogic("return false"); + try { + jtse.prepare(); + fail("test should throw an exception here"); + } catch (Exception jteException) { + assertEquals("failed to compile Jython code for task selection logic in NULL:0.0.0:NULL:NULL", + jteException.getMessage()); + } + + String scriptSource = "for i in range(0,10): print(i)"; + state.getTaskSelectionLogic().setLogic(scriptSource); + try { + jtse.prepare(); + jtse.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception jtseException) { + assertEquals(java.lang.NullPointerException.class, jtseException.getClass()); + } + + AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1")); + EnEvent event = new EnEvent(axEvent); + try { + jtse.prepare(); + jtse.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception jtseException) { + assertEquals("failed to execute Jython code for task selection logic in NULL:0.0.0:NULL:NULL", + jtseException.getMessage()); + } + + scriptSource = "returnValue=('' if executor == -1 else True)"; + state.getTaskSelectionLogic().setLogic(scriptSource); + try { + jtse.prepare(); + jtse.execute(-1, event); + jtse.cleanUp(); + } catch (Exception jtseException) { + fail("test should not throw an exception here"); + } + } +} diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java index 5086259a8..bdf6b1363 100644 --- a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java +++ b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java @@ -98,11 +98,7 @@ public class MvelStateFinalizerExecutor extends StateFinalizerExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java index 457539411..1a3611854 100644 --- a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java +++ b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java @@ -97,11 +97,7 @@ public class MvelTaskExecutor extends TaskExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java index b07c5e260..f17f1b9ad 100644 --- a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java +++ b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java @@ -99,11 +99,7 @@ public class MvelTaskSelectExecutor extends TaskSelectExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelExecutorParametersTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelExecutorParametersTest.java new file mode 100644 index 000000000..987af43a4 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelExecutorParametersTest.java @@ -0,0 +1,36 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; + +/** + * Test the MvelExecutorParameters class. + */ +public class MvelExecutorParametersTest { + + @Test + public void testJavaExecutorParameters() { + assertNotNull(new MvelExecutorParameters()); + } +} diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutorTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutorTest.java new file mode 100644 index 000000000..ac2503182 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutorTest.java @@ -0,0 +1,177 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.EngineParameterConstants; +import org.onap.policy.apex.core.engine.EngineParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.core.engine.event.EnEvent; +import org.onap.policy.apex.core.engine.executor.StateExecutor; +import org.onap.policy.apex.core.engine.executor.exception.StateMachineException; +import org.onap.policy.apex.core.engine.executor.impl.ExecutorFactoryImpl; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxState; +import org.onap.policy.apex.model.policymodel.concepts.AxStateFinalizerLogic; +import org.onap.policy.common.parameters.ParameterService; +import org.slf4j.ext.XLogger; +import org.slf4j.ext.XLoggerFactory; + +/** + * Test the MvelStateFinalizerExecutor class. + * + */ +public class MvelStateFinalizerExecutorTest { + + private static final XLogger LOGGER = XLoggerFactory.getXLogger(MvelStateFinalizerExecutorTest.class); + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + ParameterService.register(new EngineParameters()); + } + + /** + * Clear down Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + ParameterService.deregister(EngineParameterConstants.MAIN_GROUP_NAME); + } + + @Test + public void testJavaStateFinalizerExecutor() { + MvelStateFinalizerExecutor msfe = new MvelStateFinalizerExecutor(); + assertNotNull(msfe); + + try { + msfe.prepare(); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals(java.lang.NullPointerException.class, msfeException.getClass()); + } + + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + + StateExecutor parentStateExcutor = null; + try { + parentStateExcutor = new StateExecutor(new ExecutorFactoryImpl()); + } catch (StateMachineException e) { + fail("test should not throw an exception here"); + } + + AxState state = new AxState(); + parentStateExcutor.setContext(null, state, internalContext); + AxStateFinalizerLogic stateFinalizerLogic = new AxStateFinalizerLogic(); + msfe.setContext(parentStateExcutor, stateFinalizerLogic, internalContext); + + stateFinalizerLogic.setLogic("x > 1 2 ()"); + try { + msfe.prepare(); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals("failed to compile MVEL code for state NULL:0.0.0:NULL:NULL", msfeException.getMessage()); + } + + stateFinalizerLogic.setLogic("java.lang.String"); + + try { + msfe.prepare(); + } catch (Exception msfeException) { + fail("test should not throw an exception here"); + } + + try { + msfe.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals("failed to execute MVEL code for state NULL:0.0.0:NULL:NULL", + msfeException.getMessage()); + } + + AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1")); + EnEvent event = new EnEvent(axEvent); + try { + msfe.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals("failed to execute MVEL code for state NULL:0.0.0:NULL:NULL", + msfeException.getMessage()); + } + + stateFinalizerLogic.setLogic("executionId !=-1"); + try { + msfe.prepare(); + msfe.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals( + "execute-post: state finalizer logic execution failure on state \"NULL:0.0.0:NULL:NULL\" " + + "on finalizer logic NULL:0.0.0:NULL:NULL", + msfeException.getMessage()); + } + + stateFinalizerLogic.setLogic( + "if (executionId == -1) {return false;}setSelectedStateOutputName(\"SelectedOutputIsMe\");" + + "return true;"); + state.getStateOutputs().put("SelectedOutputIsMe", null); + try { + msfe.prepare(); + String stateOutput = msfe.execute(0, event); + assertEquals("SelectedOutputIsMe", stateOutput); + } catch (Exception msfeException) { + LOGGER.warn("Unexpected exception happened here.", msfeException); + fail("test should not throw an exception here"); + } finally { + try { + msfe.cleanUp(); + } catch (StateMachineException msfeException) { + LOGGER.warn("Unexpected exception happened here.", msfeException); + fail("test should not throw an exception here"); + } + } + } +} diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutorTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutorTest.java new file mode 100644 index 000000000..5d65a4bb8 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutorTest.java @@ -0,0 +1,139 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.util.HashMap; +import java.util.Map; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxTask; +import org.onap.policy.common.parameters.ParameterService; + +/** + * Test the MvelTaskExecutor class. + * + */ +public class MvelTaskExecutorTest { + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + } + + /** + * Clear Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + } + + @Test + public void testMvelTaskExecutor() { + MvelTaskExecutor mte = new MvelTaskExecutor(); + assertNotNull(mte); + + try { + mte.prepare(); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals(java.lang.NullPointerException.class, mteException.getClass()); + } + + AxTask task = new AxTask(); + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + mte.setContext(null, task, internalContext); + + task.getTaskLogic().setLogic("x > 1 2 ()"); + try { + mte.prepare(); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals("failed to compile MVEL code for task NULL:0.0.0", mteException.getMessage()); + } + + task.getTaskLogic().setLogic("x"); + + try { + mte.prepare(); + } catch (Exception mteException) { + fail("test should not throw an exception here"); + } + + try { + mte.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals(java.lang.NullPointerException.class, mteException.getClass()); + } + + Map<String, Object> incomingParameters = new HashMap<>(); + try { + mte.execute(-1, incomingParameters); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals("failed to execute MVEL code for task NULL:0.0.0", mteException.getMessage()); + } + + task.getTaskLogic().setLogic("executionId != -1"); + try { + mte.prepare(); + mte.execute(-1, incomingParameters); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals("execute-post: task logic execution failure on task \"NULL\" in model NULL:0.0.0", + mteException.getMessage()); + } + + try { + mte.prepare(); + Map<String, Object> returnMap = mte.execute(0, incomingParameters); + assertEquals(0, returnMap.size()); + mte.cleanUp(); + } catch (Exception mteException) { + fail("test should not throw an exception here"); + } + } +} diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutorTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutorTest.java new file mode 100644 index 000000000..7c585ee2f --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutorTest.java @@ -0,0 +1,141 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. All rights reserved. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.core.engine.event.EnEvent; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxState; +import org.onap.policy.common.parameters.ParameterService; + +/** + * Test the MvelTaskSelectExecutor class. + * + */ +public class MvelTaskSelectExecutorTest { + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + } + + /** + * Clear Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + } + + @Test + public void testJavaTaskSelectExecutor() { + MvelTaskSelectExecutor mtse = new MvelTaskSelectExecutor(); + assertNotNull(mtse); + + try { + mtse.prepare(); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals(java.lang.NullPointerException.class, mtseException.getClass()); + } + + AxState state = new AxState(); + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + mtse.setContext(null, state, internalContext); + + state.getTaskSelectionLogic().setLogic("x > 1 2 ()"); + try { + mtse.prepare(); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals("failed to compile MVEL code for state NULL:0.0.0:NULL:NULL", mtseException.getMessage()); + } + + state.getTaskSelectionLogic().setLogic("java.lang.String"); + + try { + mtse.prepare(); + } catch (Exception mtseException) { + fail("test should not throw an exception here"); + } + + try { + mtse.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals(java.lang.NullPointerException.class, mtseException.getClass()); + } + + AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1")); + EnEvent event = new EnEvent(axEvent); + try { + mtse.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals("failed to execute MVEL code for state NULL:0.0.0:NULL:NULL", + mtseException.getMessage()); + } + + state.getTaskSelectionLogic().setLogic("executionId != -1"); + try { + mtse.prepare(); + mtse.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals("execute-post: task selection logic failed on state \"NULL:0.0.0:NULL:NULL\"", + mtseException.getMessage()); + } + + try { + mtse.prepare(); + AxArtifactKey taskKey = mtse.execute(0, event); + assertEquals("NULL:0.0.0", taskKey.getId()); + mtse.cleanUp(); + } catch (Exception mtseException) { + fail("test should not throw an exception here"); + } + } +} diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java index 4d2e99b23..f5f0d6625 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +35,7 @@ import org.apache.commons.lang3.Validate; import org.onap.policy.apex.auth.clicodegen.CodeGenCliEditorBuilder; import org.onap.policy.apex.auth.clicodegen.CodeGeneratorCliEditor; import org.onap.policy.apex.auth.clicodegen.EventDeclarationBuilder; +import org.onap.policy.apex.auth.clicodegen.TaskDeclarationBuilder; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey; import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; @@ -168,8 +170,10 @@ public class Model2Cli { final List<ST> parameters = getParametersForTask(codeGen, t); final List<ST> contextRefs = getCtxtRefsForTask(codeGen, t); - codeGen.addTaskDeclaration(kig.getName(key), kig.getVersion(key), kig.getUuid(key), kig.getDesc(key), - infields, outfields, logic, parameters, contextRefs); + codeGen.addTaskDeclaration(new TaskDeclarationBuilder().setName(kig.getName(key)) + .setVersion(kig.getVersion(key)).setUuid(kig.getUuid(key)) + .setDescription(kig.getDesc(key)).setInfields(infields).setOutfields(outfields) + .setLogic(logic).setParameters(parameters).setContextRefs(contextRefs)); } // 3: events |