This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 3dc5e992524aa69479daa15ef788b0da35c59d44 Author: juanpablo <[email protected]> AuthorDate: Fri Nov 2 21:55:11 2018 +0100 remove warnings from org.apache.jspwiki.workflow package --- .../main/java/org/apache/wiki/workflow/AbstractStep.java | 4 ++-- .../src/main/java/org/apache/wiki/workflow/Decision.java | 2 +- .../java/org/apache/wiki/workflow/DecisionQueue.java | 7 +++---- .../src/main/java/org/apache/wiki/workflow/Step.java | 4 ++-- .../src/main/java/org/apache/wiki/workflow/Workflow.java | 2 +- .../java/org/apache/wiki/workflow/WorkflowManager.java | 16 +++++++--------- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java index cbd75ef..3de438f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java @@ -110,7 +110,7 @@ public abstract class AbstractStep implements Step /** * {@inheritDoc} */ - public final Collection getAvailableOutcomes() + public final Collection< Outcome > getAvailableOutcomes() { Set<Outcome> outcomes = m_successors.keySet(); return Collections.unmodifiableCollection( outcomes ); @@ -119,7 +119,7 @@ public abstract class AbstractStep implements Step /** * {@inheritDoc} */ - public final List getErrors() + public final List< String > getErrors() { return Collections.unmodifiableList( m_errors ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java index c7cfd0b..003be8d 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java @@ -187,7 +187,7 @@ public abstract class Decision extends AbstractStep * * @return the list of Facts */ - public final List getFacts() + public final List< Fact > getFacts() { return Collections.unmodifiableList( m_facts ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java index 5790273..135ce56 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java @@ -67,8 +67,7 @@ public class DecisionQueue implements Serializable * order of submission. If no Decisions are pending, this method returns a * zero-length array. * - * @return the pending decisions TODO: explore whether this method could be - * made protected + * @return the pending decisions */ protected Decision[] decisions() { @@ -95,9 +94,9 @@ public class DecisionQueue implements Serializable * the wiki session * @return the collection of Decisions, which may be empty */ - public Collection getActorDecisions(WikiSession session) + public Collection<Decision> getActorDecisions(WikiSession session) { - ArrayList<Decision> decisions = new ArrayList<Decision>(); + ArrayList<Decision> decisions = new ArrayList<>(); if ( session.isAuthenticated() ) { Principal[] principals = session.getPrincipals(); diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java index 9539ed4..4a98248 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java @@ -85,7 +85,7 @@ public interface Step extends Serializable * * @return the set of outcomes */ - Collection getAvailableOutcomes(); + Collection< Outcome > getAvailableOutcomes(); /** * Returns a List of error strings generated by this Step. If this Step @@ -93,7 +93,7 @@ public interface Step extends Serializable * * @return the errors */ - List getErrors(); + List< String > getErrors(); /** * <p> diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java index d752642..0884dee 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java @@ -504,7 +504,7 @@ public class Workflow implements Serializable * @return an array of Steps representing those that have executed, or are * currently executing */ - public final List getHistory() + public final List< Step > getHistory() { return Collections.unmodifiableList( m_history ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java index 677fe15..a0f4f6e 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java @@ -65,9 +65,9 @@ public class WorkflowManager implements WikiEventListener { public WorkflowManager() { m_next = 1; - m_workflows = new HashSet<Workflow>(); - m_approvers = new HashMap<String, Principal>(); - m_completed = new ArrayList<Workflow>(); + m_workflows = new HashSet<>(); + m_approvers = new HashMap<>(); + m_completed = new ArrayList<>(); } /** @@ -91,8 +91,7 @@ public class WorkflowManager implements WikiEventListener { * * @return the current workflows */ - public Collection getWorkflows() - { + public Collection< Workflow > getWorkflows() { return new HashSet<Workflow>( m_workflows ); } @@ -100,9 +99,8 @@ public class WorkflowManager implements WikiEventListener { * Returns a collection of finished workflows; that is, those that have aborted or completed. * @return the finished workflows */ - public List getCompletedWorkflows() - { - return new ArrayList<Workflow>( m_completed ); + public List< Workflow > getCompletedWorkflows() { + return new ArrayList< Workflow >( m_completed ); } private WikiEngine m_engine = null; @@ -247,7 +245,7 @@ public class WorkflowManager implements WikiEventListener { * @param session the wiki session * @return the collection workflows the wiki session owns, which may be empty */ - public Collection getOwnerWorkflows( WikiSession session ) + public Collection< Workflow > getOwnerWorkflows( WikiSession session ) { List<Workflow> workflows = new ArrayList<Workflow>(); if ( session.isAuthenticated() )
