diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/util/Statements.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/util/Statements.java
index a6ea122538..38eff7d841 100644
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/util/Statements.java
+++ b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/util/Statements.java
@@ -289,7 +289,9 @@ public String getDeleteTaskDefStatement() {
     // ExecutionDAO
     // Insert Statements
 
-    /** @return cql query statement to insert a new workflow into the "workflows" table */
+    /**
+     * @return cql query statement to insert a new workflow into the "workflows" table
+     */
     public String getInsertWorkflowStatement() {
         return QueryBuilder.insertInto(keyspace, TABLE_WORKFLOWS)
                 .value(WORKFLOW_ID_KEY, bindMarker())
@@ -302,7 +304,9 @@ public String getInsertWorkflowStatement() {
                 .getQueryString();
     }
 
-    /** @return cql query statement to insert a new task into the "workflows" table */
+    /**
+     * @return cql query statement to insert a new task into the "workflows" table
+     */
     public String getInsertTaskStatement() {
         return QueryBuilder.insertInto(keyspace, TABLE_WORKFLOWS)
                 .value(WORKFLOW_ID_KEY, bindMarker())
@@ -340,7 +344,9 @@ public String getSelectTotalStatement() {
                 .getQueryString();
     }
 
-    /** @return cql query statement to retrieve a task from the "workflows" table */
+    /**
+     * @return cql query statement to retrieve a task from the "workflows" table
+     */
     public String getSelectTaskStatement() {
         return QueryBuilder.select(PAYLOAD_KEY)
                 .from(keyspace, TABLE_WORKFLOWS)
@@ -414,7 +420,9 @@ public String getSelectAllEventExecutionsForMessageFromEventExecutionsStatement(
 
     // Update Statements
 
-    /** @return cql query statement to update a workflow in the "workflows" table */
+    /**
+     * @return cql query statement to update a workflow in the "workflows" table
+     */
     public String getUpdateWorkflowStatement() {
         return QueryBuilder.update(keyspace, TABLE_WORKFLOWS)
                 .with(set(PAYLOAD_KEY, bindMarker()))
@@ -461,7 +469,9 @@ public String getUpdateTaskLookupStatement() {
                 .getQueryString();
     }
 
-    /** @return cql query statement to add a new task_id to the "task_def_limit" table */
+    /**
+     * @return cql query statement to add a new task_id to the "task_def_limit" table
+     */
     public String getUpdateTaskDefLimitStatement() {
         return QueryBuilder.update(keyspace, TABLE_TASK_DEF_LIMIT)
                 .with(set(WORKFLOW_ID_KEY, bindMarker()))
@@ -470,7 +480,9 @@ public String getUpdateTaskDefLimitStatement() {
                 .getQueryString();
     }
 
-    /** @return cql query statement to update an event execution in the "event_executions" table */
+    /**
+     * @return cql query statement to update an event execution in the "event_executions" table
+     */
     public String getUpdateEventExecutionStatement() {
         return QueryBuilder.update(keyspace, TABLE_EVENT_EXECUTIONS)
                 .using(QueryBuilder.ttl(bindMarker()))
@@ -483,7 +495,9 @@ public String getUpdateEventExecutionStatement() {
 
     // Delete statements
 
-    /** @return cql query statement to delete a workflow from the "workflows" table */
+    /**
+     * @return cql query statement to delete a workflow from the "workflows" table
+     */
     public String getDeleteWorkflowStatement() {
         return QueryBuilder.delete()
                 .from(keyspace, TABLE_WORKFLOWS)
@@ -503,7 +517,9 @@ public String getDeleteTaskLookupStatement() {
                 .getQueryString();
     }
 
-    /** @return cql query statement to delete a task from the "workflows" table */
+    /**
+     * @return cql query statement to delete a task from the "workflows" table
+     */
     public String getDeleteTaskStatement() {
         return QueryBuilder.delete()
                 .from(keyspace, TABLE_WORKFLOWS)
@@ -514,7 +530,9 @@ public String getDeleteTaskStatement() {
                 .getQueryString();
     }
 
-    /** @return cql query statement to delete a task_id from the "task_def_limit" table */
+    /**
+     * @return cql query statement to delete a task_id from the "task_def_limit" table
+     */
     public String getDeleteTaskDefLimitStatement() {
         return QueryBuilder.delete()
                 .from(keyspace, TABLE_TASK_DEF_LIMIT)
@@ -523,7 +541,9 @@ public String getDeleteTaskDefLimitStatement() {
                 .getQueryString();
     }
 
-    /** @return cql query statement to delete an event execution from the "event_execution" table */
+    /**
+     * @return cql query statement to delete an event execution from the "event_execution" table
+     */
     public String getDeleteEventExecutionsStatement() {
         return QueryBuilder.delete()
                 .from(keyspace, TABLE_EVENT_EXECUTIONS)
@@ -536,7 +556,9 @@ public String getDeleteEventExecutionsStatement() {
     // EventHandlerDAO
     // Insert Statements
 
-    /** @return cql query statement to insert an event handler into the "event_handlers" table */
+    /**
+     * @return cql query statement to insert an event handler into the "event_handlers" table
+     */
     public String getInsertEventHandlerStatement() {
         return QueryBuilder.insertInto(keyspace, TABLE_EVENT_HANDLERS)
                 .value(HANDLERS_KEY, HANDLERS_KEY)
diff --git a/client/src/main/java/com/netflix/conductor/client/automator/TaskRunnerConfigurer.java b/client/src/main/java/com/netflix/conductor/client/automator/TaskRunnerConfigurer.java
index 1b7dbab030..bb3cfa1c48 100644
--- a/client/src/main/java/com/netflix/conductor/client/automator/TaskRunnerConfigurer.java
+++ b/client/src/main/java/com/netflix/conductor/client/automator/TaskRunnerConfigurer.java
@@ -198,17 +198,23 @@ public TaskRunnerConfigurer build() {
         }
     }
 
-    /** @return Thread Count for the shared executor pool */
+    /**
+     * @return Thread Count for the shared executor pool
+     */
     public int getThreadCount() {
         return threadCount;
     }
 
-    /** @return Thread Count for individual task type */
+    /**
+     * @return Thread Count for individual task type
+     */
     public Map<String, Integer> getTaskThreadCount() {
         return taskThreadCount;
     }
 
-    /** @return seconds before forcing shutdown of worker */
+    /**
+     * @return seconds before forcing shutdown of worker
+     */
     public int getShutdownGracePeriodSeconds() {
         return shutdownGracePeriodSeconds;
     }
@@ -229,7 +235,9 @@ public int getUpdateRetryCount() {
         return updateRetryCount;
     }
 
-    /** @return prefix used for worker names */
+    /**
+     * @return prefix used for worker names
+     */
     public String getWorkerNamePrefix() {
         return workerNamePrefix;
     }
diff --git a/client/src/main/java/com/netflix/conductor/client/http/EventClient.java b/client/src/main/java/com/netflix/conductor/client/http/EventClient.java
index 970b919db3..46bf00d558 100644
--- a/client/src/main/java/com/netflix/conductor/client/http/EventClient.java
+++ b/client/src/main/java/com/netflix/conductor/client/http/EventClient.java
@@ -36,7 +36,9 @@ public EventClient() {
         this(new DefaultClientConfig(), new DefaultConductorClientConfiguration(), null);
     }
 
-    /** @param clientConfig REST Client configuration */
+    /**
+     * @param clientConfig REST Client configuration
+     */
     public EventClient(ClientConfig clientConfig) {
         this(clientConfig, new DefaultConductorClientConfiguration(), null);
     }
diff --git a/client/src/main/java/com/netflix/conductor/client/http/MetadataClient.java b/client/src/main/java/com/netflix/conductor/client/http/MetadataClient.java
index 50f014ea2f..f27e843085 100644
--- a/client/src/main/java/com/netflix/conductor/client/http/MetadataClient.java
+++ b/client/src/main/java/com/netflix/conductor/client/http/MetadataClient.java
@@ -34,7 +34,9 @@ public MetadataClient() {
         this(new DefaultClientConfig(), new DefaultConductorClientConfiguration(), null);
     }
 
-    /** @param clientConfig REST Client configuration */
+    /**
+     * @param clientConfig REST Client configuration
+     */
     public MetadataClient(ClientConfig clientConfig) {
         this(clientConfig, new DefaultConductorClientConfiguration(), null);
     }
diff --git a/client/src/main/java/com/netflix/conductor/client/http/TaskClient.java b/client/src/main/java/com/netflix/conductor/client/http/TaskClient.java
index 54aa0f47e4..18889cba35 100644
--- a/client/src/main/java/com/netflix/conductor/client/http/TaskClient.java
+++ b/client/src/main/java/com/netflix/conductor/client/http/TaskClient.java
@@ -69,7 +69,9 @@ public TaskClient() {
         this(new DefaultClientConfig(), new DefaultConductorClientConfiguration(), null);
     }
 
-    /** @param config REST Client configuration */
+    /**
+     * @param config REST Client configuration
+     */
     public TaskClient(ClientConfig config) {
         this(config, new DefaultConductorClientConfiguration(), null);
     }
diff --git a/client/src/main/java/com/netflix/conductor/client/http/WorkflowClient.java b/client/src/main/java/com/netflix/conductor/client/http/WorkflowClient.java
index 3bc445bdae..a75129f136 100644
--- a/client/src/main/java/com/netflix/conductor/client/http/WorkflowClient.java
+++ b/client/src/main/java/com/netflix/conductor/client/http/WorkflowClient.java
@@ -54,7 +54,9 @@ public WorkflowClient() {
         this(new DefaultClientConfig(), new DefaultConductorClientConfiguration(), null);
     }
 
-    /** @param config REST Client configuration */
+    /**
+     * @param config REST Client configuration
+     */
     public WorkflowClient(ClientConfig config) {
         this(config, new DefaultConductorClientConfiguration(), null);
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/Auditable.java b/common/src/main/java/com/netflix/conductor/common/metadata/Auditable.java
index 268754152f..01f2294809 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/Auditable.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/Auditable.java
@@ -24,52 +24,72 @@ public abstract class Auditable {
 
     private String updatedBy;
 
-    /** @return the ownerApp */
+    /**
+     * @return the ownerApp
+     */
     public String getOwnerApp() {
         return ownerApp;
     }
 
-    /** @param ownerApp the ownerApp to set */
+    /**
+     * @param ownerApp the ownerApp to set
+     */
     public void setOwnerApp(String ownerApp) {
         this.ownerApp = ownerApp;
     }
 
-    /** @return the createTime */
+    /**
+     * @return the createTime
+     */
     public Long getCreateTime() {
         return createTime;
     }
 
-    /** @param createTime the createTime to set */
+    /**
+     * @param createTime the createTime to set
+     */
     public void setCreateTime(Long createTime) {
         this.createTime = createTime;
     }
 
-    /** @return the updateTime */
+    /**
+     * @return the updateTime
+     */
     public Long getUpdateTime() {
         return updateTime;
     }
 
-    /** @param updateTime the updateTime to set */
+    /**
+     * @param updateTime the updateTime to set
+     */
     public void setUpdateTime(Long updateTime) {
         this.updateTime = updateTime;
     }
 
-    /** @return the createdBy */
+    /**
+     * @return the createdBy
+     */
     public String getCreatedBy() {
         return createdBy;
     }
 
-    /** @param createdBy the createdBy to set */
+    /**
+     * @param createdBy the createdBy to set
+     */
     public void setCreatedBy(String createdBy) {
         this.createdBy = createdBy;
     }
 
-    /** @return the updatedBy */
+    /**
+     * @return the updatedBy
+     */
     public String getUpdatedBy() {
         return updatedBy;
     }
 
-    /** @param updatedBy the updatedBy to set */
+    /**
+     * @param updatedBy the updatedBy to set
+     */
     public void setUpdatedBy(String updatedBy) {
         this.updatedBy = updatedBy;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventExecution.java b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventExecution.java
index 65a740774c..d6a2065e66 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventExecution.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventExecution.java
@@ -63,82 +63,114 @@ public EventExecution(String id, String messageId) {
         this.messageId = messageId;
     }
 
-    /** @return the id */
+    /**
+     * @return the id
+     */
     public String getId() {
         return id;
     }
 
-    /** @param id the id to set */
+    /**
+     * @param id the id to set
+     */
     public void setId(String id) {
         this.id = id;
     }
 
-    /** @return the messageId */
+    /**
+     * @return the messageId
+     */
     public String getMessageId() {
         return messageId;
     }
 
-    /** @param messageId the messageId to set */
+    /**
+     * @param messageId the messageId to set
+     */
     public void setMessageId(String messageId) {
         this.messageId = messageId;
     }
 
-    /** @return the name */
+    /**
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
-    /** @param name the name to set */
+    /**
+     * @param name the name to set
+     */
     public void setName(String name) {
         this.name = name;
     }
 
-    /** @return the event */
+    /**
+     * @return the event
+     */
     public String getEvent() {
         return event;
     }
 
-    /** @param event the event to set */
+    /**
+     * @param event the event to set
+     */
     public void setEvent(String event) {
         this.event = event;
     }
 
-    /** @return the created */
+    /**
+     * @return the created
+     */
     public long getCreated() {
         return created;
     }
 
-    /** @param created the created to set */
+    /**
+     * @param created the created to set
+     */
     public void setCreated(long created) {
         this.created = created;
     }
 
-    /** @return the status */
+    /**
+     * @return the status
+     */
     public Status getStatus() {
         return status;
     }
 
-    /** @param status the status to set */
+    /**
+     * @param status the status to set
+     */
     public void setStatus(Status status) {
         this.status = status;
     }
 
-    /** @return the action */
+    /**
+     * @return the action
+     */
     public Action.Type getAction() {
         return action;
     }
 
-    /** @param action the action to set */
+    /**
+     * @param action the action to set
+     */
     public void setAction(Action.Type action) {
         this.action = action;
     }
 
-    /** @return the output */
+    /**
+     * @return the output
+     */
     public Map<String, Object> getOutput() {
         return output;
     }
 
-    /** @param output the output to set */
+    /**
+     * @param output the output to set
+     */
     public void setOutput(Map<String, Object> output) {
         this.output = output;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java
index fe8c9f042c..77dda4c1ef 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java
@@ -56,62 +56,86 @@ public class EventHandler {
 
     public EventHandler() {}
 
-    /** @return the name MUST be unique within a conductor instance */
+    /**
+     * @return the name MUST be unique within a conductor instance
+     */
     public String getName() {
         return name;
     }
 
-    /** @param name the name to set */
+    /**
+     * @param name the name to set
+     */
     public void setName(String name) {
         this.name = name;
     }
 
-    /** @return the event */
+    /**
+     * @return the event
+     */
     public String getEvent() {
         return event;
     }
 
-    /** @param event the event to set */
+    /**
+     * @param event the event to set
+     */
     public void setEvent(String event) {
         this.event = event;
     }
 
-    /** @return the condition */
+    /**
+     * @return the condition
+     */
     public String getCondition() {
         return condition;
     }
 
-    /** @param condition the condition to set */
+    /**
+     * @param condition the condition to set
+     */
     public void setCondition(String condition) {
         this.condition = condition;
     }
 
-    /** @return the actions */
+    /**
+     * @return the actions
+     */
     public List<Action> getActions() {
         return actions;
     }
 
-    /** @param actions the actions to set */
+    /**
+     * @param actions the actions to set
+     */
     public void setActions(List<Action> actions) {
         this.actions = actions;
     }
 
-    /** @return the active */
+    /**
+     * @return the active
+     */
     public boolean isActive() {
         return active;
     }
 
-    /** @param active if set to false, the event handler is deactivated */
+    /**
+     * @param active if set to false, the event handler is deactivated
+     */
     public void setActive(boolean active) {
         this.active = active;
     }
 
-    /** @return the evaluator type */
+    /**
+     * @return the evaluator type
+     */
     public String getEvaluatorType() {
         return evaluatorType;
     }
 
-    /** @param evaluatorType the evaluatorType to set */
+    /**
+     * @param evaluatorType the evaluatorType to set
+     */
     public void setEvaluatorType(String evaluatorType) {
         this.evaluatorType = evaluatorType;
     }
@@ -141,42 +165,58 @@ public enum Type {
         @ProtoField(id = 5)
         private boolean expandInlineJSON;
 
-        /** @return the action */
+        /**
+         * @return the action
+         */
         public Type getAction() {
             return action;
         }
 
-        /** @param action the action to set */
+        /**
+         * @param action the action to set
+         */
         public void setAction(Type action) {
             this.action = action;
         }
 
-        /** @return the start_workflow */
+        /**
+         * @return the start_workflow
+         */
         public StartWorkflow getStart_workflow() {
             return start_workflow;
         }
 
-        /** @param start_workflow the start_workflow to set */
+        /**
+         * @param start_workflow the start_workflow to set
+         */
         public void setStart_workflow(StartWorkflow start_workflow) {
             this.start_workflow = start_workflow;
         }
 
-        /** @return the complete_task */
+        /**
+         * @return the complete_task
+         */
         public TaskDetails getComplete_task() {
             return complete_task;
         }
 
-        /** @param complete_task the complete_task to set */
+        /**
+         * @param complete_task the complete_task to set
+         */
         public void setComplete_task(TaskDetails complete_task) {
             this.complete_task = complete_task;
         }
 
-        /** @return the fail_task */
+        /**
+         * @return the fail_task
+         */
         public TaskDetails getFail_task() {
             return fail_task;
         }
 
-        /** @param fail_task the fail_task to set */
+        /**
+         * @param fail_task the fail_task to set
+         */
         public void setFail_task(TaskDetails fail_task) {
             this.fail_task = fail_task;
         }
@@ -189,7 +229,9 @@ public void setExpandInlineJSON(boolean expandInlineJSON) {
             this.expandInlineJSON = expandInlineJSON;
         }
 
-        /** @return true if the json strings within the payload should be expanded. */
+        /**
+         * @return true if the json strings within the payload should be expanded.
+         */
         public boolean isExpandInlineJSON() {
             return expandInlineJSON;
         }
@@ -214,32 +256,44 @@ public static class TaskDetails {
         @ProtoField(id = 5)
         private String taskId;
 
-        /** @return the workflowId */
+        /**
+         * @return the workflowId
+         */
         public String getWorkflowId() {
             return workflowId;
         }
 
-        /** @param workflowId the workflowId to set */
+        /**
+         * @param workflowId the workflowId to set
+         */
         public void setWorkflowId(String workflowId) {
             this.workflowId = workflowId;
         }
 
-        /** @return the taskRefName */
+        /**
+         * @return the taskRefName
+         */
         public String getTaskRefName() {
             return taskRefName;
         }
 
-        /** @param taskRefName the taskRefName to set */
+        /**
+         * @param taskRefName the taskRefName to set
+         */
         public void setTaskRefName(String taskRefName) {
             this.taskRefName = taskRefName;
         }
 
-        /** @return the output */
+        /**
+         * @return the output
+         */
         public Map<String, Object> getOutput() {
             return output;
         }
 
-        /** @param output the output to set */
+        /**
+         * @param output the output to set
+         */
         public void setOutput(Map<String, Object> output) {
             this.output = output;
         }
@@ -252,12 +306,16 @@ public void setOutputMessage(Any outputMessage) {
             this.outputMessage = outputMessage;
         }
 
-        /** @return the taskId */
+        /**
+         * @return the taskId
+         */
         public String getTaskId() {
             return taskId;
         }
 
-        /** @param taskId the taskId to set */
+        /**
+         * @param taskId the taskId to set
+         */
         public void setTaskId(String taskId) {
             this.taskId = taskId;
         }
@@ -285,42 +343,58 @@ public static class StartWorkflow {
         @ProtoField(id = 6)
         private Map<String, String> taskToDomain;
 
-        /** @return the name */
+        /**
+         * @return the name
+         */
         public String getName() {
             return name;
         }
 
-        /** @param name the name to set */
+        /**
+         * @param name the name to set
+         */
         public void setName(String name) {
             this.name = name;
         }
 
-        /** @return the version */
+        /**
+         * @return the version
+         */
         public Integer getVersion() {
             return version;
         }
 
-        /** @param version the version to set */
+        /**
+         * @param version the version to set
+         */
         public void setVersion(Integer version) {
             this.version = version;
         }
 
-        /** @return the correlationId */
+        /**
+         * @return the correlationId
+         */
         public String getCorrelationId() {
             return correlationId;
         }
 
-        /** @param correlationId the correlationId to set */
+        /**
+         * @param correlationId the correlationId to set
+         */
         public void setCorrelationId(String correlationId) {
             this.correlationId = correlationId;
         }
 
-        /** @return the input */
+        /**
+         * @return the input
+         */
         public Map<String, Object> getInput() {
             return input;
         }
 
-        /** @param input the input to set */
+        /**
+         * @param input the input to set
+         */
         public void setInput(Map<String, Object> input) {
             this.input = input;
         }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java
index 82a6a1af21..f510163402 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java
@@ -216,12 +216,16 @@ public void setTaskType(String taskType) {
         this.taskType = taskType;
     }
 
-    /** @return Status of the task */
+    /**
+     * @return Status of the task
+     */
     public Status getStatus() {
         return status;
     }
 
-    /** @param status Status of the task */
+    /**
+     * @param status Status of the task
+     */
     public void setStatus(Status status) {
         this.status = status;
     }
@@ -237,107 +241,149 @@ public void setInputData(Map<String, Object> inputData) {
         this.inputData = inputData;
     }
 
-    /** @return the referenceTaskName */
+    /**
+     * @return the referenceTaskName
+     */
     public String getReferenceTaskName() {
         return referenceTaskName;
     }
 
-    /** @param referenceTaskName the referenceTaskName to set */
+    /**
+     * @param referenceTaskName the referenceTaskName to set
+     */
     public void setReferenceTaskName(String referenceTaskName) {
         this.referenceTaskName = referenceTaskName;
     }
 
-    /** @return the correlationId */
+    /**
+     * @return the correlationId
+     */
     public String getCorrelationId() {
         return correlationId;
     }
 
-    /** @param correlationId the correlationId to set */
+    /**
+     * @param correlationId the correlationId to set
+     */
     public void setCorrelationId(String correlationId) {
         this.correlationId = correlationId;
     }
 
-    /** @return the retryCount */
+    /**
+     * @return the retryCount
+     */
     public int getRetryCount() {
         return retryCount;
     }
 
-    /** @param retryCount the retryCount to set */
+    /**
+     * @param retryCount the retryCount to set
+     */
     public void setRetryCount(int retryCount) {
         this.retryCount = retryCount;
     }
 
-    /** @return the scheduledTime */
+    /**
+     * @return the scheduledTime
+     */
     public long getScheduledTime() {
         return scheduledTime;
     }
 
-    /** @param scheduledTime the scheduledTime to set */
+    /**
+     * @param scheduledTime the scheduledTime to set
+     */
     public void setScheduledTime(long scheduledTime) {
         this.scheduledTime = scheduledTime;
     }
 
-    /** @return the startTime */
+    /**
+     * @return the startTime
+     */
     public long getStartTime() {
         return startTime;
     }
 
-    /** @param startTime the startTime to set */
+    /**
+     * @param startTime the startTime to set
+     */
     public void setStartTime(long startTime) {
         this.startTime = startTime;
     }
 
-    /** @return the endTime */
+    /**
+     * @return the endTime
+     */
     public long getEndTime() {
         return endTime;
     }
 
-    /** @param endTime the endTime to set */
+    /**
+     * @param endTime the endTime to set
+     */
     public void setEndTime(long endTime) {
         this.endTime = endTime;
     }
 
-    /** @return the startDelayInSeconds */
+    /**
+     * @return the startDelayInSeconds
+     */
     public int getStartDelayInSeconds() {
         return startDelayInSeconds;
     }
 
-    /** @param startDelayInSeconds the startDelayInSeconds to set */
+    /**
+     * @param startDelayInSeconds the startDelayInSeconds to set
+     */
     public void setStartDelayInSeconds(int startDelayInSeconds) {
         this.startDelayInSeconds = startDelayInSeconds;
     }
 
-    /** @return the retriedTaskId */
+    /**
+     * @return the retriedTaskId
+     */
     public String getRetriedTaskId() {
         return retriedTaskId;
     }
 
-    /** @param retriedTaskId the retriedTaskId to set */
+    /**
+     * @param retriedTaskId the retriedTaskId to set
+     */
     public void setRetriedTaskId(String retriedTaskId) {
         this.retriedTaskId = retriedTaskId;
     }
 
-    /** @return the seq */
+    /**
+     * @return the seq
+     */
     public int getSeq() {
         return seq;
     }
 
-    /** @param seq the seq to set */
+    /**
+     * @param seq the seq to set
+     */
     public void setSeq(int seq) {
         this.seq = seq;
     }
 
-    /** @return the updateTime */
+    /**
+     * @return the updateTime
+     */
     public long getUpdateTime() {
         return updateTime;
     }
 
-    /** @param updateTime the updateTime to set */
+    /**
+     * @param updateTime the updateTime to set
+     */
     public void setUpdateTime(long updateTime) {
         this.updateTime = updateTime;
     }
 
-    /** @return the queueWaitTime */
+    /**
+     * @return the queueWaitTime
+     */
     public long getQueueWaitTime() {
         if (this.startTime > 0 && this.scheduledTime > 0) {
             if (this.updateTime > 0 && getCallbackAfterSeconds() > 0) {
@@ -352,12 +398,16 @@ public long getQueueWaitTime() {
         return 0L;
     }
 
-    /** @return True if the task has been retried after failure */
+    /**
+     * @return True if the task has been retried after failure
+     */
     public boolean isRetried() {
         return retried;
     }
 
-    /** @param retried the retried to set */
+    /**
+     * @param retried the retried to set
+     */
     public void setRetried(boolean retried) {
         this.retried = retried;
     }
@@ -370,12 +420,16 @@ public boolean isExecuted() {
         return executed;
     }
 
-    /** @param executed the executed value to set */
+    /**
+     * @param executed the executed value to set
+     */
     public void setExecuted(boolean executed) {
         this.executed = executed;
     }
 
-    /** @return No. of times task has been polled */
+    /**
+     * @return No. of times task has been polled
+     */
     public int getPollCount() {
         return pollCount;
     }
@@ -396,7 +450,9 @@ public void setCallbackFromWorker(boolean callbackFromWorker) {
         this.callbackFromWorker = callbackFromWorker;
     }
 
-    /** @return Name of the task definition */
+    /**
+     * @return Name of the task definition
+     */
     public String getTaskDefName() {
         if (taskDefName == null || "".equals(taskDefName)) {
             taskDefName = taskType;
@@ -404,7 +460,9 @@ public String getTaskDefName() {
         return taskDefName;
     }
 
-    /** @param taskDefName Name of the task definition */
+    /**
+     * @param taskDefName Name of the task definition
+     */
     public void setTaskDefName(String taskDefName) {
         this.taskDefName = taskDefName;
     }
@@ -424,12 +482,16 @@ public void setResponseTimeoutSeconds(long responseTimeoutSeconds) {
         this.responseTimeoutSeconds = responseTimeoutSeconds;
     }
 
-    /** @return the workflowInstanceId */
+    /**
+     * @return the workflowInstanceId
+     */
     public String getWorkflowInstanceId() {
         return workflowInstanceId;
     }
 
-    /** @param workflowInstanceId the workflowInstanceId to set */
+    /**
+     * @param workflowInstanceId the workflowInstanceId to set
+     */
     public void setWorkflowInstanceId(String workflowInstanceId) {
         this.workflowInstanceId = workflowInstanceId;
     }
@@ -447,52 +509,72 @@ public com.netflix.conductor.common.metadata.tasks.Task setWorkflowType(String w
         return this;
     }
 
-    /** @return the taskId */
+    /**
+     * @return the taskId
+     */
     public String getTaskId() {
         return taskId;
     }
 
-    /** @param taskId the taskId to set */
+    /**
+     * @param taskId the taskId to set
+     */
     public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
 
-    /** @return the reasonForIncompletion */
+    /**
+     * @return the reasonForIncompletion
+     */
     public String getReasonForIncompletion() {
         return reasonForIncompletion;
     }
 
-    /** @param reasonForIncompletion the reasonForIncompletion to set */
+    /**
+     * @param reasonForIncompletion the reasonForIncompletion to set
+     */
     public void setReasonForIncompletion(String reasonForIncompletion) {
         this.reasonForIncompletion = StringUtils.substring(reasonForIncompletion, 0, 500);
     }
 
-    /** @return the callbackAfterSeconds */
+    /**
+     * @return the callbackAfterSeconds
+     */
     public long getCallbackAfterSeconds() {
         return callbackAfterSeconds;
     }
 
-    /** @param callbackAfterSeconds the callbackAfterSeconds to set */
+    /**
+     * @param callbackAfterSeconds the callbackAfterSeconds to set
+     */
     public void setCallbackAfterSeconds(long callbackAfterSeconds) {
         this.callbackAfterSeconds = callbackAfterSeconds;
     }
 
-    /** @return the workerId */
+    /**
+     * @return the workerId
+     */
     public String getWorkerId() {
         return workerId;
     }
 
-    /** @param workerId the workerId to set */
+    /**
+     * @param workerId the workerId to set
+     */
     public void setWorkerId(String workerId) {
         this.workerId = workerId;
     }
 
-    /** @return the outputData */
+    /**
+     * @return the outputData
+     */
     public Map<String, Object> getOutputData() {
         return outputData;
     }
 
-    /** @param outputData the outputData to set */
+    /**
+     * @param outputData the outputData to set
+     */
     public void setOutputData(Map<String, Object> outputData) {
         if (outputData == null) {
             outputData = new HashMap<>();
@@ -500,22 +582,30 @@ public void setOutputData(Map<String, Object> outputData) {
         this.outputData = outputData;
     }
 
-    /** @return Workflow Task definition */
+    /**
+     * @return Workflow Task definition
+     */
     public WorkflowTask getWorkflowTask() {
         return workflowTask;
     }
 
-    /** @param workflowTask Task definition */
+    /**
+     * @param workflowTask Task definition
+     */
     public void setWorkflowTask(WorkflowTask workflowTask) {
         this.workflowTask = workflowTask;
     }
 
-    /** @return the domain */
+    /**
+     * @return the domain
+     */
     public String getDomain() {
         return domain;
     }
 
-    /** @param domain the Domain */
+    /**
+     * @param domain the Domain
+     */
     public void setDomain(String domain) {
         this.domain = domain;
     }
@@ -536,7 +626,9 @@ public void setOutputMessage(Any outputMessage) {
         this.outputMessage = outputMessage;
     }
 
-    /** @return {@link Optional} containing the task definition if available */
+    /**
+     * @return {@link Optional} containing the task definition if available
+     */
     public Optional<TaskDef> getTaskDefinition() {
         return Optional.ofNullable(this.getWorkflowTask()).map(WorkflowTask::getTaskDefinition);
     }
@@ -557,7 +649,9 @@ public void setRateLimitFrequencyInSeconds(int rateLimitFrequencyInSeconds) {
         this.rateLimitFrequencyInSeconds = rateLimitFrequencyInSeconds;
     }
 
-    /** @return the external storage path for the task input payload */
+    /**
+     * @return the external storage path for the task input payload
+     */
     public String getExternalInputPayloadStoragePath() {
         return externalInputPayloadStoragePath;
     }
@@ -570,7 +664,9 @@ public void setExternalInputPayloadStoragePath(String externalInputPayloadStorag
         this.externalInputPayloadStoragePath = externalInputPayloadStoragePath;
     }
 
-    /** @return the external storage path for the task output payload */
+    /**
+     * @return the external storage path for the task output payload
+     */
     public String getExternalOutputPayloadStoragePath() {
         return externalOutputPayloadStoragePath;
     }
@@ -599,12 +695,16 @@ public void setExecutionNameSpace(String executionNameSpace) {
         this.executionNameSpace = executionNameSpace;
     }
 
-    /** @return the iteration */
+    /**
+     * @return the iteration
+     */
     public int getIteration() {
         return iteration;
     }
 
-    /** @param iteration iteration */
+    /**
+     * @param iteration iteration
+     */
     public void setIteration(int iteration) {
         this.iteration = iteration;
     }
@@ -618,7 +718,9 @@ public int getWorkflowPriority() {
         return workflowPriority;
     }
 
-    /** @param workflowPriority Priority defined for workflow */
+    /**
+     * @param workflowPriority Priority defined for workflow
+     */
     public void setWorkflowPriority(int workflowPriority) {
         this.workflowPriority = workflowPriority;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java
index e36d957746..b518fbb7a7 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java
@@ -158,87 +158,121 @@ public TaskDef(
         this.responseTimeoutSeconds = responseTimeoutSeconds;
     }
 
-    /** @return the name */
+    /**
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
-    /** @param name the name to set */
+    /**
+     * @param name the name to set
+     */
     public void setName(String name) {
         this.name = name;
     }
 
-    /** @return the description */
+    /**
+     * @return the description
+     */
     public String getDescription() {
         return description;
     }
 
-    /** @param description the description to set */
+    /**
+     * @param description the description to set
+     */
     public void setDescription(String description) {
         this.description = description;
     }
 
-    /** @return the retryCount */
+    /**
+     * @return the retryCount
+     */
     public int getRetryCount() {
         return retryCount;
     }
 
-    /** @param retryCount the retryCount to set */
+    /**
+     * @param retryCount the retryCount to set
+     */
     public void setRetryCount(int retryCount) {
         this.retryCount = retryCount;
     }
 
-    /** @return the timeoutSeconds */
+    /**
+     * @return the timeoutSeconds
+     */
     public long getTimeoutSeconds() {
         return timeoutSeconds;
     }
 
-    /** @param timeoutSeconds the timeoutSeconds to set */
+    /**
+     * @param timeoutSeconds the timeoutSeconds to set
+     */
     public void setTimeoutSeconds(long timeoutSeconds) {
         this.timeoutSeconds = timeoutSeconds;
     }
 
-    /** @return Returns the input keys */
+    /**
+     * @return Returns the input keys
+     */
     public List<String> getInputKeys() {
         return inputKeys;
     }
 
-    /** @param inputKeys Set of keys that the task accepts in the input map */
+    /**
+     * @param inputKeys Set of keys that the task accepts in the input map
+     */
     public void setInputKeys(List<String> inputKeys) {
         this.inputKeys = inputKeys;
     }
 
-    /** @return Returns the output keys for the task when executed */
+    /**
+     * @return Returns the output keys for the task when executed
+     */
     public List<String> getOutputKeys() {
         return outputKeys;
     }
 
-    /** @param outputKeys Sets the output keys */
+    /**
+     * @param outputKeys Sets the output keys
+     */
     public void setOutputKeys(List<String> outputKeys) {
         this.outputKeys = outputKeys;
     }
 
-    /** @return the timeoutPolicy */
+    /**
+     * @return the timeoutPolicy
+     */
     public TimeoutPolicy getTimeoutPolicy() {
         return timeoutPolicy;
     }
 
-    /** @param timeoutPolicy the timeoutPolicy to set */
+    /**
+     * @param timeoutPolicy the timeoutPolicy to set
+     */
     public void setTimeoutPolicy(TimeoutPolicy timeoutPolicy) {
         this.timeoutPolicy = timeoutPolicy;
     }
 
-    /** @return the retryLogic */
+    /**
+     * @return the retryLogic
+     */
     public RetryLogic getRetryLogic() {
         return retryLogic;
     }
 
-    /** @param retryLogic the retryLogic to set */
+    /**
+     * @param retryLogic the retryLogic to set
+     */
     public void setRetryLogic(RetryLogic retryLogic) {
         this.retryLogic = retryLogic;
     }
 
-    /** @return the retryDelaySeconds */
+    /**
+     * @return the retryDelaySeconds
+     */
     public int getRetryDelaySeconds() {
         return retryDelaySeconds;
     }
@@ -258,12 +292,16 @@ public void setResponseTimeoutSeconds(long responseTimeoutSeconds) {
         this.responseTimeoutSeconds = responseTimeoutSeconds;
     }
 
-    /** @param retryDelaySeconds the retryDelaySeconds to set */
+    /**
+     * @param retryDelaySeconds the retryDelaySeconds to set
+     */
     public void setRetryDelaySeconds(int retryDelaySeconds) {
         this.retryDelaySeconds = retryDelaySeconds;
     }
 
-    /** @return the inputTemplate */
+    /**
+     * @return the inputTemplate
+     */
     public Map<String, Object> getInputTemplate() {
         return inputTemplate;
     }
@@ -309,17 +347,23 @@ public void setConcurrentExecLimit(Integer concurrentExecLimit) {
         this.concurrentExecLimit = concurrentExecLimit;
     }
 
-    /** @return Limit of number of concurrent task that can be IN_PROGRESS at a given time */
+    /**
+     * @return Limit of number of concurrent task that can be IN_PROGRESS at a given time
+     */
     public Integer getConcurrentExecLimit() {
         return concurrentExecLimit;
     }
 
-    /** @return concurrency limit */
+    /**
+     * @return concurrency limit
+     */
     public int concurrencyLimit() {
         return concurrentExecLimit == null ? 0 : concurrentExecLimit;
     }
 
-    /** @param inputTemplate the inputTemplate to set */
+    /**
+     * @param inputTemplate the inputTemplate to set
+     */
     public void setInputTemplate(Map<String, Object> inputTemplate) {
         this.inputTemplate = inputTemplate;
     }
@@ -340,32 +384,44 @@ public void setExecutionNameSpace(String executionNameSpace) {
         this.executionNameSpace = executionNameSpace;
     }
 
-    /** @return the email of the owner of this task definition */
+    /**
+     * @return the email of the owner of this task definition
+     */
     public String getOwnerEmail() {
         return ownerEmail;
     }
 
-    /** @param ownerEmail the owner email to set */
+    /**
+     * @param ownerEmail the owner email to set
+     */
     public void setOwnerEmail(String ownerEmail) {
         this.ownerEmail = ownerEmail;
     }
 
-    /** @param pollTimeoutSeconds the poll timeout to set */
+    /**
+     * @param pollTimeoutSeconds the poll timeout to set
+     */
     public void setPollTimeoutSeconds(Integer pollTimeoutSeconds) {
         this.pollTimeoutSeconds = pollTimeoutSeconds;
     }
 
-    /** @return the poll timeout of this task definition */
+    /**
+     * @return the poll timeout of this task definition
+     */
     public Integer getPollTimeoutSeconds() {
         return pollTimeoutSeconds;
     }
 
-    /** @param backoffScaleFactor the backoff rate to set */
+    /**
+     * @param backoffScaleFactor the backoff rate to set
+     */
     public void setBackoffScaleFactor(Integer backoffScaleFactor) {
         this.backoffScaleFactor = backoffScaleFactor;
     }
 
-    /** @return the backoff rate of this task definition */
+    /**
+     * @return the backoff rate of this task definition
+     */
     public Integer getBackoffScaleFactor() {
         return backoffScaleFactor;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskExecLog.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskExecLog.java
index ae9dfb6c90..256e1da6fd 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskExecLog.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskExecLog.java
@@ -37,32 +37,44 @@ public TaskExecLog(String log) {
         this.createdTime = System.currentTimeMillis();
     }
 
-    /** @return Task Exec Log */
+    /**
+     * @return Task Exec Log
+     */
     public String getLog() {
         return log;
     }
 
-    /** @param log The Log */
+    /**
+     * @param log The Log
+     */
     public void setLog(String log) {
         this.log = log;
     }
 
-    /** @return the taskId */
+    /**
+     * @return the taskId
+     */
     public String getTaskId() {
         return taskId;
     }
 
-    /** @param taskId the taskId to set */
+    /**
+     * @param taskId the taskId to set
+     */
     public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
 
-    /** @return the createdTime */
+    /**
+     * @return the createdTime
+     */
     public long getCreatedTime() {
         return createdTime;
     }
 
-    /** @param createdTime the createdTime to set */
+    /**
+     * @param createdTime the createdTime to set
+     */
     public void setCreatedTime(long createdTime) {
         this.createdTime = createdTime;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java
index d449176203..9d902ffe82 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java
@@ -100,7 +100,9 @@ public TaskResult(Task task) {
 
     public TaskResult() {}
 
-    /** @return Workflow instance id for which the task result is produced */
+    /**
+     * @return Workflow instance id for which the task result is produced
+     */
     public String getWorkflowInstanceId() {
         return workflowInstanceId;
     }
@@ -155,7 +157,9 @@ public void setWorkerId(String workerId) {
         this.workerId = workerId;
     }
 
-    /** @return the status */
+    /**
+     * @return the status
+     */
     public Status getStatus() {
         return status;
     }
@@ -177,7 +181,9 @@ public Map<String, Object> getOutputData() {
         return outputData;
     }
 
-    /** @param outputData output data to be set for the task execution result */
+    /**
+     * @param outputData output data to be set for the task execution result
+     */
     public void setOutputData(Map<String, Object> outputData) {
         this.outputData = outputData;
     }
@@ -202,12 +208,16 @@ public void setOutputMessage(Any outputMessage) {
         this.outputMessage = outputMessage;
     }
 
-    /** @return Task execution logs */
+    /**
+     * @return Task execution logs
+     */
     public List<TaskExecLog> getLogs() {
         return logs;
     }
 
-    /** @param logs Task execution logs */
+    /**
+     * @param logs Task execution logs
+     */
     public void setLogs(List<TaskExecLog> logs) {
         this.logs = logs;
     }
@@ -221,7 +231,9 @@ public TaskResult log(String log) {
         return this;
     }
 
-    /** @return the path where the task output is stored in external storage */
+    /**
+     * @return the path where the task output is stored in external storage
+     */
     public String getExternalOutputPayloadStoragePath() {
         return externalOutputPayloadStoragePath;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java
index 8fe77533ab..816981b865 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java
@@ -43,7 +43,9 @@ public class SubWorkflowParams {
     @ProtoField(id = 4)
     private Object workflowDefinition;
 
-    /** @return the name */
+    /**
+     * @return the name
+     */
     public String getName() {
         if (workflowDefinition != null) {
             return getWorkflowDef().getName();
@@ -52,12 +54,16 @@ public String getName() {
         }
     }
 
-    /** @param name the name to set */
+    /**
+     * @param name the name to set
+     */
     public void setName(String name) {
         this.name = name;
     }
 
-    /** @return the version */
+    /**
+     * @return the version
+     */
     public Integer getVersion() {
         if (workflowDefinition != null) {
             return getWorkflowDef().getVersion();
@@ -66,33 +72,45 @@ public Integer getVersion() {
         }
     }
 
-    /** @param version the version to set */
+    /**
+     * @param version the version to set
+     */
     public void setVersion(Integer version) {
         this.version = version;
     }
 
-    /** @return the taskToDomain */
+    /**
+     * @return the taskToDomain
+     */
     public Map<String, String> getTaskToDomain() {
         return taskToDomain;
     }
 
-    /** @param taskToDomain the taskToDomain to set */
+    /**
+     * @param taskToDomain the taskToDomain to set
+     */
     public void setTaskToDomain(Map<String, String> taskToDomain) {
         this.taskToDomain = taskToDomain;
     }
 
-    /** @return the workflowDefinition as an Object */
+    /**
+     * @return the workflowDefinition as an Object
+     */
     public Object getWorkflowDefinition() {
         return workflowDefinition;
     }
 
-    /** @return the workflowDefinition as a WorkflowDef */
+    /**
+     * @return the workflowDefinition as a WorkflowDef
+     */
     @JsonGetter("workflowDefinition")
     public WorkflowDef getWorkflowDef() {
         return (WorkflowDef) workflowDefinition;
     }
 
-    /** @param workflowDef the workflowDefinition to set */
+    /**
+     * @param workflowDef the workflowDefinition to set
+     */
     public void setWorkflowDefinition(Object workflowDef) {
         if (!(workflowDef == null || workflowDef instanceof WorkflowDef)) {
             throw new IllegalArgumentException(
@@ -101,7 +119,9 @@ public void setWorkflowDefinition(Object workflowDef) {
         this.workflowDefinition = workflowDef;
     }
 
-    /** @param workflowDef the workflowDefinition to set */
+    /**
+     * @param workflowDef the workflowDefinition to set
+     */
     @JsonSetter("workflowDefinition")
     public void setWorkflowDef(WorkflowDef workflowDef) {
         this.workflowDefinition = workflowDef;
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java
index f81a91fb07..c91e276922 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java
@@ -101,72 +101,100 @@ public enum TimeoutPolicy {
     @ProtoField(id = 15)
     private Map<String, Object> inputTemplate = new HashMap<>();
 
-    /** @return the name */
+    /**
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
-    /** @param name the name to set */
+    /**
+     * @param name the name to set
+     */
     public void setName(String name) {
         this.name = name;
     }
 
-    /** @return the description */
+    /**
+     * @return the description
+     */
     public String getDescription() {
         return description;
     }
 
-    /** @param description the description to set */
+    /**
+     * @param description the description to set
+     */
     public void setDescription(String description) {
         this.description = description;
     }
 
-    /** @return the tasks */
+    /**
+     * @return the tasks
+     */
     public List<WorkflowTask> getTasks() {
         return tasks;
     }
 
-    /** @param tasks the tasks to set */
+    /**
+     * @param tasks the tasks to set
+     */
     public void setTasks(List<@Valid WorkflowTask> tasks) {
         this.tasks = tasks;
     }
 
-    /** @return the inputParameters */
+    /**
+     * @return the inputParameters
+     */
     public List<String> getInputParameters() {
         return inputParameters;
     }
 
-    /** @param inputParameters the inputParameters to set */
+    /**
+     * @param inputParameters the inputParameters to set
+     */
     public void setInputParameters(List<String> inputParameters) {
         this.inputParameters = inputParameters;
     }
 
-    /** @return the outputParameters */
+    /**
+     * @return the outputParameters
+     */
     public Map<String, Object> getOutputParameters() {
         return outputParameters;
     }
 
-    /** @param outputParameters the outputParameters to set */
+    /**
+     * @param outputParameters the outputParameters to set
+     */
     public void setOutputParameters(Map<String, Object> outputParameters) {
         this.outputParameters = outputParameters;
     }
 
-    /** @return the version */
+    /**
+     * @return the version
+     */
     public int getVersion() {
         return version;
     }
 
-    /** @return the failureWorkflow */
+    /**
+     * @return the failureWorkflow
+     */
     public String getFailureWorkflow() {
         return failureWorkflow;
     }
 
-    /** @param failureWorkflow the failureWorkflow to set */
+    /**
+     * @param failureWorkflow the failureWorkflow to set
+     */
     public void setFailureWorkflow(String failureWorkflow) {
         this.failureWorkflow = failureWorkflow;
     }
 
-    /** @param version the version to set */
+    /**
+     * @param version the version to set
+     */
     public void setVersion(int version) {
         this.version = version;
     }
@@ -190,12 +218,16 @@ public void setRestartable(boolean restartable) {
         this.restartable = restartable;
     }
 
-    /** @return the schemaVersion */
+    /**
+     * @return the schemaVersion
+     */
     public int getSchemaVersion() {
         return schemaVersion;
     }
 
-    /** @param schemaVersion the schemaVersion to set */
+    /**
+     * @param schemaVersion the schemaVersion to set
+     */
     public void setSchemaVersion(int schemaVersion) {
         this.schemaVersion = schemaVersion;
     }
@@ -217,42 +249,58 @@ public void setWorkflowStatusListenerEnabled(boolean workflowStatusListenerEnabl
         this.workflowStatusListenerEnabled = workflowStatusListenerEnabled;
     }
 
-    /** @return the email of the owner of this workflow definition */
+    /**
+     * @return the email of the owner of this workflow definition
+     */
     public String getOwnerEmail() {
         return ownerEmail;
     }
 
-    /** @param ownerEmail the owner email to set */
+    /**
+     * @param ownerEmail the owner email to set
+     */
     public void setOwnerEmail(String ownerEmail) {
         this.ownerEmail = ownerEmail;
     }
 
-    /** @return the timeoutPolicy */
+    /**
+     * @return the timeoutPolicy
+     */
     public TimeoutPolicy getTimeoutPolicy() {
         return timeoutPolicy;
     }
 
-    /** @param timeoutPolicy the timeoutPolicy to set */
+    /**
+     * @param timeoutPolicy the timeoutPolicy to set
+     */
     public void setTimeoutPolicy(TimeoutPolicy timeoutPolicy) {
         this.timeoutPolicy = timeoutPolicy;
     }
 
-    /** @return the time after which a workflow is deemed to have timed out */
+    /**
+     * @return the time after which a workflow is deemed to have timed out
+     */
     public long getTimeoutSeconds() {
         return timeoutSeconds;
     }
 
-    /** @param timeoutSeconds the timeout in seconds to set */
+    /**
+     * @param timeoutSeconds the timeout in seconds to set
+     */
     public void setTimeoutSeconds(long timeoutSeconds) {
         this.timeoutSeconds = timeoutSeconds;
     }
 
-    /** @return the global workflow variables */
+    /**
+     * @return the global workflow variables
+     */
     public Map<String, Object> getVariables() {
         return variables;
     }
 
-    /** @param variables the set of global workflow variables to set */
+    /**
+     * @param variables the set of global workflow variables to set
+     */
     public void setVariables(Map<String, Object> variables) {
         this.variables = variables;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java
index e059853c63..f6cf4fc486 100644
--- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java
+++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java
@@ -145,47 +145,65 @@ public void setTasks(List<WorkflowTask> tasks) {
     @ProtoField(id = 28)
     private String expression;
 
-    /** @return the name */
+    /**
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
-    /** @param name the name to set */
+    /**
+     * @param name the name to set
+     */
     public void setName(String name) {
         this.name = name;
     }
 
-    /** @return the taskReferenceName */
+    /**
+     * @return the taskReferenceName
+     */
     public String getTaskReferenceName() {
         return taskReferenceName;
     }
 
-    /** @param taskReferenceName the taskReferenceName to set */
+    /**
+     * @param taskReferenceName the taskReferenceName to set
+     */
     public void setTaskReferenceName(String taskReferenceName) {
         this.taskReferenceName = taskReferenceName;
     }
 
-    /** @return the description */
+    /**
+     * @return the description
+     */
     public String getDescription() {
         return description;
     }
 
-    /** @param description the description to set */
+    /**
+     * @param description the description to set
+     */
     public void setDescription(String description) {
         this.description = description;
     }
 
-    /** @return the inputParameters */
+    /**
+     * @return the inputParameters
+     */
     public Map<String, Object> getInputParameters() {
         return inputParameters;
     }
 
-    /** @param inputParameters the inputParameters to set */
+    /**
+     * @param inputParameters the inputParameters to set
+     */
     public void setInputParameters(Map<String, Object> inputParameters) {
         this.inputParameters = inputParameters;
     }
 
-    /** @return the type */
+    /**
+     * @return the type
+     */
     public String getType() {
         return type;
     }
@@ -194,67 +212,93 @@ public void setWorkflowTaskType(TaskType type) {
         this.type = type.name();
     }
 
-    /** @param type the type to set */
+    /**
+     * @param type the type to set
+     */
     public void setType(@NotEmpty(message = "WorkTask type cannot be null or empty") String type) {
         this.type = type;
     }
 
-    /** @return the decisionCases */
+    /**
+     * @return the decisionCases
+     */
     public Map<String, List<WorkflowTask>> getDecisionCases() {
         return decisionCases;
     }
 
-    /** @param decisionCases the decisionCases to set */
+    /**
+     * @param decisionCases the decisionCases to set
+     */
     public void setDecisionCases(Map<String, List<WorkflowTask>> decisionCases) {
         this.decisionCases = decisionCases;
     }
 
-    /** @return the defaultCase */
+    /**
+     * @return the defaultCase
+     */
     public List<WorkflowTask> getDefaultCase() {
         return defaultCase;
     }
 
-    /** @param defaultCase the defaultCase to set */
+    /**
+     * @param defaultCase the defaultCase to set
+     */
     public void setDefaultCase(List<WorkflowTask> defaultCase) {
         this.defaultCase = defaultCase;
     }
 
-    /** @return the forkTasks */
+    /**
+     * @return the forkTasks
+     */
     public List<List<WorkflowTask>> getForkTasks() {
         return forkTasks;
     }
 
-    /** @param forkTasks the forkTasks to set */
+    /**
+     * @param forkTasks the forkTasks to set
+     */
     public void setForkTasks(List<List<WorkflowTask>> forkTasks) {
         this.forkTasks = forkTasks;
     }
 
-    /** @return the startDelay in seconds */
+    /**
+     * @return the startDelay in seconds
+     */
     public int getStartDelay() {
         return startDelay;
     }
 
-    /** @param startDelay the startDelay to set */
+    /**
+     * @param startDelay the startDelay to set
+     */
     public void setStartDelay(int startDelay) {
         this.startDelay = startDelay;
     }
 
-    /** @return the retryCount */
+    /**
+     * @return the retryCount
+     */
     public Integer getRetryCount() {
         return retryCount;
     }
 
-    /** @param retryCount the retryCount to set */
+    /**
+     * @param retryCount the retryCount to set
+     */
     public void setRetryCount(final Integer retryCount) {
         this.retryCount = retryCount;
     }
 
-    /** @return the dynamicTaskNameParam */
+    /**
+     * @return the dynamicTaskNameParam
+     */
     public String getDynamicTaskNameParam() {
         return dynamicTaskNameParam;
     }
 
-    /** @param dynamicTaskNameParam the dynamicTaskNameParam to set to be used by DYNAMIC tasks */
+    /**
+     * @param dynamicTaskNameParam the dynamicTaskNameParam to set to be used by DYNAMIC tasks
+     */
     public void setDynamicTaskNameParam(String dynamicTaskNameParam) {
         this.dynamicTaskNameParam = dynamicTaskNameParam;
     }
@@ -336,57 +380,79 @@ public void setScriptExpression(String expression) {
         this.scriptExpression = expression;
     }
 
-    /** @return the subWorkflow */
+    /**
+     * @return the subWorkflow
+     */
     public SubWorkflowParams getSubWorkflowParam() {
         return subWorkflowParam;
     }
 
-    /** @param subWorkflow the subWorkflowParam to set */
+    /**
+     * @param subWorkflow the subWorkflowParam to set
+     */
     public void setSubWorkflowParam(SubWorkflowParams subWorkflow) {
         this.subWorkflowParam = subWorkflow;
     }
 
-    /** @return the joinOn */
+    /**
+     * @return the joinOn
+     */
     public List<String> getJoinOn() {
         return joinOn;
     }
 
-    /** @param joinOn the joinOn to set */
+    /**
+     * @param joinOn the joinOn to set
+     */
     public void setJoinOn(List<String> joinOn) {
         this.joinOn = joinOn;
     }
 
-    /** @return the loopCondition */
+    /**
+     * @return the loopCondition
+     */
     public String getLoopCondition() {
         return loopCondition;
     }
 
-    /** @param loopCondition the expression to set */
+    /**
+     * @param loopCondition the expression to set
+     */
     public void setLoopCondition(String loopCondition) {
         this.loopCondition = loopCondition;
     }
 
-    /** @return the loopOver */
+    /**
+     * @return the loopOver
+     */
     public List<WorkflowTask> getLoopOver() {
         return loopOver;
     }
 
-    /** @param loopOver the loopOver to set */
+    /**
+     * @param loopOver the loopOver to set
+     */
     public void setLoopOver(List<WorkflowTask> loopOver) {
         this.loopOver = loopOver;
     }
 
-    /** @return Sink value for the EVENT type of task */
+    /**
+     * @return Sink value for the EVENT type of task
+     */
     public String getSink() {
         return sink;
     }
 
-    /** @param sink Name of the sink */
+    /**
+     * @param sink Name of the sink
+     */
     public void setSink(String sink) {
         this.sink = sink;
     }
 
-    /** @return whether wait for an external event to complete the task, for EVENT and HTTP tasks */
+    /**
+     * @return whether wait for an external event to complete the task, for EVENT and HTTP tasks
+     */
     public Boolean isAsyncComplete() {
         return asyncComplete;
     }
@@ -403,17 +469,23 @@ public boolean isOptional() {
         return optional;
     }
 
-    /** @return Task definition associated to the Workflow Task */
+    /**
+     * @return Task definition associated to the Workflow Task
+     */
     public TaskDef getTaskDefinition() {
         return taskDefinition;
     }
 
-    /** @param taskDefinition Task definition */
+    /**
+     * @param taskDefinition Task definition
+     */
     public void setTaskDefinition(TaskDef taskDefinition) {
         this.taskDefinition = taskDefinition;
     }
 
-    /** @param optional when set to true, the task is marked as optional */
+    /**
+     * @param optional when set to true, the task is marked as optional
+     */
     public void setOptional(boolean optional) {
         this.optional = optional;
     }
@@ -438,12 +510,16 @@ public void setDefaultExclusiveJoinTask(List<String> defaultExclusiveJoinTask) {
         this.defaultExclusiveJoinTask = defaultExclusiveJoinTask;
     }
 
-    /** @return the evaluatorType */
+    /**
+     * @return the evaluatorType
+     */
     public String getEvaluatorType() {
         return evaluatorType;
     }
 
-    /** @param evaluatorType the evaluatorType to set */
+    /**
+     * @param evaluatorType the evaluatorType to set
+     */
     public void setEvaluatorType(String evaluatorType) {
         this.evaluatorType = evaluatorType;
     }
@@ -457,7 +533,9 @@ public String getExpression() {
         return expression;
     }
 
-    /** @param expression the expression to set */
+    /**
+     * @param expression the expression to set
+     */
     public void setExpression(String expression) {
         this.expression = expression;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/run/SearchResult.java b/common/src/main/java/com/netflix/conductor/common/run/SearchResult.java
index d77249f80e..72be415a93 100644
--- a/common/src/main/java/com/netflix/conductor/common/run/SearchResult.java
+++ b/common/src/main/java/com/netflix/conductor/common/run/SearchResult.java
@@ -28,22 +28,30 @@ public SearchResult(long totalHits, List<T> results) {
         this.results = results;
     }
 
-    /** @return the totalHits */
+    /**
+     * @return the totalHits
+     */
     public long getTotalHits() {
         return totalHits;
     }
 
-    /** @return the results */
+    /**
+     * @return the results
+     */
     public List<T> getResults() {
         return results;
     }
 
-    /** @param totalHits the totalHits to set */
+    /**
+     * @param totalHits the totalHits to set
+     */
     public void setTotalHits(long totalHits) {
         this.totalHits = totalHits;
     }
 
-    /** @param results the results to set */
+    /**
+     * @param results the results to set
+     */
     public void setResults(List<T> results) {
         this.results = results;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/run/TaskSummary.java b/common/src/main/java/com/netflix/conductor/common/run/TaskSummary.java
index f8322f62fc..9823f8b85f 100644
--- a/common/src/main/java/com/netflix/conductor/common/run/TaskSummary.java
+++ b/common/src/main/java/com/netflix/conductor/common/run/TaskSummary.java
@@ -129,167 +129,233 @@ public TaskSummary(Task task) {
         }
     }
 
-    /** @return the workflowId */
+    /**
+     * @return the workflowId
+     */
     public String getWorkflowId() {
         return workflowId;
     }
 
-    /** @param workflowId the workflowId to set */
+    /**
+     * @param workflowId the workflowId to set
+     */
     public void setWorkflowId(String workflowId) {
         this.workflowId = workflowId;
     }
 
-    /** @return the workflowType */
+    /**
+     * @return the workflowType
+     */
     public String getWorkflowType() {
         return workflowType;
     }
 
-    /** @param workflowType the workflowType to set */
+    /**
+     * @param workflowType the workflowType to set
+     */
     public void setWorkflowType(String workflowType) {
         this.workflowType = workflowType;
     }
 
-    /** @return the correlationId */
+    /**
+     * @return the correlationId
+     */
     public String getCorrelationId() {
         return correlationId;
     }
 
-    /** @param correlationId the correlationId to set */
+    /**
+     * @param correlationId the correlationId to set
+     */
     public void setCorrelationId(String correlationId) {
         this.correlationId = correlationId;
     }
 
-    /** @return the scheduledTime */
+    /**
+     * @return the scheduledTime
+     */
     public String getScheduledTime() {
         return scheduledTime;
     }
 
-    /** @param scheduledTime the scheduledTime to set */
+    /**
+     * @param scheduledTime the scheduledTime to set
+     */
     public void setScheduledTime(String scheduledTime) {
         this.scheduledTime = scheduledTime;
     }
 
-    /** @return the startTime */
+    /**
+     * @return the startTime
+     */
     public String getStartTime() {
         return startTime;
     }
 
-    /** @param startTime the startTime to set */
+    /**
+     * @param startTime the startTime to set
+     */
     public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
 
-    /** @return the updateTime */
+    /**
+     * @return the updateTime
+     */
     public String getUpdateTime() {
         return updateTime;
     }
 
-    /** @param updateTime the updateTime to set */
+    /**
+     * @param updateTime the updateTime to set
+     */
     public void setUpdateTime(String updateTime) {
         this.updateTime = updateTime;
     }
 
-    /** @return the endTime */
+    /**
+     * @return the endTime
+     */
     public String getEndTime() {
         return endTime;
     }
 
-    /** @param endTime the endTime to set */
+    /**
+     * @param endTime the endTime to set
+     */
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
 
-    /** @return the status */
+    /**
+     * @return the status
+     */
     public Status getStatus() {
         return status;
     }
 
-    /** @param status the status to set */
+    /**
+     * @param status the status to set
+     */
     public void setStatus(Status status) {
         this.status = status;
     }
 
-    /** @return the reasonForIncompletion */
+    /**
+     * @return the reasonForIncompletion
+     */
     public String getReasonForIncompletion() {
         return reasonForIncompletion;
     }
 
-    /** @param reasonForIncompletion the reasonForIncompletion to set */
+    /**
+     * @param reasonForIncompletion the reasonForIncompletion to set
+     */
     public void setReasonForIncompletion(String reasonForIncompletion) {
         this.reasonForIncompletion = reasonForIncompletion;
     }
 
-    /** @return the executionTime */
+    /**
+     * @return the executionTime
+     */
     public long getExecutionTime() {
         return executionTime;
     }
 
-    /** @param executionTime the executionTime to set */
+    /**
+     * @param executionTime the executionTime to set
+     */
     public void setExecutionTime(long executionTime) {
         this.executionTime = executionTime;
     }
 
-    /** @return the queueWaitTime */
+    /**
+     * @return the queueWaitTime
+     */
     public long getQueueWaitTime() {
         return queueWaitTime;
     }
 
-    /** @param queueWaitTime the queueWaitTime to set */
+    /**
+     * @param queueWaitTime the queueWaitTime to set
+     */
     public void setQueueWaitTime(long queueWaitTime) {
         this.queueWaitTime = queueWaitTime;
     }
 
-    /** @return the taskDefName */
+    /**
+     * @return the taskDefName
+     */
     public String getTaskDefName() {
         return taskDefName;
     }
 
-    /** @param taskDefName the taskDefName to set */
+    /**
+     * @param taskDefName the taskDefName to set
+     */
     public void setTaskDefName(String taskDefName) {
         this.taskDefName = taskDefName;
     }
 
-    /** @return the taskType */
+    /**
+     * @return the taskType
+     */
     public String getTaskType() {
         return taskType;
     }
 
-    /** @param taskType the taskType to set */
+    /**
+     * @param taskType the taskType to set
+     */
     public void setTaskType(String taskType) {
         this.taskType = taskType;
     }
 
-    /** @return input to the task */
+    /**
+     * @return input to the task
+     */
     public String getInput() {
         return input;
     }
 
-    /** @param input input to the task */
+    /**
+     * @param input input to the task
+     */
     public void setInput(String input) {
         this.input = input;
     }
 
-    /** @return output of the task */
+    /**
+     * @return output of the task
+     */
     public String getOutput() {
         return output;
     }
 
-    /** @param output Task output */
+    /**
+     * @param output Task output
+     */
     public void setOutput(String output) {
         this.output = output;
     }
 
-    /** @return the taskId */
+    /**
+     * @return the taskId
+     */
     public String getTaskId() {
         return taskId;
     }
 
-    /** @param taskId the taskId to set */
+    /**
+     * @param taskId the taskId to set
+     */
     public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
 
-    /** @return the external storage path for the task input payload */
+    /**
+     * @return the external storage path for the task input payload
+     */
     public String getExternalInputPayloadStoragePath() {
         return externalInputPayloadStoragePath;
     }
@@ -302,7 +368,9 @@ public void setExternalInputPayloadStoragePath(String externalInputPayloadStorag
         this.externalInputPayloadStoragePath = externalInputPayloadStoragePath;
     }
 
-    /** @return the external storage path for the task output payload */
+    /**
+     * @return the external storage path for the task output payload
+     */
     public String getExternalOutputPayloadStoragePath() {
         return externalOutputPayloadStoragePath;
     }
@@ -315,12 +383,16 @@ public void setExternalOutputPayloadStoragePath(String externalOutputPayloadStor
         this.externalOutputPayloadStoragePath = externalOutputPayloadStoragePath;
     }
 
-    /** @return the priority defined on workflow */
+    /**
+     * @return the priority defined on workflow
+     */
     public int getWorkflowPriority() {
         return workflowPriority;
     }
 
-    /** @param workflowPriority Priority defined for workflow */
+    /**
+     * @param workflowPriority Priority defined for workflow
+     */
     public void setWorkflowPriority(int workflowPriority) {
         this.workflowPriority = workflowPriority;
     }
diff --git a/common/src/main/java/com/netflix/conductor/common/run/Workflow.java b/common/src/main/java/com/netflix/conductor/common/run/Workflow.java
index 0bd8c4eadb..0afc4d947b 100644
--- a/common/src/main/java/com/netflix/conductor/common/run/Workflow.java
+++ b/common/src/main/java/com/netflix/conductor/common/run/Workflow.java
@@ -125,62 +125,86 @@ public boolean isSuccessful() {
 
     public Workflow() {}
 
-    /** @return the status */
+    /**
+     * @return the status
+     */
     public WorkflowStatus getStatus() {
         return status;
     }
 
-    /** @param status the status to set */
+    /**
+     * @param status the status to set
+     */
     public void setStatus(WorkflowStatus status) {
         this.status = status;
     }
 
-    /** @return the startTime */
+    /**
+     * @return the startTime
+     */
     public long getStartTime() {
         return getCreateTime();
     }
 
-    /** @param startTime the startTime to set */
+    /**
+     * @param startTime the startTime to set
+     */
     public void setStartTime(long startTime) {
         this.setCreateTime(startTime);
     }
 
-    /** @return the endTime */
+    /**
+     * @return the endTime
+     */
     public long getEndTime() {
         return endTime;
     }
 
-    /** @param endTime the endTime to set */
+    /**
+     * @param endTime the endTime to set
+     */
     public void setEndTime(long endTime) {
         this.endTime = endTime;
     }
 
-    /** @return the workflowId */
+    /**
+     * @return the workflowId
+     */
     public String getWorkflowId() {
         return workflowId;
     }
 
-    /** @param workflowId the workflowId to set */
+    /**
+     * @param workflowId the workflowId to set
+     */
     public void setWorkflowId(String workflowId) {
         this.workflowId = workflowId;
     }
 
-    /** @return the tasks which are scheduled, in progress or completed. */
+    /**
+     * @return the tasks which are scheduled, in progress or completed.
+     */
     public List<Task> getTasks() {
         return tasks;
     }
 
-    /** @param tasks the tasks to set */
+    /**
+     * @param tasks the tasks to set
+     */
     public void setTasks(List<Task> tasks) {
         this.tasks = tasks;
     }
 
-    /** @return the input */
+    /**
+     * @return the input
+     */
     public Map<String, Object> getInput() {
         return input;
     }
 
-    /** @param input the input to set */
+    /**
+     * @param input the input to set
+     */
     public void setInput(Map<String, Object> input) {
         if (input == null) {
             input = new HashMap<>();
@@ -188,22 +212,30 @@ public void setInput(Map<String, Object> input) {
         this.input = input;
     }
 
-    /** @return the task to domain map */
+    /**
+     * @return the task to domain map
+     */
     public Map<String, String> getTaskToDomain() {
         return taskToDomain;
     }
 
-    /** @param taskToDomain the task to domain map */
+    /**
+     * @param taskToDomain the task to domain map
+     */
     public void setTaskToDomain(Map<String, String> taskToDomain) {
         this.taskToDomain = taskToDomain;
     }
 
-    /** @return the output */
+    /**
+     * @return the output
+     */
     public Map<String, Object> getOutput() {
         return output;
     }
 
-    /** @param output the output to set */
+    /**
+     * @param output the output to set
+     */
     public void setOutput(Map<String, Object> output) {
         if (output == null) {
             output = new HashMap<>();
@@ -211,12 +243,16 @@ public void setOutput(Map<String, Object> output) {
         this.output = output;
     }
 
-    /** @return The correlation id used when starting the workflow */
+    /**
+     * @return The correlation id used when starting the workflow
+     */
     public String getCorrelationId() {
         return correlationId;
     }
 
-    /** @param correlationId the correlation id */
+    /**
+     * @param correlationId the correlation id
+     */
     public void setCorrelationId(String correlationId) {
         this.correlationId = correlationId;
     }
@@ -237,32 +273,44 @@ public void setReasonForIncompletion(String reasonForIncompletion) {
         this.reasonForIncompletion = reasonForIncompletion;
     }
 
-    /** @return the parentWorkflowId */
+    /**
+     * @return the parentWorkflowId
+     */
     public String getParentWorkflowId() {
         return parentWorkflowId;
     }
 
-    /** @param parentWorkflowId the parentWorkflowId to set */
+    /**
+     * @param parentWorkflowId the parentWorkflowId to set
+     */
     public void setParentWorkflowId(String parentWorkflowId) {
         this.parentWorkflowId = parentWorkflowId;
     }
 
-    /** @return the parentWorkflowTaskId */
+    /**
+     * @return the parentWorkflowTaskId
+     */
     public String getParentWorkflowTaskId() {
         return parentWorkflowTaskId;
     }
 
-    /** @param parentWorkflowTaskId the parentWorkflowTaskId to set */
+    /**
+     * @param parentWorkflowTaskId the parentWorkflowTaskId to set
+     */
     public void setParentWorkflowTaskId(String parentWorkflowTaskId) {
         this.parentWorkflowTaskId = parentWorkflowTaskId;
     }
 
-    /** @return Name of the event that started the workflow */
+    /**
+     * @return Name of the event that started the workflow
+     */
     public String getEvent() {
         return event;
     }
 
-    /** @param event Name of the event that started the workflow */
+    /**
+     * @param event Name of the event that started the workflow
+     */
     public void setEvent(String event) {
         this.event = event;
     }
@@ -283,7 +331,9 @@ public void setWorkflowDefinition(WorkflowDef workflowDefinition) {
         this.workflowDefinition = workflowDefinition;
     }
 
-    /** @return the external storage path of the workflow input payload */
+    /**
+     * @return the external storage path of the workflow input payload
+     */
     public String getExternalInputPayloadStoragePath() {
         return externalInputPayloadStoragePath;
     }
@@ -296,17 +346,23 @@ public void setExternalInputPayloadStoragePath(String externalInputPayloadStorag
         this.externalInputPayloadStoragePath = externalInputPayloadStoragePath;
     }
 
-    /** @return the external storage path of the workflow output payload */
+    /**
+     * @return the external storage path of the workflow output payload
+     */
     public String getExternalOutputPayloadStoragePath() {
         return externalOutputPayloadStoragePath;
     }
 
-    /** @return the priority to define on tasks */
+    /**
+     * @return the priority to define on tasks
+     */
     public int getPriority() {
         return priority;
     }
 
-    /** @param priority priority of tasks (between 0 and 99) */
+    /**
+     * @param priority priority of tasks (between 0 and 99)
+     */
     public void setPriority(int priority) {
         if (priority < 0 || priority > 99) {
             throw new IllegalArgumentException("priority MUST be between 0 and 99 (inclusive)");
@@ -346,12 +402,16 @@ public void setExternalOutputPayloadStoragePath(String externalOutputPayloadStor
         this.externalOutputPayloadStoragePath = externalOutputPayloadStoragePath;
     }
 
-    /** @return the global workflow variables */
+    /**
+     * @return the global workflow variables
+     */
     public Map<String, Object> getVariables() {
         return variables;
     }
 
-    /** @param variables the set of global workflow variables to set */
+    /**
+     * @param variables the set of global workflow variables to set
+     */
     public void setVariables(Map<String, Object> variables) {
         this.variables = variables;
     }
@@ -365,7 +425,9 @@ public long getLastRetriedTime() {
         return lastRetriedTime;
     }
 
-    /** @param lastRetriedTime time in milliseconds when the workflow is retried */
+    /**
+     * @param lastRetriedTime time in milliseconds when the workflow is retried
+     */
     public void setLastRetriedTime(long lastRetriedTime) {
         this.lastRetriedTime = lastRetriedTime;
     }
@@ -399,7 +461,9 @@ public Task getTaskByRefName(String refName) {
         return found.getLast();
     }
 
-    /** @return a deep copy of the workflow instance */
+    /**
+     * @return a deep copy of the workflow instance
+     */
     public Workflow copy() {
         Workflow copy = new Workflow();
         copy.setInput(input);
diff --git a/common/src/main/java/com/netflix/conductor/common/run/WorkflowSummary.java b/common/src/main/java/com/netflix/conductor/common/run/WorkflowSummary.java
index 333cf29dfc..3c6536baec 100644
--- a/common/src/main/java/com/netflix/conductor/common/run/WorkflowSummary.java
+++ b/common/src/main/java/com/netflix/conductor/common/run/WorkflowSummary.java
@@ -126,42 +126,58 @@ public WorkflowSummary(Workflow workflow) {
         }
     }
 
-    /** @return the workflowType */
+    /**
+     * @return the workflowType
+     */
     public String getWorkflowType() {
         return workflowType;
     }
 
-    /** @return the version */
+    /**
+     * @return the version
+     */
     public int getVersion() {
         return version;
     }
 
-    /** @return the workflowId */
+    /**
+     * @return the workflowId
+     */
     public String getWorkflowId() {
         return workflowId;
     }
 
-    /** @return the correlationId */
+    /**
+     * @return the correlationId
+     */
     public String getCorrelationId() {
         return correlationId;
     }
 
-    /** @return the startTime */
+    /**
+     * @return the startTime
+     */
     public String getStartTime() {
         return startTime;
     }
 
-    /** @return the endTime */
+    /**
+     * @return the endTime
+     */
     public String getEndTime() {
         return endTime;
     }
 
-    /** @return the status */
+    /**
+     * @return the status
+     */
     public WorkflowStatus getStatus() {
         return status;
     }
 
-    /** @return the input */
+    /**
+     * @return the input
+     */
     public String getInput() {
         return input;
     }
@@ -170,7 +186,9 @@ public long getInputSize() {
         return input != null ? input.length() : 0;
     }
 
-    /** @return the output */
+    /**
+     * @return the output
+     */
     public String getOutput() {
         return output;
     }
@@ -179,27 +197,37 @@ public long getOutputSize() {
         return output != null ? output.length() : 0;
     }
 
-    /** @return the reasonForIncompletion */
+    /**
+     * @return the reasonForIncompletion
+     */
     public String getReasonForIncompletion() {
         return reasonForIncompletion;
     }
 
-    /** @return the executionTime */
+    /**
+     * @return the executionTime
+     */
     public long getExecutionTime() {
         return executionTime;
     }
 
-    /** @return the updateTime */
+    /**
+     * @return the updateTime
+     */
     public String getUpdateTime() {
         return updateTime;
     }
 
-    /** @return The event */
+    /**
+     * @return The event
+     */
     public String getEvent() {
         return event;
     }
 
-    /** @param event The event */
+    /**
+     * @param event The event
+     */
     public void setEvent(String event) {
         this.event = event;
     }
@@ -260,7 +288,9 @@ public void setExecutionTime(long executionTime) {
         this.executionTime = executionTime;
     }
 
-    /** @return the external storage path of the workflow input payload */
+    /**
+     * @return the external storage path of the workflow input payload
+     */
     public String getExternalInputPayloadStoragePath() {
         return externalInputPayloadStoragePath;
     }
@@ -273,7 +303,9 @@ public void setExternalInputPayloadStoragePath(String externalInputPayloadStorag
         this.externalInputPayloadStoragePath = externalInputPayloadStoragePath;
     }
 
-    /** @return the external storage path of the workflow output payload */
+    /**
+     * @return the external storage path of the workflow output payload
+     */
     public String getExternalOutputPayloadStoragePath() {
         return externalOutputPayloadStoragePath;
     }
@@ -286,12 +318,16 @@ public void setExternalOutputPayloadStoragePath(String externalOutputPayloadStor
         this.externalOutputPayloadStoragePath = externalOutputPayloadStoragePath;
     }
 
-    /** @return the priority to define on tasks */
+    /**
+     * @return the priority to define on tasks
+     */
     public int getPriority() {
         return priority;
     }
 
-    /** @param priority priority of tasks (between 0 and 99) */
+    /**
+     * @param priority priority of tasks (between 0 and 99)
+     */
     public void setPriority(int priority) {
         this.priority = priority;
     }
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/AMQPObservableQueue.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/AMQPObservableQueue.java
index 203c4dfbe6..78bc497d98 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/AMQPObservableQueue.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/AMQPObservableQueue.java
@@ -48,7 +48,9 @@
 import rx.Observable;
 import rx.Subscriber;
 
-/** @author Ritu Parathody */
+/**
+ * @author Ritu Parathody
+ */
 public class AMQPObservableQueue implements ObservableQueue {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AMQPObservableQueue.class);
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProperties.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProperties.java
index 3ebdd57880..335e5de277 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProperties.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProperties.java
@@ -268,7 +268,9 @@ public void setQueueType(String queueType) {
         this.queueType = queueType;
     }
 
-    /** @return the sequentialMsgProcessing */
+    /**
+     * @return the sequentialMsgProcessing
+     */
     public boolean isSequentialMsgProcessing() {
         return sequentialMsgProcessing;
     }
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProvider.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProvider.java
index e4eb880cee..7bf36cdd7f 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProvider.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueProvider.java
@@ -24,7 +24,9 @@
 import com.netflix.conductor.core.events.EventQueueProvider;
 import com.netflix.conductor.core.events.queue.ObservableQueue;
 
-/** @author Ritu Parathody */
+/**
+ * @author Ritu Parathody
+ */
 public class AMQPEventQueueProvider implements EventQueueProvider {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AMQPEventQueueProvider.class);
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConfigurations.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConfigurations.java
index 9caa68383e..d5ddb6f0f0 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConfigurations.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConfigurations.java
@@ -12,7 +12,9 @@
  */
 package com.netflix.conductor.contribs.queue.amqp.util;
 
-/** @author Ritu Parathody */
+/**
+ * @author Ritu Parathody
+ */
 public enum AMQPConfigurations {
 
     // queue exchange settings
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java
index f8f06aeceb..ab50f542cc 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java
@@ -12,7 +12,9 @@
  */
 package com.netflix.conductor.contribs.queue.amqp.util;
 
-/** @author Ritu Parathody */
+/**
+ * @author Ritu Parathody
+ */
 public class AMQPConstants {
 
     /** this when set will create a rabbitmq queue */
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPSettings.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPSettings.java
index 7ca2c51400..003bbfa60e 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPSettings.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPSettings.java
@@ -33,7 +33,9 @@
 import static com.netflix.conductor.contribs.queue.amqp.util.AMQPConfigurations.PARAM_MAX_PRIORITY;
 import static com.netflix.conductor.contribs.queue.amqp.util.AMQPConfigurations.PARAM_ROUTING_KEY;
 
-/** @author Ritu Parathody */
+/**
+ * @author Ritu Parathody
+ */
 public class AMQPSettings {
 
     private static final Pattern URI_PATTERN =
@@ -287,12 +289,16 @@ public String getEventName() {
         return eventName;
     }
 
-    /** @return the queueType */
+    /**
+     * @return the queueType
+     */
     public String getQueueType() {
         return queueType;
     }
 
-    /** @return the sequentialProcessing */
+    /**
+     * @return the sequentialProcessing
+     */
     public boolean isSequentialProcessing() {
         return sequentialProcessing;
     }
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSAbstractQueue.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSAbstractQueue.java
index fcb89740c3..34c14f9446 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSAbstractQueue.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSAbstractQueue.java
@@ -33,7 +33,9 @@
 import rx.Observable;
 import rx.Scheduler;
 
-/** @author Oleksiy Lysak */
+/**
+ * @author Oleksiy Lysak
+ */
 public abstract class NATSAbstractQueue implements ObservableQueue {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NATSAbstractQueue.class);
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSObservableQueue.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSObservableQueue.java
index 27c13a0c9f..9bcb05b70d 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSObservableQueue.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSObservableQueue.java
@@ -21,7 +21,9 @@
 import io.nats.client.Subscription;
 import rx.Scheduler;
 
-/** @author Oleksiy Lysak */
+/**
+ * @author Oleksiy Lysak
+ */
 public class NATSObservableQueue extends NATSAbstractQueue {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NATSObservableQueue.class);
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSStreamObservableQueue.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSStreamObservableQueue.java
index c3defb72b4..f74ebb4cd8 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSStreamObservableQueue.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/NATSStreamObservableQueue.java
@@ -24,7 +24,9 @@
 import io.nats.streaming.SubscriptionOptions;
 import rx.Scheduler;
 
-/** @author Oleksiy Lysak */
+/**
+ * @author Oleksiy Lysak
+ */
 public class NATSStreamObservableQueue extends NATSAbstractQueue {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NATSStreamObservableQueue.class);
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSEventQueueProvider.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSEventQueueProvider.java
index 5c5e7f9717..a23252d571 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSEventQueueProvider.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSEventQueueProvider.java
@@ -28,7 +28,9 @@
 import io.nats.client.ConnectionFactory;
 import rx.Scheduler;
 
-/** @author Oleksiy Lysak */
+/**
+ * @author Oleksiy Lysak
+ */
 public class NATSEventQueueProvider implements EventQueueProvider {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NATSEventQueueProvider.class);
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamEventQueueProvider.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamEventQueueProvider.java
index 133a79959e..74738b97b0 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamEventQueueProvider.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamEventQueueProvider.java
@@ -25,7 +25,9 @@
 
 import rx.Scheduler;
 
-/** @author Oleksiy Lysak */
+/**
+ * @author Oleksiy Lysak
+ */
 public class NATSStreamEventQueueProvider implements EventQueueProvider {
 
     private static final Logger LOGGER =
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/tasks/http/HttpTask.java b/contribs/src/main/java/com/netflix/conductor/contribs/tasks/http/HttpTask.java
index f0f42eaf4d..6e46d39fb3 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/tasks/http/HttpTask.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/tasks/http/HttpTask.java
@@ -258,72 +258,100 @@ public static class Input {
         private Integer connectionTimeOut;
         private Integer readTimeOut;
 
-        /** @return the method */
+        /**
+         * @return the method
+         */
         public HttpMethod getMethod() {
             return method;
         }
 
-        /** @param method the method to set */
+        /**
+         * @param method the method to set
+         */
         public void setMethod(String method) {
             this.method = HttpMethod.valueOf(method);
         }
 
-        /** @return the headers */
+        /**
+         * @return the headers
+         */
         public Map<String, Object> getHeaders() {
             return headers;
         }
 
-        /** @param headers the headers to set */
+        /**
+         * @param headers the headers to set
+         */
         public void setHeaders(Map<String, Object> headers) {
             this.headers = headers;
         }
 
-        /** @return the body */
+        /**
+         * @return the body
+         */
         public Object getBody() {
             return body;
         }
 
-        /** @param body the body to set */
+        /**
+         * @param body the body to set
+         */
         public void setBody(Object body) {
             this.body = body;
         }
 
-        /** @return the uri */
+        /**
+         * @return the uri
+         */
         public String getUri() {
             return uri;
         }
 
-        /** @param uri the uri to set */
+        /**
+         * @param uri the uri to set
+         */
         public void setUri(String uri) {
             this.uri = uri;
         }
 
-        /** @return the vipAddress */
+        /**
+         * @return the vipAddress
+         */
         public String getVipAddress() {
             return vipAddress;
         }
 
-        /** @param vipAddress the vipAddress to set */
+        /**
+         * @param vipAddress the vipAddress to set
+         */
         public void setVipAddress(String vipAddress) {
             this.vipAddress = vipAddress;
         }
 
-        /** @return the accept */
+        /**
+         * @return the accept
+         */
         public String getAccept() {
             return accept;
         }
 
-        /** @param accept the accept to set */
+        /**
+         * @param accept the accept to set
+         */
         public void setAccept(String accept) {
             this.accept = accept;
         }
 
-        /** @return the MIME content type to use for the request */
+        /**
+         * @return the MIME content type to use for the request
+         */
         public String getContentType() {
             return contentType;
         }
 
-        /** @param contentType the MIME content type to set */
+        /**
+         * @param contentType the MIME content type to set
+         */
         public void setContentType(String contentType) {
             this.contentType = contentType;
         }
@@ -336,12 +364,16 @@ public void setAppName(String appName) {
             this.appName = appName;
         }
 
-        /** @return the connectionTimeOut */
+        /**
+         * @return the connectionTimeOut
+         */
         public Integer getConnectionTimeOut() {
             return connectionTimeOut;
         }
 
-        /** @return the readTimeOut */
+        /**
+         * @return the readTimeOut
+         */
         public Integer getReadTimeOut() {
             return readTimeOut;
         }
diff --git a/contribs/src/test/java/com/netflix/conductor/contribs/listener/ArchivingWorkflowStatusListenerTest.java b/contribs/src/test/java/com/netflix/conductor/contribs/listener/ArchivingWorkflowStatusListenerTest.java
index 9a89e86deb..d209887add 100644
--- a/contribs/src/test/java/com/netflix/conductor/contribs/listener/ArchivingWorkflowStatusListenerTest.java
+++ b/contribs/src/test/java/com/netflix/conductor/contribs/listener/ArchivingWorkflowStatusListenerTest.java
@@ -25,7 +25,9 @@
 
 import static org.mockito.Mockito.*;
 
-/** @author pavel.halabala */
+/**
+ * @author pavel.halabala
+ */
 public class ArchivingWorkflowStatusListenerTest {
 
     WorkflowModel workflow;
diff --git a/core/src/main/java/com/netflix/conductor/core/WorkflowContext.java b/core/src/main/java/com/netflix/conductor/core/WorkflowContext.java
index 2f996a47a6..d870761c53 100644
--- a/core/src/main/java/com/netflix/conductor/core/WorkflowContext.java
+++ b/core/src/main/java/com/netflix/conductor/core/WorkflowContext.java
@@ -44,12 +44,16 @@ public static void unset() {
         THREAD_LOCAL.remove();
     }
 
-    /** @return the clientApp */
+    /**
+     * @return the clientApp
+     */
     public String getClientApp() {
         return clientApp;
     }
 
-    /** @return the username */
+    /**
+     * @return the username
+     */
     public String getUserName() {
         return userName;
     }
diff --git a/core/src/main/java/com/netflix/conductor/core/config/ConductorProperties.java b/core/src/main/java/com/netflix/conductor/core/config/ConductorProperties.java
index ecdc6a3756..b223008a15 100644
--- a/core/src/main/java/com/netflix/conductor/core/config/ConductorProperties.java
+++ b/core/src/main/java/com/netflix/conductor/core/config/ConductorProperties.java
@@ -510,7 +510,9 @@ public void setMaxWorkflowVariablesPayloadSizeThreshold(
         this.maxWorkflowVariablesPayloadSizeThreshold = maxWorkflowVariablesPayloadSizeThreshold;
     }
 
-    /** @return Returns all the configurations in a map. */
+    /**
+     * @return Returns all the configurations in a map.
+     */
     public Map<String, Object> getAll() {
         Map<String, Object> map = new HashMap<>();
         Properties props = System.getProperties();
diff --git a/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java b/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java
index 7db1ac56d7..b7d33961fc 100644
--- a/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java
+++ b/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java
@@ -36,32 +36,44 @@ public Message(String id, String payload, String receipt, int priority) {
         this.priority = priority;
     }
 
-    /** @return the payload */
+    /**
+     * @return the payload
+     */
     public String getPayload() {
         return payload;
     }
 
-    /** @param payload the payload to set */
+    /**
+     * @param payload the payload to set
+     */
     public void setPayload(String payload) {
         this.payload = payload;
     }
 
-    /** @return the id */
+    /**
+     * @return the id
+     */
     public String getId() {
         return id;
     }
 
-    /** @param id the id to set */
+    /**
+     * @param id the id to set
+     */
     public void setId(String id) {
         this.id = id;
     }
 
-    /** @return Receipt attached to the message */
+    /**
+     * @return Receipt attached to the message
+     */
     public String getReceipt() {
         return receipt;
     }
 
-    /** @param receipt Receipt attached to the message */
+    /**
+     * @param receipt Receipt attached to the message
+     */
     public void setReceipt(String receipt) {
         this.receipt = receipt;
     }
diff --git a/core/src/main/java/com/netflix/conductor/core/events/queue/ObservableQueue.java b/core/src/main/java/com/netflix/conductor/core/events/queue/ObservableQueue.java
index 897090ba7f..718cded762 100644
--- a/core/src/main/java/com/netflix/conductor/core/events/queue/ObservableQueue.java
+++ b/core/src/main/java/com/netflix/conductor/core/events/queue/ObservableQueue.java
@@ -20,16 +20,24 @@
 
 public interface ObservableQueue extends Lifecycle {
 
-    /** @return An observable for the given queue */
+    /**
+     * @return An observable for the given queue
+     */
     Observable<Message> observe();
 
-    /** @return Type of the queue */
+    /**
+     * @return Type of the queue
+     */
     String getType();
 
-    /** @return Name of the queue */
+    /**
+     * @return Name of the queue
+     */
     String getName();
 
-    /** @return URI identifier for the queue. */
+    /**
+     * @return URI identifier for the queue.
+     */
     String getURI();
 
     /**
@@ -38,7 +46,9 @@ public interface ObservableQueue extends Lifecycle {
      */
     List<String> ack(List<Message> messages);
 
-    /** @param messages Messages to be published */
+    /**
+     * @param messages Messages to be published
+     */
     void publish(List<Message> messages);
 
     /**
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
index 0519ba7afd..b5c52d4c6a 100644
--- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
+++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
@@ -119,7 +119,9 @@ public WorkflowExecutor(
         this.systemTaskRegistry = systemTaskRegistry;
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -130,7 +132,9 @@ public String startWorkflow(
                 name, version, correlationId, input, externalInputPayloadStoragePath, null);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -148,7 +152,9 @@ public String startWorkflow(
                 null);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -167,7 +173,9 @@ public String startWorkflow(
                 event);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -189,7 +197,9 @@ public String startWorkflow(
                 null);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -209,7 +219,9 @@ public String startWorkflow(
                 taskToDomain);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -232,7 +244,9 @@ public String startWorkflow(
                 taskToDomain);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -254,7 +268,9 @@ public String startWorkflow(
                 null);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             WorkflowDef workflowDefinition,
             Map<String, Object> workflowInput,
@@ -272,7 +288,9 @@ public String startWorkflow(
                 taskToDomain);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             WorkflowDef workflowDefinition,
             Map<String, Object> workflowInput,
@@ -293,7 +311,9 @@ public String startWorkflow(
                 taskToDomain);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -317,7 +337,9 @@ public String startWorkflow(
                 taskToDomain);
     }
 
-    /** @throws ApplicationException */
+    /**
+     * @throws ApplicationException
+     */
     public String startWorkflow(
             String name,
             Integer version,
@@ -344,7 +366,9 @@ public String startWorkflow(
                 taskToDomain);
     }
 
-    /** @throws ApplicationException if validation fails */
+    /**
+     * @throws ApplicationException if validation fails
+     */
     public String startWorkflow(
             WorkflowDef workflowDefinition,
             Map<String, Object> workflowInput,
@@ -1436,7 +1460,9 @@ List<TaskModel> dedupAndAddTasks(WorkflowModel workflow, List<TaskModel> tasks)
         return dedupedTasks;
     }
 
-    /** @throws ApplicationException if the workflow cannot be paused */
+    /**
+     * @throws ApplicationException if the workflow cannot be paused
+     */
     public void pauseWorkflow(String workflowId) {
         try {
             executionLockService.acquireLock(workflowId, 60000);
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/WorkflowSystemTask.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/WorkflowSystemTask.java
index b23b77c6e5..e8db7c6d8c 100644
--- a/core/src/main/java/com/netflix/conductor/core/execution/tasks/WorkflowSystemTask.java
+++ b/core/src/main/java/com/netflix/conductor/core/execution/tasks/WorkflowSystemTask.java
@@ -65,7 +65,9 @@ public boolean execute(
      */
     public void cancel(WorkflowModel workflow, TaskModel task, WorkflowExecutor workflowExecutor) {}
 
-    /** @return True if the task is supposed to be started asynchronously using internal queues. */
+    /**
+     * @return True if the task is supposed to be started asynchronously using internal queues.
+     */
     public boolean isAsync() {
         return false;
     }
@@ -86,7 +88,9 @@ public boolean isAsyncComplete(TaskModel task) {
         }
     }
 
-    /** @return name of the system task */
+    /**
+     * @return name of the system task
+     */
     public String getTaskType() {
         return taskType;
     }
diff --git a/core/src/main/java/com/netflix/conductor/dao/EventHandlerDAO.java b/core/src/main/java/com/netflix/conductor/dao/EventHandlerDAO.java
index fa32024db8..6c9dc47a96 100644
--- a/core/src/main/java/com/netflix/conductor/dao/EventHandlerDAO.java
+++ b/core/src/main/java/com/netflix/conductor/dao/EventHandlerDAO.java
@@ -26,13 +26,19 @@ public interface EventHandlerDAO {
      */
     void addEventHandler(EventHandler eventHandler);
 
-    /** @param eventHandler Event handler to be updated. */
+    /**
+     * @param eventHandler Event handler to be updated.
+     */
     void updateEventHandler(EventHandler eventHandler);
 
-    /** @param name Removes the event handler from the system */
+    /**
+     * @param name Removes the event handler from the system
+     */
     void removeEventHandler(String name);
 
-    /** @return All the event handlers registered in the system */
+    /**
+     * @return All the event handlers registered in the system
+     */
     List<EventHandler> getAllEventHandlers();
 
     /**
diff --git a/core/src/main/java/com/netflix/conductor/dao/ExecutionDAO.java b/core/src/main/java/com/netflix/conductor/dao/ExecutionDAO.java
index 967551e6be..8e33cac29b 100644
--- a/core/src/main/java/com/netflix/conductor/dao/ExecutionDAO.java
+++ b/core/src/main/java/com/netflix/conductor/dao/ExecutionDAO.java
@@ -47,7 +47,9 @@ public interface ExecutionDAO {
      */
     List<TaskModel> createTasks(List<TaskModel> tasks);
 
-    /** @param task Task to be updated */
+    /**
+     * @param task Task to be updated
+     */
     void updateTask(TaskModel task);
 
     /**
@@ -202,9 +204,13 @@ List<WorkflowModel> getWorkflowsByCorrelationId(
      */
     boolean addEventExecution(EventExecution eventExecution);
 
-    /** @param eventExecution Event execution to be updated */
+    /**
+     * @param eventExecution Event execution to be updated
+     */
     void updateEventExecution(EventExecution eventExecution);
 
-    /** @param eventExecution Event execution to be removed */
+    /**
+     * @param eventExecution Event execution to be removed
+     */
     void removeEventExecution(EventExecution eventExecution);
 }
diff --git a/core/src/main/java/com/netflix/conductor/dao/IndexDAO.java b/core/src/main/java/com/netflix/conductor/dao/IndexDAO.java
index 876f0d8dc2..490758d151 100644
--- a/core/src/main/java/com/netflix/conductor/dao/IndexDAO.java
+++ b/core/src/main/java/com/netflix/conductor/dao/IndexDAO.java
@@ -43,7 +43,9 @@ public interface IndexDAO {
      */
     CompletableFuture<Void> asyncIndexWorkflow(WorkflowSummary workflow);
 
-    /** @param task Task to be indexed */
+    /**
+     * @param task Task to be indexed
+     */
     void indexTask(TaskSummary task);
 
     /**
@@ -118,7 +120,9 @@ CompletableFuture<Void> asyncUpdateWorkflow(
      */
     String get(String workflowInstanceId, String key);
 
-    /** @param logs Task Execution logs to be indexed */
+    /**
+     * @param logs Task Execution logs to be indexed
+     */
     void addTaskExecutionLogs(List<TaskExecLog> logs);
 
     /**
@@ -133,7 +137,9 @@ CompletableFuture<Void> asyncUpdateWorkflow(
      */
     List<TaskExecLog> getTaskExecutionLogs(String taskId);
 
-    /** @param eventExecution Event Execution to be indexed */
+    /**
+     * @param eventExecution Event Execution to be indexed
+     */
     void addEventExecution(EventExecution eventExecution);
 
     List<EventExecution> getEventExecutions(String event);
diff --git a/core/src/main/java/com/netflix/conductor/dao/MetadataDAO.java b/core/src/main/java/com/netflix/conductor/dao/MetadataDAO.java
index e6e203c6df..1d6bb70200 100644
--- a/core/src/main/java/com/netflix/conductor/dao/MetadataDAO.java
+++ b/core/src/main/java/com/netflix/conductor/dao/MetadataDAO.java
@@ -21,7 +21,9 @@
 /** Data access layer for the workflow metadata - task definitions and workflow definitions */
 public interface MetadataDAO {
 
-    /** @param taskDef task definition to be created */
+    /**
+     * @param taskDef task definition to be created
+     */
     void createTaskDef(TaskDef taskDef);
 
     /**
@@ -36,16 +38,24 @@ public interface MetadataDAO {
      */
     TaskDef getTaskDef(String name);
 
-    /** @return All the task definitions */
+    /**
+     * @return All the task definitions
+     */
     List<TaskDef> getAllTaskDefs();
 
-    /** @param name Name of the task */
+    /**
+     * @param name Name of the task
+     */
     void removeTaskDef(String name);
 
-    /** @param def workflow definition */
+    /**
+     * @param def workflow definition
+     */
     void createWorkflowDef(WorkflowDef def);
 
-    /** @param def workflow definition */
+    /**
+     * @param def workflow definition
+     */
     void updateWorkflowDef(WorkflowDef def);
 
     /**
@@ -67,6 +77,8 @@ public interface MetadataDAO {
      */
     void removeWorkflowDef(String name, Integer version);
 
-    /** @return List of all the workflow definitions */
+    /**
+     * @return List of all the workflow definitions
+     */
     List<WorkflowDef> getAllWorkflowDefs();
 }
diff --git a/core/src/main/java/com/netflix/conductor/dao/QueueDAO.java b/core/src/main/java/com/netflix/conductor/dao/QueueDAO.java
index d14c7cfb43..70b5857c5b 100644
--- a/core/src/main/java/com/netflix/conductor/dao/QueueDAO.java
+++ b/core/src/main/java/com/netflix/conductor/dao/QueueDAO.java
@@ -110,13 +110,19 @@ public interface QueueDAO {
      */
     boolean setUnackTimeout(String queueName, String messageId, long unackTimeout);
 
-    /** @param queueName Name of the queue */
+    /**
+     * @param queueName Name of the queue
+     */
     void flush(String queueName);
 
-    /** @return key : queue name, value: size of the queue */
+    /**
+     * @return key : queue name, value: size of the queue
+     */
     Map<String, Long> queuesDetail();
 
-    /** @return key : queue name, value: map of shard name to size and unack queue size */
+    /**
+     * @return key : queue name, value: map of shard name to size and unack queue size
+     */
     Map<String, Map<String, Map<String, Long>>> queuesDetailVerbose();
 
     default void processUnacks(String queueName) {}
diff --git a/core/src/main/java/com/netflix/conductor/model/TaskModel.java b/core/src/main/java/com/netflix/conductor/model/TaskModel.java
index 57071099df..6c207a0dd7 100644
--- a/core/src/main/java/com/netflix/conductor/model/TaskModel.java
+++ b/core/src/main/java/com/netflix/conductor/model/TaskModel.java
@@ -189,14 +189,18 @@ public void setInputData(Map<String, Object> inputData) {
         this.inputData = inputData;
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @JsonProperty("inputData")
     @Deprecated
     public void setRawInputData(Map<String, Object> inputData) {
         setInputData(inputData);
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @JsonProperty("inputData")
     @Deprecated
     public Map<String, Object> getRawInputData() {
@@ -395,14 +399,18 @@ public void setOutputData(Map<String, Object> outputData) {
         this.outputData = outputData;
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @JsonProperty("outputData")
     @Deprecated
     public void setRawOutputData(Map<String, Object> inputData) {
         setOutputData(inputData);
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @JsonProperty("outputData")
     @Deprecated
     public Map<String, Object> getRawOutputData() {
@@ -538,7 +546,9 @@ public void incrementPollCount() {
         ++this.pollCount;
     }
 
-    /** @return {@link Optional} containing the task definition if available */
+    /**
+     * @return {@link Optional} containing the task definition if available
+     */
     public Optional<TaskDef> getTaskDefinition() {
         return Optional.ofNullable(this.getWorkflowTask()).map(WorkflowTask::getTaskDefinition);
     }
@@ -547,7 +557,9 @@ public boolean isLoopOverTask() {
         return iteration > 0;
     }
 
-    /** @return the queueWaitTime */
+    /**
+     * @return the queueWaitTime
+     */
     public long getQueueWaitTime() {
         if (this.startTime > 0 && this.scheduledTime > 0) {
             if (this.updateTime > 0 && getCallbackAfterSeconds() > 0) {
@@ -562,7 +574,9 @@ public long getQueueWaitTime() {
         return 0L;
     }
 
-    /** @return a copy of the task instance */
+    /**
+     * @return a copy of the task instance
+     */
     public TaskModel copy() {
         TaskModel copy = new TaskModel();
         BeanUtils.copyProperties(this, copy);
diff --git a/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java b/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java
index 523d8be7f0..315563365b 100644
--- a/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java
+++ b/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java
@@ -197,28 +197,36 @@ public void setOutput(Map<String, Object> output) {
         this.output = output;
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @Deprecated
     @JsonProperty("input")
     public Map<String, Object> getRawInput() {
         return input;
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @Deprecated
     @JsonProperty("input")
     public void setRawInput(Map<String, Object> input) {
         setInput(input);
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @Deprecated
     @JsonProperty("output")
     public Map<String, Object> getRawOutput() {
         return output;
     }
 
-    /** @deprecated Used only for JSON serialization and deserialization. */
+    /**
+     * @deprecated Used only for JSON serialization and deserialization.
+     */
     @Deprecated
     @JsonProperty("output")
     public void setRawOutput(Map<String, Object> output) {
diff --git a/core/src/main/java/com/netflix/conductor/service/MetadataService.java b/core/src/main/java/com/netflix/conductor/service/MetadataService.java
index d87be2ff73..bf690f8097 100644
--- a/core/src/main/java/com/netflix/conductor/service/MetadataService.java
+++ b/core/src/main/java/com/netflix/conductor/service/MetadataService.java
@@ -29,19 +29,27 @@
 @Validated
 public interface MetadataService {
 
-    /** @param taskDefinitions Task Definitions to register */
+    /**
+     * @param taskDefinitions Task Definitions to register
+     */
     void registerTaskDef(
             @NotNull(message = "TaskDefList cannot be empty or null")
                     @Size(min = 1, message = "TaskDefList is empty")
                     List<@Valid TaskDef> taskDefinitions);
 
-    /** @param taskDefinition Task Definition to be updated */
+    /**
+     * @param taskDefinition Task Definition to be updated
+     */
     void updateTaskDef(@NotNull(message = "TaskDef cannot be null") @Valid TaskDef taskDefinition);
 
-    /** @param taskType Remove task definition */
+    /**
+     * @param taskType Remove task definition
+     */
     void unregisterTaskDef(@NotEmpty(message = "TaskName cannot be null or empty") String taskType);
 
-    /** @return List of all the registered tasks */
+    /**
+     * @return List of all the registered tasks
+     */
     List<TaskDef> getTaskDefs();
 
     /**
@@ -50,10 +58,14 @@ void registerTaskDef(
      */
     TaskDef getTaskDef(@NotEmpty(message = "TaskType cannot be null or empty") String taskType);
 
-    /** @param def Workflow definition to be updated */
+    /**
+     * @param def Workflow definition to be updated
+     */
     void updateWorkflowDef(@NotNull(message = "WorkflowDef cannot be null") @Valid WorkflowDef def);
 
-    /** @param workflowDefList Workflow definitions to be updated. */
+    /**
+     * @param workflowDefList Workflow definitions to be updated.
+     */
     void updateWorkflowDef(
             @NotNull(message = "WorkflowDef list name cannot be null or empty")
                     @Size(min = 1, message = "WorkflowDefList is empty")
@@ -96,15 +108,21 @@ void unregisterWorkflowDef(
     void addEventHandler(
             @NotNull(message = "EventHandler cannot be null") @Valid EventHandler eventHandler);
 
-    /** @param eventHandler Event handler to be updated. */
+    /**
+     * @param eventHandler Event handler to be updated.
+     */
     void updateEventHandler(
             @NotNull(message = "EventHandler cannot be null") @Valid EventHandler eventHandler);
 
-    /** @param name Removes the event handler from the system */
+    /**
+     * @param name Removes the event handler from the system
+     */
     void removeEventHandlerStatus(
             @NotEmpty(message = "EventName cannot be null or empty") String name);
 
-    /** @return All the event handlers registered in the system */
+    /**
+     * @return All the event handlers registered in the system
+     */
     List<EventHandler> getAllEventHandlers();
 
     /**
diff --git a/core/src/main/java/com/netflix/conductor/service/MetadataServiceImpl.java b/core/src/main/java/com/netflix/conductor/service/MetadataServiceImpl.java
index d0e97c478f..24ebd03083 100644
--- a/core/src/main/java/com/netflix/conductor/service/MetadataServiceImpl.java
+++ b/core/src/main/java/com/netflix/conductor/service/MetadataServiceImpl.java
@@ -47,7 +47,9 @@ public MetadataServiceImpl(
                 properties.isOwnerEmailMandatory());
     }
 
-    /** @param taskDefinitions Task Definitions to register */
+    /**
+     * @param taskDefinitions Task Definitions to register
+     */
     public void registerTaskDef(List<TaskDef> taskDefinitions) {
         for (TaskDef taskDefinition : taskDefinitions) {
             taskDefinition.setCreatedBy(WorkflowContext.get().getClientApp());
@@ -59,7 +61,9 @@ public void registerTaskDef(List<TaskDef> taskDefinitions) {
         }
     }
 
-    /** @param taskDefinition Task Definition to be updated */
+    /**
+     * @param taskDefinition Task Definition to be updated
+     */
     public void updateTaskDef(TaskDef taskDefinition) {
         TaskDef existing = metadataDAO.getTaskDef(taskDefinition.getName());
         if (existing == null) {
@@ -71,12 +75,16 @@ public void updateTaskDef(TaskDef taskDefinition) {
         metadataDAO.updateTaskDef(taskDefinition);
     }
 
-    /** @param taskType Remove task definition */
+    /**
+     * @param taskType Remove task definition
+     */
     public void unregisterTaskDef(String taskType) {
         metadataDAO.removeTaskDef(taskType);
     }
 
-    /** @return List of all the registered tasks */
+    /**
+     * @return List of all the registered tasks
+     */
     public List<TaskDef> getTaskDefs() {
         return metadataDAO.getAllTaskDefs();
     }
@@ -94,13 +102,17 @@ public TaskDef getTaskDef(String taskType) {
         return taskDef;
     }
 
-    /** @param workflowDef Workflow definition to be updated */
+    /**
+     * @param workflowDef Workflow definition to be updated
+     */
     public void updateWorkflowDef(WorkflowDef workflowDef) {
         workflowDef.setUpdateTime(System.currentTimeMillis());
         metadataDAO.updateWorkflowDef(workflowDef);
     }
 
-    /** @param workflowDefList Workflow definitions to be updated. */
+    /**
+     * @param workflowDefList Workflow definitions to be updated.
+     */
     public void updateWorkflowDef(List<WorkflowDef> workflowDefList) {
         for (WorkflowDef workflowDef : workflowDefList) {
             workflowDef.setUpdateTime(System.currentTimeMillis());
@@ -171,17 +183,23 @@ public void addEventHandler(EventHandler eventHandler) {
         eventHandlerDAO.addEventHandler(eventHandler);
     }
 
-    /** @param eventHandler Event handler to be updated. */
+    /**
+     * @param eventHandler Event handler to be updated.
+     */
     public void updateEventHandler(EventHandler eventHandler) {
         eventHandlerDAO.updateEventHandler(eventHandler);
     }
 
-    /** @param name Removes the event handler from the system */
+    /**
+     * @param name Removes the event handler from the system
+     */
     public void removeEventHandlerStatus(String name) {
         eventHandlerDAO.removeEventHandler(name);
     }
 
-    /** @return All the event handlers registered in the system */
+    /**
+     * @return All the event handlers registered in the system
+     */
     public List<EventHandler> getAllEventHandlers() {
         return eventHandlerDAO.getAllEventHandlers();
     }
diff --git a/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestLambda.java b/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestLambda.java
index b62a355ca4..b6a857fbe2 100644
--- a/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestLambda.java
+++ b/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestLambda.java
@@ -24,7 +24,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-/** @author x-ultra */
+/**
+ * @author x-ultra
+ */
 public class TestLambda {
 
     private final WorkflowModel workflow = new WorkflowModel();
diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/FilterProvider.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/FilterProvider.java
index 9dce2d775f..3c145975df 100644
--- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/FilterProvider.java
+++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/FilterProvider.java
@@ -16,6 +16,8 @@
 
 public interface FilterProvider {
 
-    /** @return FilterBuilder for elasticsearch */
+    /**
+     * @return FilterBuilder for elasticsearch
+     */
     public QueryBuilder getFilterBuilder();
 }
diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/GroupedExpression.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/GroupedExpression.java
index 84d362cafe..90fc3b489b 100644
--- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/GroupedExpression.java
+++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/GroupedExpression.java
@@ -43,7 +43,9 @@ public String toString() {
         return "(" + expression + ")";
     }
 
-    /** @return the expression */
+    /**
+     * @return the expression
+     */
     public Expression getExpression() {
         return expression;
     }
diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/NameValue.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/NameValue.java
index 75af2e8850..68c1e5af29 100644
--- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/NameValue.java
+++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/NameValue.java
@@ -72,17 +72,23 @@ public String toString() {
         return "" + name + op + value;
     }
 
-    /** @return the name */
+    /**
+     * @return the name
+     */
     public Name getName() {
         return name;
     }
 
-    /** @return the op */
+    /**
+     * @return the op
+     */
     public ComparisonOp getOp() {
         return op;
     }
 
-    /** @return the value */
+    /**
+     * @return the value
+     */
     public ConstValue getValue() {
         return value;
     }
diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/internal/Range.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/internal/Range.java
index b9d2b083ae..aa4c66f7a5 100644
--- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/internal/Range.java
+++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/query/parser/internal/Range.java
@@ -55,12 +55,16 @@ private String readNumber(InputStream is) throws Exception {
         return sb.toString().trim();
     }
 
-    /** @return the low */
+    /**
+     * @return the low
+     */
     public String getLow() {
         return low;
     }
 
-    /** @return the high */
+    /**
+     * @return the high
+     */
     public String getHigh() {
         return high;
     }
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/Expression.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/Expression.java
index 3892af0ef0..6ad82e7d06 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/Expression.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/Expression.java
@@ -23,7 +23,9 @@
 import com.netflix.conductor.es7.dao.query.parser.internal.BooleanOp;
 import com.netflix.conductor.es7.dao.query.parser.internal.ParserException;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class Expression extends AbstractNode implements FilterProvider {
 
     private NameValue nameVal;
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/FilterProvider.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/FilterProvider.java
index 2fa4a78389..80d17f6105 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/FilterProvider.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/FilterProvider.java
@@ -14,9 +14,13 @@
 
 import org.elasticsearch.index.query.QueryBuilder;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public interface FilterProvider {
 
-    /** @return FilterBuilder for elasticsearch */
+    /**
+     * @return FilterBuilder for elasticsearch
+     */
     public QueryBuilder getFilterBuilder();
 }
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/GroupedExpression.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/GroupedExpression.java
index 5f19237fca..dc33581308 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/GroupedExpression.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/GroupedExpression.java
@@ -19,7 +19,9 @@
 import com.netflix.conductor.es7.dao.query.parser.internal.AbstractNode;
 import com.netflix.conductor.es7.dao.query.parser.internal.ParserException;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class GroupedExpression extends AbstractNode implements FilterProvider {
 
     private Expression expression;
@@ -44,7 +46,9 @@ public String toString() {
         return "(" + expression + ")";
     }
 
-    /** @return the expression */
+    /**
+     * @return the expression
+     */
     public Expression getExpression() {
         return expression;
     }
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/NameValue.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/NameValue.java
index 3b2d6dbb55..604cf59d13 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/NameValue.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/NameValue.java
@@ -71,17 +71,23 @@ public String toString() {
         return "" + name + op + value;
     }
 
-    /** @return the name */
+    /**
+     * @return the name
+     */
     public Name getName() {
         return name;
     }
 
-    /** @return the op */
+    /**
+     * @return the op
+     */
     public ComparisonOp getOp() {
         return op;
     }
 
-    /** @return the value */
+    /**
+     * @return the value
+     */
     public ConstValue getValue() {
         return value;
     }
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractNode.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractNode.java
index d68b072c51..64c765acdd 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractNode.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractNode.java
@@ -18,7 +18,9 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public abstract class AbstractNode {
 
     public static final Pattern WHITESPACE = Pattern.compile("\\s");
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/BooleanOp.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/BooleanOp.java
index 214cd1bf34..2417c66192 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/BooleanOp.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/BooleanOp.java
@@ -14,7 +14,9 @@
 
 import java.io.InputStream;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class BooleanOp extends AbstractNode {
 
     private String value;
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ComparisonOp.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ComparisonOp.java
index 6a34d25d21..0a4ea78f61 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ComparisonOp.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ComparisonOp.java
@@ -14,7 +14,9 @@
 
 import java.io.InputStream;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class ComparisonOp extends AbstractNode {
 
     public enum Operators {
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/FunctionThrowingException.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/FunctionThrowingException.java
index f07745677d..b5d48bb681 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/FunctionThrowingException.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/FunctionThrowingException.java
@@ -12,7 +12,9 @@
  */
 package com.netflix.conductor.es7.dao.query.parser.internal;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 @FunctionalInterface
 public interface FunctionThrowingException<T> {
 
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ListConst.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ListConst.java
index e486954c63..a7b1ac72b1 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ListConst.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ListConst.java
@@ -16,7 +16,9 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/** @author Viren List of constants */
+/**
+ * @author Viren List of constants
+ */
 public class ListConst extends AbstractNode {
 
     private List<Object> values;
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Name.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Name.java
index 8bb5fc09ca..861937a2e8 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Name.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Name.java
@@ -14,7 +14,9 @@
 
 import java.io.InputStream;
 
-/** @author Viren Represents the name of the field to be searched against. */
+/**
+ * @author Viren Represents the name of the field to be searched against.
+ */
 public class Name extends AbstractNode {
 
     private String value;
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ParserException.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ParserException.java
index e95b82f375..c2bc089010 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ParserException.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ParserException.java
@@ -12,7 +12,9 @@
  */
 package com.netflix.conductor.es7.dao.query.parser.internal;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 @SuppressWarnings("serial")
 public class ParserException extends Exception {
 
diff --git a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Range.java b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Range.java
index 3e871a87e2..af0ff18601 100644
--- a/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Range.java
+++ b/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/Range.java
@@ -14,7 +14,9 @@
 
 import java.io.InputStream;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class Range extends AbstractNode {
 
     private String low;
@@ -57,12 +59,16 @@ private String readNumber(InputStream is) throws Exception {
         return numValue;
     }
 
-    /** @return the low */
+    /**
+     * @return the low
+     */
     public String getLow() {
         return low;
     }
 
-    /** @return the high */
+    /**
+     * @return the high
+     */
     public String getHigh() {
         return high;
     }
diff --git a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestExpression.java b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestExpression.java
index e35d4b6573..e6bf608ea3 100644
--- a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestExpression.java
+++ b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestExpression.java
@@ -27,7 +27,9 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class TestExpression extends AbstractParserTest {
 
     @Test
diff --git a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestGroupedExpression.java b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestGroupedExpression.java
index 5e4116fd63..8a0955814c 100644
--- a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestGroupedExpression.java
+++ b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/TestGroupedExpression.java
@@ -14,7 +14,9 @@
 
 import org.junit.Test;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class TestGroupedExpression {
 
     @Test
diff --git a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractParserTest.java b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractParserTest.java
index 874cd68d55..7286697f04 100644
--- a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractParserTest.java
+++ b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/AbstractParserTest.java
@@ -16,7 +16,9 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public abstract class AbstractParserTest {
 
     protected InputStream getInputStream(String expression) {
diff --git a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestBooleanOp.java b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestBooleanOp.java
index cc04e65640..bfcf45e76b 100644
--- a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestBooleanOp.java
+++ b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestBooleanOp.java
@@ -17,7 +17,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class TestBooleanOp extends AbstractParserTest {
 
     @Test
diff --git a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestComparisonOp.java b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestComparisonOp.java
index e21c432502..0e51dfea0a 100644
--- a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestComparisonOp.java
+++ b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestComparisonOp.java
@@ -17,7 +17,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class TestComparisonOp extends AbstractParserTest {
 
     @Test
diff --git a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestConstValue.java b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestConstValue.java
index dbb7633441..d9f6eaf86f 100644
--- a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestConstValue.java
+++ b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestConstValue.java
@@ -18,7 +18,9 @@
 
 import static org.junit.Assert.*;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class TestConstValue extends AbstractParserTest {
 
     @Test
diff --git a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestName.java b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestName.java
index 169075d448..f8a979939b 100644
--- a/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestName.java
+++ b/es7-persistence/src/test/java/com/netflix/conductor/es7/dao/query/parser/internal/TestName.java
@@ -17,7 +17,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-/** @author Viren */
+/**
+ * @author Viren
+ */
 public class TestName extends AbstractParserTest {
 
     @Test
diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/ConductorWorkflow.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/ConductorWorkflow.java
index 61f346e4cb..009aa517a9 100644
--- a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/ConductorWorkflow.java
+++ b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/ConductorWorkflow.java
@@ -30,7 +30,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-/** @param <T> Type of the workflow input */
+/**
+ * @param <T> Type of the workflow input
+ */
 public class ConductorWorkflow<T> {
 
     public static final InputOutputGetter input =
@@ -235,7 +237,9 @@ public boolean registerWorkflow(boolean overwrite, boolean registerTasks) {
         return workflowExecutor.registerWorkflow(workflowDef, overwrite);
     }
 
-    /** @return Convert to the WorkflowDef model used by the Metadata APIs */
+    /**
+     * @return Convert to the WorkflowDef model used by the Metadata APIs
+     */
     public WorkflowDef toWorkflowDef() {
 
         WorkflowDef def = new WorkflowDef();
diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/WorkflowBuilder.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/WorkflowBuilder.java
index 30d117b06c..caf33d8cfe 100644
--- a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/WorkflowBuilder.java
+++ b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/WorkflowBuilder.java
@@ -24,7 +24,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-/** @param <T> Input type for the workflow */
+/**
+ * @param <T> Input type for the workflow
+ */
 public class WorkflowBuilder<T> {
 
     private String name;
diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Http.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Http.java
index 0b19b8115d..b1685d395e 100644
--- a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Http.java
+++ b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Http.java
@@ -114,72 +114,100 @@ public enum HttpMethod {
         private Integer connectionTimeOut;
         private Integer readTimeOut;
 
-        /** @return the method */
+        /**
+         * @return the method
+         */
         public HttpMethod getMethod() {
             return method;
         }
 
-        /** @param method the method to set */
+        /**
+         * @param method the method to set
+         */
         public void setMethod(HttpMethod method) {
             this.method = method;
         }
 
-        /** @return the headers */
+        /**
+         * @return the headers
+         */
         public Map<String, Object> getHeaders() {
             return headers;
         }
 
-        /** @param headers the headers to set */
+        /**
+         * @param headers the headers to set
+         */
         public void setHeaders(Map<String, Object> headers) {
             this.headers = headers;
         }
 
-        /** @return the body */
+        /**
+         * @return the body
+         */
         public Object getBody() {
             return body;
         }
 
-        /** @param body the body to set */
+        /**
+         * @param body the body to set
+         */
         public void setBody(Object body) {
             this.body = body;
         }
 
-        /** @return the uri */
+        /**
+         * @return the uri
+         */
         public String getUri() {
             return uri;
         }
 
-        /** @param uri the uri to set */
+        /**
+         * @param uri the uri to set
+         */
         public void setUri(String uri) {
             this.uri = uri;
         }
 
-        /** @return the vipAddress */
+        /**
+         * @return the vipAddress
+         */
         public String getVipAddress() {
             return vipAddress;
         }
 
-        /** @param vipAddress the vipAddress to set */
+        /**
+         * @param vipAddress the vipAddress to set
+         */
         public void setVipAddress(String vipAddress) {
             this.vipAddress = vipAddress;
         }
 
-        /** @return the accept */
+        /**
+         * @return the accept
+         */
         public String getAccept() {
             return accept;
         }
 
-        /** @param accept the accept to set */
+        /**
+         * @param accept the accept to set
+         */
         public void setAccept(String accept) {
             this.accept = accept;
         }
 
-        /** @return the MIME content type to use for the request */
+        /**
+         * @return the MIME content type to use for the request
+         */
         public String getContentType() {
             return contentType;
         }
 
-        /** @param contentType the MIME content type to set */
+        /**
+         * @param contentType the MIME content type to set
+         */
         public void setContentType(String contentType) {
             this.contentType = contentType;
         }
@@ -192,12 +220,16 @@ public void setAppName(String appName) {
             this.appName = appName;
         }
 
-        /** @return the connectionTimeOut */
+        /**
+         * @return the connectionTimeOut
+         */
         public Integer getConnectionTimeOut() {
             return connectionTimeOut;
         }
 
-        /** @return the readTimeOut */
+        /**
+         * @return the readTimeOut
+         */
         public Integer getReadTimeOut() {
             return readTimeOut;
         }
diff --git a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/LazyToString.java b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/LazyToString.java
index 52aea4321d..af19d8de0a 100644
--- a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/LazyToString.java
+++ b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/LazyToString.java
@@ -19,7 +19,9 @@ public class LazyToString {
 
     private final Supplier<String> supplier;
 
-    /** @param supplier Supplier to execute when {@link #toString()} is called. */
+    /**
+     * @param supplier Supplier to execute when {@link #toString()} is called.
+     */
     public LazyToString(Supplier<String> supplier) {
         this.supplier = supplier;
     }
diff --git a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/Query.java b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/Query.java
index 64a52cf2ed..6c89a8872f 100644
--- a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/Query.java
+++ b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/util/Query.java
@@ -266,7 +266,9 @@ public long executeCount() {
         return executeScalar(Long.class);
     }
 
-    /** @return The result of {@link PreparedStatement#executeUpdate()} */
+    /**
+     * @return The result of {@link PreparedStatement#executeUpdate()}
+     */
     public int executeUpdate() {
         try {
 
@@ -314,7 +316,9 @@ public ResultSet executeQuery() {
         }
     }
 
-    /** @return The single result of the query as an Object. */
+    /**
+     * @return The single result of the query as an Object.
+     */
     public Object executeScalar() {
         try (ResultSet rs = executeQuery()) {
             if (!rs.next()) {
diff --git a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/LazyToString.java b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/LazyToString.java
index 6d6ec55c71..9f98e770d0 100644
--- a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/LazyToString.java
+++ b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/LazyToString.java
@@ -19,7 +19,9 @@ public class LazyToString {
 
     private final Supplier<String> supplier;
 
-    /** @param supplier Supplier to execute when {@link #toString()} is called. */
+    /**
+     * @param supplier Supplier to execute when {@link #toString()} is called.
+     */
     public LazyToString(Supplier<String> supplier) {
         this.supplier = supplier;
     }
diff --git a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/Query.java b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/Query.java
index 6c4fa0e588..935eb99ecd 100644
--- a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/Query.java
+++ b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/util/Query.java
@@ -266,7 +266,9 @@ public long executeCount() {
         return executeScalar(Long.class);
     }
 
-    /** @return The result of {@link PreparedStatement#executeUpdate()} */
+    /**
+     * @return The result of {@link PreparedStatement#executeUpdate()}
+     */
     public int executeUpdate() {
         try {
 
@@ -314,7 +316,9 @@ public ResultSet executeQuery() {
         }
     }
 
-    /** @return The single result of the query as an Object. */
+    /**
+     * @return The single result of the query as an Object.
+     */
     public Object executeScalar() {
         try (ResultSet rs = executeQuery()) {
             if (!rs.next()) {