Skip to content

Commit 21d3e16

Browse files
panos-kakospanos-kakos
authored
[JAVA-29427] Consolidate libraries modules (eugenp#15536)
1 parent 5c6e53c commit 21d3e16

File tree

60 files changed

+363
-452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+363
-452
lines changed

‎libraries-2/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
1414
- [A Guide to Crawler4j](https://www.baeldung.com/crawler4j)
1515
- [A Guide to Apache Mesos](https://www.baeldung.com/apache-mesos)
1616
- [Guide to MapDB](https://www.baeldung.com/mapdb)
17+
- [Find Files by Extension in Specified Directory in Java](https://www.baeldung.com/java-recursive-search-directory-extension-match)
18+
- [Apache Commons Collections vs Google Guava](https://www.baeldung.com/apache-commons-collections-vs-guava)
1719
- More articles [[<-- prev]](/libraries) [[next -->]](/libraries-3)
1820

‎libraries-2/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,21 @@
8282
<artifactId>mapdb</artifactId>
8383
<version>${mapdb.version}</version>
8484
</dependency>
85+
<dependency>
86+
<groupId>commons-io</groupId>
87+
<artifactId>commons-io</artifactId>
88+
<version>${commons-io.version}</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.apache.commons</groupId>
92+
<artifactId>commons-collections4</artifactId>
93+
<version>${commons-collections4.version}</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.google.guava</groupId>
97+
<artifactId>guava</artifactId>
98+
<version>${guava.version}</version>
99+
</dependency>
85100
</dependencies>
86101

87102
<build>

‎libraries-7/src/main/java/com/baeldung/findfiles/FindFileApacheUtils.java ‎libraries-2/src/main/java/com/baeldung/findfiles/FindFileApacheUtils.java

File renamed without changes.

‎libraries-7/src/main/java/com/baeldung/findfiles/FindFileJava2Utils.java ‎libraries-2/src/main/java/com/baeldung/findfiles/FindFileJava2Utils.java

File renamed without changes.

‎libraries-7/src/main/java/com/baeldung/findfiles/FindFileJava7Utils.java ‎libraries-2/src/main/java/com/baeldung/findfiles/FindFileJava7Utils.java

File renamed without changes.

‎libraries-7/src/main/java/com/baeldung/findfiles/FindFileJava8Utils.java ‎libraries-2/src/main/java/com/baeldung/findfiles/FindFileJava8Utils.java

File renamed without changes.

‎libraries-7/src/main/java/com/baeldung/findfiles/MatchExtensionPredicate.java ‎libraries-2/src/main/java/com/baeldung/findfiles/MatchExtensionPredicate.java

File renamed without changes.

‎libraries-7/src/main/java/com/baeldung/findfiles/SimpleFileConsumerVisitor.java ‎libraries-2/src/main/java/com/baeldung/findfiles/SimpleFileConsumerVisitor.java

File renamed without changes.

‎libraries-6/src/test/java/com/baeldung/apache/commons/CollectionsUnitTest.java ‎libraries-2/src/test/java/com/baeldung/apache/commons/CollectionsUnitTest.java

File renamed without changes.

‎libraries-7/src/test/java/com/baeldung/findfiles/FindFileUtilsIntegrationTest.java ‎libraries-2/src/test/java/com/baeldung/findfiles/FindFileUtilsIntegrationTest.java

File renamed without changes.

‎libraries-6/src/test/java/com/baeldung/guava/GuavaUnitTest.java ‎libraries-2/src/test/java/com/baeldung/guava/GuavaUnitTest.java

File renamed without changes.

‎libraries-3/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
1313
- [Introduction to Alibaba Arthas](https://www.baeldung.com/java-alibaba-arthas-intro)
1414
- [Intro to Structurizr](https://www.baeldung.com/structurizr)
1515
- [Introduction to Immutables](https://www.baeldung.com/immutables)
16+
- [A Docker Guide for Java](https://www.baeldung.com/docker-java-api)
17+
- [Introduction to jOOL](https://www.baeldung.com/jool)
18+
- [Introduction to Atlassian Fugue](https://www.baeldung.com/java-fugue)
19+
- [Publish and Receive Messages with Nats Java Client](https://www.baeldung.com/nats-java-client)
1620
- More articles [[<-- prev]](../libraries-2) [[next -->]](../libraries-4)

‎libraries-3/pom.xml

+39
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,40 @@
9191
<artifactId>javax.annotation-api</artifactId>
9292
<version>${javax.annotation-api.version}</version>
9393
</dependency>
94+
<dependency>
95+
<groupId>io.nats</groupId>
96+
<artifactId>jnats</artifactId>
97+
<version>${jnats.version}</version>
98+
</dependency>
99+
<dependency>
100+
<groupId>io.atlassian.fugue</groupId>
101+
<artifactId>fugue</artifactId>
102+
<version>${fugue.version}</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.jooq</groupId>
106+
<artifactId>jool</artifactId>
107+
<version>${jool.version}</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>com.github.docker-java</groupId>
111+
<artifactId>docker-java</artifactId>
112+
<version>${docker.version}</version>
113+
<exclusions>
114+
<exclusion>
115+
<groupId>org.slf4j</groupId>
116+
<artifactId>slf4j-log4j12</artifactId>
117+
</exclusion>
118+
<exclusion>
119+
<groupId>org.slf4j</groupId>
120+
<artifactId>jcl-over-slf4j</artifactId>
121+
</exclusion>
122+
<exclusion>
123+
<groupId>ch.qos.logback</groupId>
124+
<artifactId>logback-classic</artifactId>
125+
</exclusion>
126+
</exclusions>
127+
</dependency>
94128
</dependencies>
95129

96130
<build>
@@ -148,6 +182,11 @@
148182
<immutables.version>2.5.6</immutables.version>
149183
<mutabilitydetector.version>0.9.6</mutabilitydetector.version>
150184
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
185+
<jnats.version>1.0</jnats.version>
186+
<fugue.version>4.5.1</fugue.version>
187+
<jool.version>0.9.12</jool.version>
188+
<scala.version>2.12</scala.version>
189+
<docker.version>3.0.14</docker.version>
151190
</properties>
152191

153192
</project>

‎libraries-5/src/main/java/com/baeldung/jnats/NatsClient.java ‎libraries-3/src/main/java/com/baeldung/jnats/NatsClient.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package com.baeldung.jnats;
22

3+
import java.io.IOException;
4+
import java.util.HashMap;
5+
import java.util.Map;
6+
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
310
import io.nats.client.AsyncSubscription;
411
import io.nats.client.Connection;
512
import io.nats.client.Message;
613
import io.nats.client.Nats;
714
import io.nats.client.Options;
815
import io.nats.client.Subscription;
916
import io.nats.client.SyncSubscription;
10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
12-
13-
import java.io.IOException;
14-
import java.util.HashMap;
15-
import java.util.Map;
1617

1718
public final class NatsClient {
1819

‎libraries-5/src/test/java/com/baeldung/dockerapi/ContainerLiveTest.java ‎libraries-3/src/test/java/com/baeldung/dockerapi/ContainerLiveTest.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
package com.baeldung.dockerapi;
22

3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.not;
5+
import static org.hamcrest.core.Is.is;
6+
7+
import java.util.List;
8+
9+
import org.hamcrest.MatcherAssert;
10+
import org.hamcrest.core.Is;
11+
import org.junit.BeforeClass;
12+
import org.junit.Test;
13+
314
import com.github.dockerjava.api.DockerClient;
415
import com.github.dockerjava.api.command.CreateContainerResponse;
516
import com.github.dockerjava.api.command.InspectContainerResponse;
617
import com.github.dockerjava.api.model.Container;
718
import com.github.dockerjava.api.model.PortBinding;
819
import com.github.dockerjava.core.DockerClientBuilder;
9-
import org.hamcrest.MatcherAssert;
10-
import org.hamcrest.core.Is;
11-
import org.junit.BeforeClass;
12-
import org.junit.Test;
13-
14-
import java.util.List;
15-
16-
import static org.hamcrest.MatcherAssert.assertThat;
17-
import static org.hamcrest.Matchers.not;
18-
import static org.hamcrest.core.Is.is;
1920

2021
public class ContainerLiveTest {
2122

‎libraries-5/src/test/java/com/baeldung/dockerapi/DockerClientLiveTest.java ‎libraries-3/src/test/java/com/baeldung/dockerapi/DockerClientLiveTest.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.baeldung.dockerapi;
22

3-
import com.github.dockerjava.api.DockerClient;
4-
import com.github.dockerjava.core.DefaultDockerClientConfig;
5-
import com.github.dockerjava.core.DockerClientBuilder;
6-
import org.junit.Test;
3+
import static org.junit.Assert.assertNotNull;
74

85
import java.util.Properties;
96

10-
import static org.junit.Assert.assertNotNull;
7+
import org.junit.Test;
8+
9+
import com.github.dockerjava.api.DockerClient;
10+
import com.github.dockerjava.core.DefaultDockerClientConfig;
11+
import com.github.dockerjava.core.DockerClientBuilder;
1112

1213
public class DockerClientLiveTest {
1314

‎libraries-5/src/test/java/com/baeldung/dockerapi/ImageLiveTest.java ‎libraries-3/src/test/java/com/baeldung/dockerapi/ImageLiveTest.java

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
package com.baeldung.dockerapi;
22

3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.greaterThan;
5+
import static org.hamcrest.Matchers.lessThan;
6+
import static org.hamcrest.Matchers.not;
7+
import static org.hamcrest.core.Is.is;
8+
9+
import java.io.File;
10+
import java.util.List;
11+
import java.util.concurrent.TimeUnit;
12+
13+
import org.hamcrest.MatcherAssert;
14+
import org.hamcrest.core.Is;
15+
import org.junit.BeforeClass;
16+
import org.junit.Test;
17+
318
import com.github.dockerjava.api.DockerClient;
419
import com.github.dockerjava.api.command.InspectImageResponse;
520
import com.github.dockerjava.api.model.Image;
@@ -8,20 +23,6 @@
823
import com.github.dockerjava.core.command.BuildImageResultCallback;
924
import com.github.dockerjava.core.command.PullImageResultCallback;
1025
import com.github.dockerjava.core.command.PushImageResultCallback;
11-
import org.hamcrest.MatcherAssert;
12-
import org.hamcrest.core.Is;
13-
import org.junit.BeforeClass;
14-
import org.junit.Test;
15-
16-
import java.io.File;
17-
import java.util.List;
18-
import java.util.concurrent.TimeUnit;
19-
20-
import static org.hamcrest.MatcherAssert.assertThat;
21-
import static org.hamcrest.Matchers.greaterThan;
22-
import static org.hamcrest.Matchers.lessThan;
23-
import static org.hamcrest.Matchers.not;
24-
import static org.hamcrest.core.Is.is;
2526

2627
public class ImageLiveTest {
2728

‎libraries-5/src/test/java/com/baeldung/dockerapi/NetworkLiveTest.java ‎libraries-3/src/test/java/com/baeldung/dockerapi/NetworkLiveTest.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
package com.baeldung.dockerapi;
22

3-
import com.github.dockerjava.api.DockerClient;
4-
import com.github.dockerjava.api.command.CreateNetworkResponse;
5-
import com.github.dockerjava.api.model.Network;
6-
import com.github.dockerjava.api.model.Network.Ipam;
7-
import com.github.dockerjava.core.DockerClientBuilder;
3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.greaterThan;
5+
import static org.hamcrest.Matchers.not;
6+
import static org.hamcrest.core.Is.is;
7+
8+
import java.util.List;
9+
810
import org.hamcrest.MatcherAssert;
911
import org.junit.BeforeClass;
1012
import org.junit.Ignore;
1113
import org.junit.Test;
1214

13-
import java.util.List;
14-
15-
import static org.hamcrest.MatcherAssert.assertThat;
16-
import static org.hamcrest.Matchers.greaterThan;
17-
import static org.hamcrest.Matchers.not;
18-
import static org.hamcrest.core.Is.is;
15+
import com.github.dockerjava.api.DockerClient;
16+
import com.github.dockerjava.api.command.CreateNetworkResponse;
17+
import com.github.dockerjava.api.model.Network;
18+
import com.github.dockerjava.api.model.Network.Ipam;
19+
import com.github.dockerjava.core.DockerClientBuilder;
1920

2021
public class NetworkLiveTest {
2122

‎libraries-5/src/test/java/com/baeldung/dockerapi/VolumeLiveTest.java ‎libraries-3/src/test/java/com/baeldung/dockerapi/VolumeLiveTest.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package com.baeldung.dockerapi;
22

3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.greaterThan;
5+
import static org.hamcrest.Matchers.not;
6+
import static org.hamcrest.core.Is.is;
7+
8+
import java.util.List;
9+
10+
import org.hamcrest.MatcherAssert;
11+
import org.junit.BeforeClass;
12+
import org.junit.Test;
13+
314
import com.github.dockerjava.api.DockerClient;
415
import com.github.dockerjava.api.command.CreateVolumeResponse;
516
import com.github.dockerjava.api.command.InspectVolumeResponse;
617
import com.github.dockerjava.api.command.ListVolumesResponse;
718
import com.github.dockerjava.core.DockerClientBuilder;
8-
import org.hamcrest.MatcherAssert;
9-
import org.junit.BeforeClass;
10-
import org.junit.Test;
11-
12-
import java.util.List;
13-
14-
import static org.hamcrest.MatcherAssert.assertThat;
15-
import static org.hamcrest.Matchers.greaterThan;
16-
import static org.hamcrest.Matchers.not;
17-
import static org.hamcrest.core.Is.is;
1819

1920
public class VolumeLiveTest {
2021

‎libraries-5/src/test/java/com/baeldung/fugue/FugueUnitTest.java ‎libraries-3/src/test/java/com/baeldung/fugue/FugueUnitTest.java

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
package com.baeldung.fugue;
22

3-
import io.atlassian.fugue.*;
3+
import static io.atlassian.fugue.Unit.Unit;
4+
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertFalse;
6+
import static org.junit.Assert.assertNull;
7+
import static org.junit.Assert.assertTrue;
8+
import static org.junit.Assert.fail;
9+
10+
import java.util.ArrayList;
11+
import java.util.Arrays;
12+
import java.util.List;
13+
import java.util.NoSuchElementException;
14+
import java.util.Optional;
15+
import java.util.function.Function;
16+
417
import org.junit.Assert;
518
import org.junit.Test;
619

7-
import java.util.*;
8-
import java.util.function.Function;
9-
10-
import static org.junit.Assert.*;
11-
import static io.atlassian.fugue.Unit.Unit;
20+
import io.atlassian.fugue.*;
1221

1322
public class FugueUnitTest {
1423

‎libraries-5/src/test/java/com/baeldung/jnats/NatsClientLiveTest.java ‎libraries-3/src/test/java/com/baeldung/jnats/NatsClientLiveTest.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.baeldung.jnats;
22

3-
import io.nats.client.Message;
4-
import io.nats.client.SyncSubscription;
5-
import org.junit.Test;
3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertNotNull;
5+
import static org.junit.Assert.assertNull;
66

77
import java.util.ArrayList;
88
import java.util.List;
99

10-
import static org.junit.Assert.assertEquals;
11-
import static org.junit.Assert.assertNotNull;
12-
import static org.junit.Assert.assertNull;
10+
import org.junit.Test;
11+
12+
import io.nats.client.Message;
13+
import io.nats.client.SyncSubscription;
1314

1415
public class NatsClientLiveTest {
1516

‎libraries-5/src/test/java/com/baeldung/jool/JOOLUnitTest.java ‎libraries-3/src/test/java/com/baeldung/jool/JOOLUnitTest.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
package com.baeldung.jool;
22

3-
import org.jooq.lambda.Seq;
4-
import org.jooq.lambda.Unchecked;
5-
import org.jooq.lambda.function.Function1;
6-
import org.jooq.lambda.function.Function2;
7-
import org.jooq.lambda.tuple.Tuple2;
8-
import org.jooq.lambda.tuple.Tuple3;
9-
import org.jooq.lambda.tuple.Tuple4;
10-
import org.junit.Test;
3+
import static junit.framework.Assert.assertTrue;
4+
import static junit.framework.TestCase.assertEquals;
5+
import static org.jooq.lambda.tuple.Tuple.tuple;
116

127
import java.util.Arrays;
138
import java.util.HashMap;
@@ -17,9 +12,14 @@
1712
import java.util.stream.Collectors;
1813
import java.util.stream.Stream;
1914

20-
import static junit.framework.Assert.assertTrue;
21-
import static junit.framework.TestCase.assertEquals;
22-
import static org.jooq.lambda.tuple.Tuple.tuple;
15+
import org.jooq.lambda.Seq;
16+
import org.jooq.lambda.Unchecked;
17+
import org.jooq.lambda.function.Function1;
18+
import org.jooq.lambda.function.Function2;
19+
import org.jooq.lambda.tuple.Tuple2;
20+
import org.jooq.lambda.tuple.Tuple3;
21+
import org.jooq.lambda.tuple.Tuple4;
22+
import org.junit.Test;
2323

2424
public class JOOLUnitTest {
2525
@Test

‎libraries-5/src/test/resources/dockerapi/Dockerfile ‎libraries-3/src/test/resources/dockerapi/Dockerfile

File renamed without changes.

‎libraries-4/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
1212
- [Guide to JDeferred](https://www.baeldung.com/jdeferred)
1313
- [Introduction to MBassador](https://www.baeldung.com/mbassador)
1414
- [Using Pairs in Java](https://www.baeldung.com/java-pairs)
15-
- More articles [[<-- prev]](/libraries-3) [[next -->]](/libraries-5)
15+
- More articles [[<-- prev]](/libraries-3)

‎libraries-5/README.md

-15
This file was deleted.

0 commit comments

Comments
 (0)