Skip to content

Commit 91b0c9c

Browse files
ulisseslimaulisseslima
authored
Merge pull request #18812 from panos-kakos/JAVA-48023-N
[JAVA-48023]
2 parents 7eef5af + be87cdb commit 91b0c9c

File tree

18 files changed

+74
-35
lines changed

18 files changed

+74
-35
lines changed

core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/completablefuture/CompletableFutureLongRunningUnitTest.java renamed to core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/completablefuture/CompletableFutureLongRunningUnitTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package com.baeldung.concurrent.completablefuture;
22

3-
import org.junit.Test;
3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertFalse;
5+
import static org.junit.Assert.assertSame;
6+
import static org.junit.Assert.assertTrue;
47

58
import java.util.concurrent.CancellationException;
69
import java.util.concurrent.CompletableFuture;
@@ -12,10 +15,7 @@
1215
import java.util.stream.Collectors;
1316
import java.util.stream.Stream;
1417

15-
import static org.junit.Assert.assertEquals;
16-
import static org.junit.Assert.assertFalse;
17-
import static org.junit.Assert.assertSame;
18-
import static org.junit.Assert.assertTrue;
18+
import org.junit.Test;
1919

2020
public class CompletableFutureLongRunningUnitTest {
2121

core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedBlocks.java renamed to core-java-modules/core-java-concurrency-basic-4/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedBlocks.java

File renamed without changes.

core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedMethods.java renamed to core-java-modules/core-java-concurrency-basic-4/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedMethods.java

File renamed without changes.

core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/volatilekeyword/SharedObject.java renamed to core-java-modules/core-java-concurrency-basic-4/src/main/java/com/baeldung/concurrent/volatilekeyword/SharedObject.java

File renamed without changes.

core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/volatilekeyword/TaskRunner.java renamed to core-java-modules/core-java-concurrency-basic-4/src/main/java/com/baeldung/concurrent/volatilekeyword/TaskRunner.java

File renamed without changes.

core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedBlocksUnitTest.java renamed to core-java-modules/core-java-concurrency-basic-4/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedBlocksUnitTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.baeldung.concurrent.synchronize;
22

3-
import org.junit.Test;
3+
import static org.junit.Assert.assertEquals;
44

55
import java.util.concurrent.ExecutorService;
66
import java.util.concurrent.Executors;
77
import java.util.concurrent.TimeUnit;
88
import java.util.stream.IntStream;
99

10-
import static org.junit.Assert.assertEquals;
10+
import org.junit.Test;
1111

1212
public class SynchronizedBlocksUnitTest {
1313

core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedMethodsUnitTest.java renamed to core-java-modules/core-java-concurrency-basic-4/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedMethodsUnitTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.baeldung.concurrent.synchronize;
22

3-
import org.junit.Ignore;
4-
import org.junit.Test;
3+
import static org.junit.Assert.assertEquals;
54

65
import java.util.concurrent.ExecutorService;
76
import java.util.concurrent.Executors;
87
import java.util.concurrent.TimeUnit;
98
import java.util.stream.IntStream;
109

11-
import static org.junit.Assert.assertEquals;
10+
import org.junit.Ignore;
11+
import org.junit.Test;
1212

1313
public class SynchronizedMethodsUnitTest {
1414

core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/volatilekeyword/SharedObjectManualTest.java renamed to core-java-modules/core-java-concurrency-basic-4/src/test/java/com/baeldung/concurrent/volatilekeyword/SharedObjectManualTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.concurrent.volatilekeyword;
22

3-
import org.junit.Test;
3+
import static org.junit.Assert.assertEquals;
44

5-
import static org.junit.Assert.*;
5+
import org.junit.Test;
66

77
public class SharedObjectManualTest {
88

‎core-java-modules/core-java-concurrency-basic-5/pom.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>core-java-concurrency-basic-5</artifactId>
7+
<packaging>jar</packaging>
8+
<name>core-java-concurrency-basic-5</name>
9+
10+
<parent>
11+
<groupId>com.baeldung.core-java-modules</groupId>
12+
<artifactId>core-java-modules</artifactId>
13+
<version>0.0.1-SNAPSHOT</version>
14+
</parent>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.wiremock</groupId>
19+
<artifactId>wiremock</artifactId>
20+
<version>${wiremock.version}</version>
21+
<scope>test</scope>
22+
</dependency>
23+
</dependencies>
24+
25+
<properties>
26+
<wiremock.version>3.1.0</wiremock.version>
27+
</properties>
28+
29+
</project>

‎core-java-modules/core-java-concurrency-basic-5/src/main/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

0 commit comments

Comments
 (0)