5353public class WorkflowServiceBean {
5454
5555 private static final Logger logger = Logger .getLogger (WorkflowServiceBean .class .getName ());
56- private static final String WORKFLOW_ID_KEY = "WorkflowServiceBean.WorkflowId:" ;
5756
5857 @ PersistenceContext (unitName = "VDCNet-ejbPU" )
5958 EntityManager em ;
@@ -452,7 +451,7 @@ public boolean deleteWorkflow(long workflowId) {
452451 if (doomedOpt .isPresent ()) {
453452 // validate that this is not the default workflow
454453 for ( WorkflowContext .TriggerType tp : WorkflowContext .TriggerType .values () ) {
455- String defaultWorkflowId = settings .get ( workflowSettingKey ( tp ));
454+ String defaultWorkflowId = settings .getValueForKey ( tp . getKey ( ));
456455 if (defaultWorkflowId != null
457456 && Long .parseLong (defaultWorkflowId ) == doomedOpt .get ().getId ()) {
458457 throw new IllegalArgumentException ("Workflow " + workflowId + " cannot be deleted as it is the default workflow for trigger " + tp .name () );
@@ -476,7 +475,7 @@ public PendingWorkflowInvocation getPendingWorkflow(String invocationId) {
476475 }
477476
478477 public Optional <Workflow > getDefaultWorkflow ( WorkflowContext .TriggerType type ) {
479- String defaultWorkflowId = settings .get ( workflowSettingKey ( type ));
478+ String defaultWorkflowId = settings .getValueForKey ( type . getKey ( ));
480479 if (defaultWorkflowId == null ) {
481480 return Optional .empty ();
482481 }
@@ -491,18 +490,13 @@ public Optional<Workflow> getDefaultWorkflow( WorkflowContext.TriggerType type )
491490 * @param type type of the workflow.
492491 */
493492 public void setDefaultWorkflowId (WorkflowContext .TriggerType type , Long id ) {
494- String workflowKey = workflowSettingKey (type );
495493 if (id == null ) {
496- settings .delete ( workflowKey );
494+ settings .deleteValueForKey ( type . getKey () );
497495 } else {
498- settings .set ( workflowKey , id .toString ());
496+ settings .setValueForKey ( type . getKey () , id .toString ());
499497 }
500498 }
501499
502- private String workflowSettingKey (WorkflowContext .TriggerType type ) {
503- return WORKFLOW_ID_KEY +type .name ();
504- }
505-
506500 private WorkflowStep createStep (WorkflowStepData wsd ) {
507501 WorkflowStepSPI provider = providers .get (wsd .getProviderId ());
508502 if (provider == null ) {
0 commit comments