Java 11 migrate remaining p (#1122)
* Moves partial-response to Java 11 * Moves pipeline to Java 11 * Moves poison-pill to Java 11 * Moves priority-queue to Java 11 * Moves private-class-data to Java 11 * Moves producer-consumer to Java 11 * Moves promise to Java 11 * Moves property to Java 11 * Moves prototype to Java 11 * Moves proxy to Java 11 * Corrects checkstyle errors * Fixes build for pipeline pattern
This commit is contained in:
committed by
Ilkka Seppälä
parent
1401accb4f
commit
428efc7d53
@ -37,22 +37,22 @@ public class Application {
|
||||
*/
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
QueueManager queueManager = new QueueManager(100);
|
||||
var queueManager = new QueueManager(100);
|
||||
|
||||
// push some message to queue
|
||||
// Low Priority message
|
||||
for (int i = 0; i < 100; i++) {
|
||||
for (var i = 0; i < 100; i++) {
|
||||
queueManager.publishMessage(new Message("Low Message Priority", 0));
|
||||
}
|
||||
|
||||
// High Priority message
|
||||
for (int i = 0; i < 100; i++) {
|
||||
for (var i = 0; i < 100; i++) {
|
||||
queueManager.publishMessage(new Message("High Message Priority", 1));
|
||||
}
|
||||
|
||||
|
||||
// run worker
|
||||
Worker worker = new Worker(queueManager);
|
||||
var worker = new Worker(queueManager);
|
||||
worker.run();
|
||||
|
||||
|
||||
|
@ -57,7 +57,7 @@ public class PriorityMessageQueue<T extends Comparable> {
|
||||
return null;
|
||||
}
|
||||
|
||||
final T root = queue[0];
|
||||
final var root = queue[0];
|
||||
queue[0] = queue[size - 1];
|
||||
size--;
|
||||
maxHeapifyDown();
|
||||
@ -83,10 +83,10 @@ public class PriorityMessageQueue<T extends Comparable> {
|
||||
|
||||
|
||||
private void maxHeapifyDown() {
|
||||
int index = 0;
|
||||
var index = 0;
|
||||
while (hasLeftChild(index)) {
|
||||
|
||||
int smallerIndex = leftChildIndex(index);
|
||||
var smallerIndex = leftChildIndex(index);
|
||||
|
||||
if (hasRightChild(index) && right(index).compareTo(left(index)) > 0) {
|
||||
smallerIndex = rightChildIndex(index);
|
||||
@ -106,7 +106,7 @@ public class PriorityMessageQueue<T extends Comparable> {
|
||||
}
|
||||
|
||||
private void maxHeapifyUp() {
|
||||
int index = size - 1;
|
||||
var index = size - 1;
|
||||
while (hasParent(index) && parent(index).compareTo(queue[index]) < 0) {
|
||||
swap(parentIndex(index), index);
|
||||
index = parentIndex(index);
|
||||
@ -154,7 +154,7 @@ public class PriorityMessageQueue<T extends Comparable> {
|
||||
}
|
||||
|
||||
private void swap(int fpos, int tpos) {
|
||||
T tmp = queue[fpos];
|
||||
var tmp = queue[fpos];
|
||||
queue[fpos] = queue[tpos];
|
||||
queue[tpos] = tmp;
|
||||
}
|
||||
@ -170,7 +170,7 @@ public class PriorityMessageQueue<T extends Comparable> {
|
||||
* For debug .. print current state of queue
|
||||
*/
|
||||
public void print() {
|
||||
for (int i = 0; i <= size / 2; i++) {
|
||||
for (var i = 0; i <= size / 2; i++) {
|
||||
LOGGER.info(" PARENT : " + queue[i] + " LEFT CHILD : "
|
||||
+ left(i) + " RIGHT CHILD :" + right(i));
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ public class QueueManager {
|
||||
private final PriorityMessageQueue<Message> messagePriorityMessageQueue;
|
||||
|
||||
public QueueManager(int initialCapacity) {
|
||||
messagePriorityMessageQueue = new PriorityMessageQueue<Message>(new Message[initialCapacity]);
|
||||
messagePriorityMessageQueue = new PriorityMessageQueue<>(new Message[initialCapacity]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -45,7 +45,7 @@ public class Worker {
|
||||
@SuppressWarnings("squid:S2189")
|
||||
public void run() throws Exception {
|
||||
while (true) {
|
||||
Message message = queueManager.receiveMessage();
|
||||
var message = queueManager.receiveMessage();
|
||||
if (message == null) {
|
||||
LOGGER.info("No Message ... waiting");
|
||||
Thread.sleep(200);
|
||||
|
@ -23,11 +23,11 @@
|
||||
|
||||
package com.iluwatar.priority.queue;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* Test case for order of messages
|
||||
*/
|
||||
@ -36,25 +36,25 @@ public class PriorityMessageQueueTest {
|
||||
|
||||
@Test
|
||||
public void remove() {
|
||||
PriorityMessageQueue<String> stringPriorityMessageQueue = new PriorityMessageQueue<>(new String[2]);
|
||||
String pushMessage = "test";
|
||||
var stringPriorityMessageQueue = new PriorityMessageQueue<>(new String[2]);
|
||||
var pushMessage = "test";
|
||||
stringPriorityMessageQueue.add(pushMessage);
|
||||
assertEquals(stringPriorityMessageQueue.remove(), pushMessage);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void add() {
|
||||
PriorityMessageQueue<Integer> stringPriorityMessageQueue = new PriorityMessageQueue<>(new Integer[2]);
|
||||
var stringPriorityMessageQueue = new PriorityMessageQueue<>(new Integer[2]);
|
||||
stringPriorityMessageQueue.add(1);
|
||||
stringPriorityMessageQueue.add(5);
|
||||
stringPriorityMessageQueue.add(10);
|
||||
stringPriorityMessageQueue.add(3);
|
||||
assertTrue(stringPriorityMessageQueue.remove() == 10);
|
||||
assertEquals(10, (int) stringPriorityMessageQueue.remove());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isEmpty() {
|
||||
PriorityMessageQueue<Integer> stringPriorityMessageQueue = new PriorityMessageQueue<>(new Integer[2]);
|
||||
var stringPriorityMessageQueue = new PriorityMessageQueue<>(new Integer[2]);
|
||||
assertTrue(stringPriorityMessageQueue.isEmpty());
|
||||
stringPriorityMessageQueue.add(1);
|
||||
stringPriorityMessageQueue.remove();
|
||||
@ -63,12 +63,12 @@ public class PriorityMessageQueueTest {
|
||||
|
||||
@Test
|
||||
public void testEnsureSize() {
|
||||
PriorityMessageQueue<Integer> stringPriorityMessageQueue = new PriorityMessageQueue<>(new Integer[2]);
|
||||
var stringPriorityMessageQueue = new PriorityMessageQueue<>(new Integer[2]);
|
||||
assertTrue(stringPriorityMessageQueue.isEmpty());
|
||||
stringPriorityMessageQueue.add(1);
|
||||
stringPriorityMessageQueue.add(2);
|
||||
stringPriorityMessageQueue.add(2);
|
||||
stringPriorityMessageQueue.add(3);
|
||||
assertTrue(stringPriorityMessageQueue.remove() == 3);
|
||||
assertEquals(3, (int) stringPriorityMessageQueue.remove());
|
||||
}
|
||||
}
|
@ -23,10 +23,10 @@
|
||||
|
||||
package com.iluwatar.priority.queue;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* Check queue manager
|
||||
*/
|
||||
@ -34,21 +34,21 @@ public class QueueManagerTest {
|
||||
|
||||
@Test
|
||||
public void publishMessage() {
|
||||
QueueManager queueManager = new QueueManager(2);
|
||||
Message testMessage = new Message("Test Message", 1);
|
||||
var queueManager = new QueueManager(2);
|
||||
var testMessage = new Message("Test Message", 1);
|
||||
queueManager.publishMessage(testMessage);
|
||||
Message recivedMessage = queueManager.receiveMessage();
|
||||
var recivedMessage = queueManager.receiveMessage();
|
||||
assertEquals(testMessage, recivedMessage);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void receiveMessage() {
|
||||
QueueManager queueManager = new QueueManager(2);
|
||||
Message testMessage1 = new Message("Test Message 1", 1);
|
||||
var queueManager = new QueueManager(2);
|
||||
var testMessage1 = new Message("Test Message 1", 1);
|
||||
queueManager.publishMessage(testMessage1);
|
||||
Message testMessage2 = new Message("Test Message 2", 2);
|
||||
var testMessage2 = new Message("Test Message 2", 2);
|
||||
queueManager.publishMessage(testMessage2);
|
||||
Message recivedMessage = queueManager.receiveMessage();
|
||||
var recivedMessage = queueManager.receiveMessage();
|
||||
assertEquals(testMessage2, recivedMessage);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user