Merge "Filter versions by state"

diff --cc workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
index 6b22d58,44ce90a..7027985
--- 1/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
--- 2/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
@@@ -1,21 -1,6 +1,22 @@@
 +/*
 + * Copyright © 2018 European Support Limited
 + *
 + * 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.
 + */
 +
  package org.onap.sdc.workflow.api;
  
+ import static org.onap.sdc.workflow.RestUtils.mapVersionStateFilter;
  import static org.onap.sdc.workflow.api.RestConstants.SIZE_DEFAULT;
  import static org.onap.sdc.workflow.api.RestConstants.SORT_FIELD_NAME;
  import static org.onap.sdc.workflow.api.RestConstants.SORT_PARAM;

diff --cc workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
index 3cad7ad,57b8e13..d5b94a1
--- 1/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
--- 2/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
@@@ -1,21 -1,6 +1,22 @@@
 +/*
 + * Copyright © 2018 European Support Limited
 + *
 + * 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.
 + */
 +
  package org.onap.sdc.workflow.api;
  
+ import static org.onap.sdc.workflow.RestUtils.mapVersionStateFilter;
  import static org.onap.sdc.workflow.api.RestConstants.USER_ID_HEADER_PARAM;
  
  import io.swagger.annotations.Api;

diff --cc workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java
Simple merge

diff --cc workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java
Simple merge