Skip to content

Commit d733122

Browse files
Java 11 migraiton: mutex
1 parent 2fa938c commit d733122

File tree

6 files changed

+19
-23
lines changed

6 files changed

+19
-23
lines changed

mutex/src/main/java/com/iluwatar/mutex/App.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public class App {
3838
* main method.
3939
*/
4040
public static void main(String[] args) {
41-
Mutex mutex = new Mutex();
42-
Jar jar = new Jar(1000, mutex);
43-
Thief peter = new Thief("Peter", jar);
44-
Thief john = new Thief("John", jar);
41+
var mutex = new Mutex();
42+
var jar = new Jar(1000, mutex);
43+
var peter = new Thief("Peter", jar);
44+
var john = new Thief("John", jar);
4545
peter.start();
4646
john.start();
4747
}

mutex/src/main/java/com/iluwatar/mutex/Jar.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Jar(int beans, Lock lock) {
4848
* Method for a thief to take a bean.
4949
*/
5050
public boolean takeBean() {
51-
boolean success = false;
51+
var success = false;
5252
try {
5353
lock.acquire();
5454
success = beans > 0;

mutex/src/main/java/com/iluwatar/mutex/Thief.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public Thief(String name, Jar jar) {
5454
*/
5555
@Override
5656
public void run() {
57-
int beans = 0;
57+
var beans = 0;
5858

5959
while (jar.takeBean()) {
6060
beans = beans + 1;

mutex/src/test/java/com/iluwatar/mutex/AppTest.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@
2525

2626
import org.junit.jupiter.api.Test;
2727

28-
import java.io.IOException;
29-
3028
/**
3129
* Application Test Entrypoint
3230
*/
3331
public class AppTest {
3432
@Test
35-
public void test() throws IOException {
36-
String[] args = {};
37-
App.main(args);
33+
public void test() {
34+
App.main(new String[]{});
3835
}
3936
}

mutex/src/test/java/com/iluwatar/mutex/JarTest.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323

2424
package com.iluwatar.mutex;
2525

26-
import org.junit.jupiter.api.Test;
27-
2826
import static org.junit.jupiter.api.Assertions.assertFalse;
29-
import static org.junit.jupiter.api.Assertions.assertTrue;
27+
28+
import java.util.stream.IntStream;
29+
import org.junit.jupiter.api.Assertions;
30+
import org.junit.jupiter.api.Test;
3031

3132
/**
3233
* Test case for taking beans from a Jar
@@ -35,12 +36,10 @@ public class JarTest {
3536

3637
@Test
3738
public void testTakeBeans() {
38-
Mutex mutex = new Mutex();
39-
Jar jar = new Jar(10, mutex);
40-
for (int i = 0; i < 10; i++) {
41-
assertTrue(jar.takeBean());
42-
}
39+
var mutex = new Mutex();
40+
var jar = new Jar(10, mutex);
41+
IntStream.range(0, 10).mapToObj(i -> jar.takeBean()).forEach(Assertions::assertTrue);
4342
assertFalse(jar.takeBean());
4443
}
4544

46-
}
45+
}

mutex/src/test/java/com/iluwatar/mutex/MutexTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323

2424
package com.iluwatar.mutex;
2525

26-
import org.junit.jupiter.api.Test;
27-
2826
import static org.junit.jupiter.api.Assertions.assertEquals;
2927
import static org.junit.jupiter.api.Assertions.assertNull;
3028
import static org.junit.jupiter.api.Assertions.fail;
3129

30+
import org.junit.jupiter.api.Test;
31+
3232
/**
3333
* Test case for acquiring and releasing a Mutex
3434
*/
3535
public class MutexTest {
3636

3737
@Test
3838
public void acquireReleaseTest() {
39-
Mutex mutex = new Mutex();
39+
var mutex = new Mutex();
4040
assertNull(mutex.getOwner());
4141
try {
4242
mutex.acquire();

0 commit comments

Comments
 (0)