gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade of maven plugins (#951)

Browse Source 
* Upgrade maven plugins

* Upgrade maven plugins

Some general code cleanup was necessary due to upgrade of PMD and checkstyle.

Also needed to add Junit 4 as a dependency due to Mockito.timout issue found here:
https://github.com/mockito/mockito/issues/152
This commit is contained in:
Per Wramdemark
2019-10-05 13:23:20 +02:00
committed by Ilkka Seppälä
parent 05d0f0babf
commit 218ba44dbf
19 changed files with 63 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
commander/src/main/java/com/iluwatar/commander/Commander.java
View File

@ -239,12 +239,12 @@ public class Commander {
//since payment time is lesser than queuetime it would have already failed..additional check not needed
LOG.trace("Order " + qt.order.id + ": Queue time for order over, failed..");
return;
} else if ((qt.taskType.equals(TaskType.Payment) && !qt.order.paid.equals(PaymentStatus.Trying))
|| (qt.taskType.equals(TaskType.Messaging) && ((qt.messageType == 1
&& !qt.order.messageSent.equals(MessageSent.NoneSent))
} else if (qt.taskType.equals(TaskType.Payment) && !qt.order.paid.equals(PaymentStatus.Trying)
|| qt.taskType.equals(TaskType.Messaging) && (qt.messageType == 1
&& !qt.order.messageSent.equals(MessageSent.NoneSent)
|| qt.order.messageSent.equals(MessageSent.PaymentFail)
|| qt.order.messageSent.equals(MessageSent.PaymentSuccessful)))
|| (qt.taskType.equals(TaskType.EmployeeDb) && qt.order.addedToEmployeeHandle)) {
|| qt.order.messageSent.equals(MessageSent.PaymentSuccessful))
|| qt.taskType.equals(TaskType.EmployeeDb) && qt.order.addedToEmployeeHandle) {
LOG.trace("Order " + qt.order.id + ": Not queueing task since task already done..");
return;
}
@ -576,8 +576,8 @@ public class Commander {
|| qt.order.messageSent.equals(MessageSent.PaymentSuccessful)) {
tryDequeue();
LOG.trace("Order " + qt.order.id + ": This messaging task already done, dequeue..");
} else if ((qt.messageType == 1 && (!qt.order.messageSent.equals(MessageSent.NoneSent)
|| !qt.order.paid.equals(PaymentStatus.Trying)))) {
} else if (qt.messageType == 1 && (!qt.order.messageSent.equals(MessageSent.NoneSent)
|| !qt.order.paid.equals(PaymentStatus.Trying))) {
tryDequeue();
LOG.trace("Order " + qt.order.id + ": This messaging task does not need to be done, dequeue..");
} else if (qt.messageType == 0) {
@ -606,8 +606,7 @@ public class Commander {
} else {
Thread.sleep(queueTaskTime / 3);
tryDoingTasksInQueue();
}
return;
}
}
}

4
commander/src/main/java/com/iluwatar/commander/queue/Queue.java
View File

@ -83,7 +83,7 @@ public class Queue<T> {
Node temp = front;
front = front.next;
size = size - 1;
return ((T) temp.value);
return (T) temp.value;
}
}
@ -91,7 +91,7 @@ public class Queue<T> {
if (isEmpty()) {
throw new IsEmptyException();
} else {
return ((T)front.value);
return (T)front.value;
}
}
}