From 87be30582d1db37bee7c6b456c0c5c3ca9584963 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 4 Sep 2018 17:24:15 +0100 Subject: Fix checkstyle issues in apex model basic CHeckstyle issues in apex model basic and knock on changes in other apex modules. Issue-ID: POLICY-1034 Change-Id: I65823f5e2e344526abc74b0812877113acb056ec Signed-off-by: liamfallon --- .../core/engine/context/ApexInternalContext.java | 6 +-- .../core/engine/engine/impl/ApexEngineImpl.java | 62 +++++++++++----------- .../engine/engine/impl/StateMachineHandler.java | 26 ++++----- .../policy/apex/core/engine/event/EnEvent.java | 2 +- .../policy/apex/core/engine/event/EnField.java | 2 +- .../apex/core/engine/executor/StateExecutor.java | 16 +++--- .../engine/executor/StateFinalizerExecutor.java | 22 ++++---- .../core/engine/executor/StateMachineExecutor.java | 2 +- .../apex/core/engine/executor/StateOutput.java | 4 +- .../apex/core/engine/executor/TaskExecutor.java | 14 ++--- .../core/engine/executor/TaskSelectExecutor.java | 18 +++---- .../engine/executor/context/AxStateFacade.java | 2 +- .../core/engine/executor/context/AxTaskFacade.java | 6 +-- .../apex/core/engine/monitoring/EventMonitor.java | 4 +- 14 files changed, 93 insertions(+), 93 deletions(-) (limited to 'core') diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java index 2186ee31d..85e45f718 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java @@ -148,10 +148,10 @@ public final class ApexInternalContext implements AxConceptGetter // The schema is different, throw an exception because the schema should not change if the key of the // album has not changed throw new ContextException("internal context update failed on context album \"" - + contextAlbumEntry.getKey().getID() + "\" in model \"" + key.getID() + "\", schema \"" - + currentContextAlbum.getItemSchema().getID() + + contextAlbumEntry.getKey().getId() + "\" in model \"" + key.getId() + "\", schema \"" + + currentContextAlbum.getItemSchema().getId() + "\" on existing context model does not equal schema \"" - + newContextAlbum.getItemSchema().getID() + "\" on incoming model"); + + newContextAlbum.getItemSchema().getId() + "\" on incoming model"); } } diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java index 235140863..3349b609f 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java @@ -82,7 +82,7 @@ public class ApexEngineImpl implements ApexEngine { protected ApexEngineImpl(final AxArtifactKey key) { argumentNotNull(key, "AxArtifactKey may not be null"); - LOGGER.entry("ApexEngine()->" + key.getID() + "," + state); + LOGGER.entry("ApexEngine()->" + key.getId() + "," + state); this.key = key; @@ -90,7 +90,7 @@ public class ApexEngineImpl implements ApexEngine { engineStats = new AxEngineStats(); engineStats.setKey(new AxReferenceKey(key, "_EngineStats")); - LOGGER.exit("ApexEngine()<-" + key.getID() + "," + state); + LOGGER.exit("ApexEngine()<-" + key.getId() + "," + state); } /* @@ -103,16 +103,16 @@ public class ApexEngineImpl implements ApexEngine { @Override public void updateModel(final AxPolicyModel apexModel) throws ApexException { if (apexModel != null) { - LOGGER.entry("updateModel()->" + key.getID() + ", apexPolicyModel=" + apexModel.getKey().getID()); + LOGGER.entry("updateModel()->" + key.getId() + ", apexPolicyModel=" + apexModel.getKey().getId()); } else { - LOGGER.warn("updateModel()<-" + key.getID() + ", Apex model not set"); + LOGGER.warn("updateModel()<-" + key.getId() + ", Apex model not set"); throw new ApexException( - "updateModel()<-" + key.getID() + ", Apex model is not defined, it has a null value"); + "updateModel()<-" + key.getId() + ", Apex model is not defined, it has a null value"); } // The engine must be stopped in order to do a model update if (!state.equals(AxEngineState.STOPPED)) { - throw new ApexException("updateModel()<-" + key.getID() + throw new ApexException("updateModel()<-" + key.getId() + ", cannot update model, engine should be stopped but is in state " + state); } @@ -127,10 +127,10 @@ public class ApexEngineImpl implements ApexEngine { } } catch (final ContextException e) { LOGGER.warn( - "updateModel()<-" + key.getID() + ", error setting the context for engine \"" + key.getID() + "\"", + "updateModel()<-" + key.getId() + ", error setting the context for engine \"" + key.getId() + "\"", e); throw new ApexException( - "updateModel()<-" + key.getID() + ", error setting the context for engine \"" + key.getID() + "\"", + "updateModel()<-" + key.getId() + ", error setting the context for engine \"" + key.getId() + "\"", e); } @@ -140,13 +140,13 @@ public class ApexEngineImpl implements ApexEngine { // always set up as new stateMachineHandler = new StateMachineHandler(internalContext); } catch (final StateMachineException e) { - LOGGER.warn("updateModel()<-" + key.getID() + ", error setting up the engine state machines \"" - + key.getID() + "\"", e); - throw new ApexException("updateModel()<-" + key.getID() + ", error setting up the engine state machines \"" - + key.getID() + "\"", e); + LOGGER.warn("updateModel()<-" + key.getId() + ", error setting up the engine state machines \"" + + key.getId() + "\"", e); + throw new ApexException("updateModel()<-" + key.getId() + ", error setting up the engine state machines \"" + + key.getId() + "\"", e); } - LOGGER.exit("updateModel()<-" + key.getID()); + LOGGER.exit("updateModel()<-" + key.getId()); } /* @@ -159,15 +159,15 @@ public class ApexEngineImpl implements ApexEngine { LOGGER.entry("start()" + key); if (state != AxEngineState.STOPPED) { - LOGGER.warn("start()<-" + key.getID() + "," + state + ", cannot start engine, engine not in state STOPPED"); + LOGGER.warn("start()<-" + key.getId() + "," + state + ", cannot start engine, engine not in state STOPPED"); throw new ApexException( - "start()<-" + key.getID() + "," + state + ", cannot start engine, engine not in state STOPPED"); + "start()<-" + key.getId() + "," + state + ", cannot start engine, engine not in state STOPPED"); } if (stateMachineHandler == null || internalContext == null) { - LOGGER.warn("start()<-" + key.getID() + "," + state + LOGGER.warn("start()<-" + key.getId() + "," + state + ", cannot start engine, engine has not been initialized, its model is not loaded"); - throw new ApexException("start()<-" + key.getID() + "," + state + throw new ApexException("start()<-" + key.getId() + "," + state + ", cannot start engine, engine has not been initialized, its model is not loaded"); } @@ -177,10 +177,10 @@ public class ApexEngineImpl implements ApexEngine { stateMachineHandler.start(); engineStats.engineStart(); } catch (final StateMachineException e) { - LOGGER.warn("updateModel()<-" + key.getID() + ", error starting the engine state machines \"" + key.getID() + LOGGER.warn("updateModel()<-" + key.getId() + ", error starting the engine state machines \"" + key.getId() + "\"", e); - throw new ApexException("updateModel()<-" + key.getID() + ", error starting the engine state machines \"" - + key.getID() + "\"", e); + throw new ApexException("updateModel()<-" + key.getId() + ", error starting the engine state machines \"" + + key.getId() + "\"", e); } // OK, we are good to go @@ -206,7 +206,7 @@ public class ApexEngineImpl implements ApexEngine { // Already stopped case STOPPED: - throw new ApexException("stop()<-" + key.getID() + "," + state + throw new ApexException("stop()<-" + key.getId() + "," + state + ", cannot stop engine, engine is already stopped"); // The normal case, the engine wasn't doing anything or it was executing case READY: @@ -222,13 +222,13 @@ public class ApexEngineImpl implements ApexEngine { state = AxEngineState.STOPPING; break; default: - throw new ApexException("stop()<-" + key.getID() + "," + state + throw new ApexException("stop()<-" + key.getId() + "," + state + ", cannot stop engine, engine is in an undefined state"); } } } - throw new ApexException("stop()<-" + key.getID() + "," + state + ", cannot stop engine, engine stop timed out"); + throw new ApexException("stop()<-" + key.getId() + "," + state + ", cannot stop engine, engine stop timed out"); } /* @@ -241,7 +241,7 @@ public class ApexEngineImpl implements ApexEngine { LOGGER.entry("clear()->" + key); if (state != AxEngineState.STOPPED) { throw new ApexException( - "clear" + "()<-" + key.getID() + "," + state + ", cannot clear engine, engine is not stopped"); + "clear" + "()<-" + key.getId() + "," + state + ", cannot clear engine, engine is not stopped"); } // Clear everything @@ -261,7 +261,7 @@ public class ApexEngineImpl implements ApexEngine { public EnEvent createEvent(final AxArtifactKey eventKey) { if (state != AxEngineState.READY && state != AxEngineState.EXECUTING) { LOGGER.warn( - "createEvent()<-" + key.getID() + "," + state + ", cannot create event, engine not in state READY"); + "createEvent()<-" + key.getId() + "," + state + ", cannot create event, engine not in state READY"); return null; } @@ -269,7 +269,7 @@ public class ApexEngineImpl implements ApexEngine { // Create an event using the internal context return new EnEvent(eventKey); } catch (final Exception e) { - LOGGER.warn("createEvent()<-" + key.getID() + "," + state + ", error on event creation", e); + LOGGER.warn("createEvent()<-" + key.getId() + "," + state + ", error on event creation", e); return null; } } @@ -284,13 +284,13 @@ public class ApexEngineImpl implements ApexEngine { public boolean handleEvent(final EnEvent incomingEvent) { boolean ret = false; if (incomingEvent == null) { - LOGGER.warn("handleEvent()<-" + key.getID() + "," + state + ", cannot run engine, incoming event is null"); + LOGGER.warn("handleEvent()<-" + key.getId() + "," + state + ", cannot run engine, incoming event is null"); return ret; } synchronized (state) { if (state != AxEngineState.READY) { - LOGGER.warn("handleEvent()<-" + key.getID() + "," + state + LOGGER.warn("handleEvent()<-" + key.getId() + "," + state + ", cannot run engine, engine not in state READY"); return ret; } @@ -308,7 +308,7 @@ public class ApexEngineImpl implements ApexEngine { engineStats.executionExit(); ret = true; } catch (final StateMachineException e) { - LOGGER.warn("handleEvent()<-" + key.getID() + "," + state + ", engine execution error: ", e); + LOGGER.warn("handleEvent()<-" + key.getId() + "," + state + ", engine execution error: ", e); // Create an exception return event outgoingEvent = createExceptionEvent(incomingEvent, e); @@ -318,7 +318,7 @@ public class ApexEngineImpl implements ApexEngine { try { synchronized (eventListeners) { if (eventListeners.isEmpty()) { - LOGGER.debug("handleEvent()<-" + key.getID() + "," + state + LOGGER.debug("handleEvent()<-" + key.getId() + "," + state + ", There is no listener registered to recieve outgoing event: " + outgoingEvent); } for (final EnEventListener axEventListener : eventListeners.values()) { @@ -326,7 +326,7 @@ public class ApexEngineImpl implements ApexEngine { } } } catch (final ApexException e) { - LOGGER.warn("handleEvent()<-" + key.getID() + "," + state + ", outgoing event publishing error: ", e); + LOGGER.warn("handleEvent()<-" + key.getId() + "," + state + ", outgoing event publishing error: ", e); ret = false; } synchronized (state) { diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/StateMachineHandler.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/StateMachineHandler.java index f17d7f825..5ade06537 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/StateMachineHandler.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/StateMachineHandler.java @@ -71,7 +71,7 @@ public class StateMachineHandler { * @throws StateMachineException On state machine initiation errors */ protected StateMachineHandler(final ApexInternalContext internalContext) throws StateMachineException { - LOGGER.entry("StateMachineHandler()->" + internalContext.getKey().getID()); + LOGGER.entry("StateMachineHandler()->" + internalContext.getKey().getId()); key = internalContext.getKey(); @@ -97,17 +97,17 @@ public class StateMachineHandler { if (lastStateMachineExecutor != null && lastStateMachineExecutor.getSubject() != thisStateMachineExecutor.getSubject()) { LOGGER.error("No more than one policy in a model can have the same trigger event. In model " - + internalContext.getKey().getID() + " Policy (" - + lastStateMachineExecutor.getSubject().getKey().getID() + ") and Policy (" - + thisStateMachineExecutor.getSubject().getKey().getID() + ") have the same Trigger event (" - + triggerEvent.getKey().getID() + ") "); + + internalContext.getKey().getId() + " Policy (" + + lastStateMachineExecutor.getSubject().getKey().getId() + ") and Policy (" + + thisStateMachineExecutor.getSubject().getKey().getId() + ") have the same Trigger event (" + + triggerEvent.getKey().getId() + ") "); LOGGER.error(" Policy (" + lastStateMachineExecutor.getSubject().getKey() + ") has overwritten Policy (" - + thisStateMachineExecutor.getSubject().getKey().getID() + + thisStateMachineExecutor.getSubject().getKey().getId() + " so this overwritten policy will never be triggered in this engine."); } } - LOGGER.exit("StateMachineHandler()<-" + internalContext.getKey().getID()); + LOGGER.exit("StateMachineHandler()<-" + internalContext.getKey().getId()); } /** @@ -117,21 +117,21 @@ public class StateMachineHandler { * @throws StateMachineException On state machine initiation errors */ protected void start() throws StateMachineException { - LOGGER.entry("start()->" + key.getID()); + LOGGER.entry("start()->" + key.getId()); // Iterate over the state machines for (final StateMachineExecutor smExecutor : stateMachineExecutorMap.values()) { try { smExecutor.prepare(); } catch (final StateMachineException e) { - final String stateMachineID = smExecutor.getContext().getKey().getID(); - LOGGER.warn("start()<-" + key.getID() + ", start failed, state machine \"" + stateMachineID + "\"", e); + final String stateMachineID = smExecutor.getContext().getKey().getId(); + LOGGER.warn("start()<-" + key.getId() + ", start failed, state machine \"" + stateMachineID + "\"", e); throw new StateMachineException( - "start()<-" + key.getID() + ", start failed, state machine \"" + stateMachineID + "\"", e); + "start()<-" + key.getId() + ", start failed, state machine \"" + stateMachineID + "\"", e); } } - LOGGER.exit("start()<-" + key.getID()); + LOGGER.exit("start()<-" + key.getId()); } /** @@ -180,7 +180,7 @@ public class StateMachineHandler { try { smExecutor.cleanUp(); } catch (final StateMachineException e) { - final String smID = smExecutor.getContext().getKey().getID(); + final String smID = smExecutor.getContext().getKey().getId(); LOGGER.warn("stop()<-clean up failed, state machine \"" + smID + "\" cleanup failed", e); } } diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java index 6fbf647b4..109240c0d 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java @@ -123,7 +123,7 @@ public class EnEvent extends HashMap { * @return the event key */ public String getID() { - return axEvent.getKey().getID(); + return axEvent.getKey().getId(); } /** diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java index 5f12e8764..a7ce251bd 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java @@ -65,7 +65,7 @@ public class EnField implements Serializable { try { schemaHelper = new SchemaHelperFactory().createSchemaHelper(axField.getKey(), axField.getSchema()); } catch (final ContextRuntimeException e) { - final String message = "schema helper cannot be created for parameter with key \"" + axField.getID() + final String message = "schema helper cannot be created for parameter with key \"" + axField.getId() + "\" with schema \"" + axField.getSchema() + "\""; LOGGER.warn(message, e); throw new EnException(message, e); diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateExecutor.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateExecutor.java index cad83d6bc..9cf7d90e3 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateExecutor.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateExecutor.java @@ -131,7 +131,7 @@ public class StateExecutor implements Executor newIncomingFields) throws StateMachineException, ContextException { - LOGGER.debug("execute-pre:" + finalizerLogic.getLogicFlavour() + "," + getSubject().getID() + "," + LOGGER.debug("execute-pre:" + finalizerLogic.getLogicFlavour() + "," + getSubject().getId() + "," + finalizerLogic.getLogic()); // Record the incoming fields @@ -141,8 +141,8 @@ public abstract class StateFinalizerExecutor @Override public final void executePost(final boolean returnValue) throws StateMachineException, ContextException { if (!returnValue) { - String errorMessage = "execute-post: state finalizer logic execution failure on state \"" + axState.getID() - + "\" on finalizer logic " + finalizerLogic.getID(); + String errorMessage = "execute-post: state finalizer logic execution failure on state \"" + axState.getId() + + "\" on finalizer logic " + finalizerLogic.getId(); if (executionContext.getMessage() != null) { errorMessage += ", user message: " + executionContext.getMessage(); } @@ -152,22 +152,22 @@ public abstract class StateFinalizerExecutor // Check a state output has been selected if (getOutgoing() == null) { - LOGGER.warn("execute-post: state finalizer logic \"" + finalizerLogic.getID() + LOGGER.warn("execute-post: state finalizer logic \"" + finalizerLogic.getId() + "\" did not select an output state"); - throw new StateMachineException("execute-post: state finalizer logic \"" + finalizerLogic.getID() + throw new StateMachineException("execute-post: state finalizer logic \"" + finalizerLogic.getId() + "\" did not select an output state"); } if (!axState.getStateOutputs().keySet().contains(getOutgoing())) { LOGGER.warn( - "execute-post: state finalizer logic \"" + finalizerLogic.getID() + "\" selected output state \"" - + getOutgoing() + "\" that does not exsist on state \"" + axState.getID() + "\""); + "execute-post: state finalizer logic \"" + finalizerLogic.getId() + "\" selected output state \"" + + getOutgoing() + "\" that does not exsist on state \"" + axState.getId() + "\""); throw new StateMachineException( - "execute-post: state finalizer logic \"" + finalizerLogic.getID() + "\" selected output state \"" - + getOutgoing() + "\" that does not exsist on state \"" + axState.getID() + "\""); + "execute-post: state finalizer logic \"" + finalizerLogic.getId() + "\" selected output state \"" + + getOutgoing() + "\" that does not exsist on state \"" + axState.getId() + "\""); } - LOGGER.debug("execute-post:" + finalizerLogic.getID() + ", returning state output \"" + getOutgoing() + LOGGER.debug("execute-post:" + finalizerLogic.getId() + ", returning state output \"" + getOutgoing() + " and fields " + incomingFields); } diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateMachineExecutor.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateMachineExecutor.java index 7a9594bf8..07ef8d6d6 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateMachineExecutor.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/StateMachineExecutor.java @@ -161,7 +161,7 @@ public class StateMachineExecutor implements Executor incomingFieldEntry : eventFieldMap.entrySet()) { @@ -120,7 +120,7 @@ public class StateOutput { // Check if this field is a field in the event if (!outputEventDef.getFields().contains(fieldDef)) { throw new StateMachineException( - "field \"" + fieldName + "\" does not exist on event \"" + outputEventDef.getID() + "\""); + "field \"" + fieldName + "\" does not exist on event \"" + outputEventDef.getId() + "\""); } // Set the value in the output event diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskExecutor.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskExecutor.java index 9f6f92d4e..8dd2575b0 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskExecutor.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskExecutor.java @@ -99,7 +99,7 @@ public abstract class TaskExecutor */ @Override public void prepare() throws StateMachineException { - LOGGER.debug("prepare:" + axTask.getKey().getID() + "," + axTask.getTaskLogic().getLogicFlavour() + "," + LOGGER.debug("prepare:" + axTask.getKey().getId() + "," + axTask.getTaskLogic().getLogicFlavour() + "," + axTask.getTaskLogic().getLogic()); argumentNotNull(axTask.getTaskLogic().getLogic(), StateMachineException.class, "task logic cannot be null."); } @@ -127,7 +127,7 @@ public abstract class TaskExecutor public final void executePre(final long executionID, final Map newIncomingFields) throws StateMachineException, ContextException { LOGGER.debug("execute-pre:" + getSubject().getTaskLogic().getLogicFlavour() + "," - + getSubject().getKey().getID() + "," + getSubject().getTaskLogic().getLogic()); + + getSubject().getKey().getId() + "," + getSubject().getTaskLogic().getLogic()); // Check that the incoming event has all the input fields for this state final Set missingTaskInputFields = new TreeSet<>(axTask.getInputFields().keySet()); @@ -143,7 +143,7 @@ public abstract class TaskExecutor } if (!missingTaskInputFields.isEmpty()) { throw new StateMachineException("task input fields \"" + missingTaskInputFields - + "\" are missing for task \"" + axTask.getKey().getID() + "\""); + + "\" are missing for task \"" + axTask.getKey().getId() + "\""); } // Record the incoming fields @@ -169,7 +169,7 @@ public abstract class TaskExecutor public final void executePost(final boolean returnValue) throws StateMachineException, ContextException { if (!returnValue) { String errorMessage = "execute-post: task logic execution failure on task \"" + axTask.getKey().getName() - + "\" in model " + internalContext.getKey().getID(); + + "\" in model " + internalContext.getKey().getId(); if (executionContext.getMessage() != null) { errorMessage += ", user message: " + executionContext.getMessage(); } @@ -215,7 +215,7 @@ public abstract class TaskExecutor } if (!missingTaskOutputFields.isEmpty()) { throw new StateMachineException("task output fields \"" + missingTaskOutputFields - + "\" are missing for task \"" + axTask.getKey().getID() + "\""); + + "\" are missing for task \"" + axTask.getKey().getId() + "\""); } // Finally, check that the outgoing field map don't have any extra fields, if present, raise @@ -225,10 +225,10 @@ public abstract class TaskExecutor extraTaskOutputFields.removeAll(axTask.getOutputFields().keySet()); if (!extraTaskOutputFields.isEmpty()) { throw new StateMachineException("task output fields \"" + extraTaskOutputFields - + "\" are unwanted for task \"" + axTask.getKey().getID() + "\""); + + "\" are unwanted for task \"" + axTask.getKey().getId() + "\""); } - LOGGER.debug("execute-post:" + axTask.getKey().getID() + ", returning fields " + outgoingFields.toString()); + LOGGER.debug("execute-post:" + axTask.getKey().getId() + ", returning fields " + outgoingFields.toString()); } /* diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutor.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutor.java index f3ac1f6b0..cda0ac549 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutor.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutor.java @@ -92,7 +92,7 @@ public abstract class TaskSelectExecutor implements Executor