Skip to content

Commit f807687

Browse files
committed
Remove wildcard imports
1 parent 979bdde commit f807687

24 files changed

+213
-38
lines changed

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
9494
<spring-boot-maven-plugin.version>2.7.18</spring-boot-maven-plugin.version>
9595
<spotless.version>3.0.0</spotless.version>
96-
<google-java-format.version>1.21.0</google-java-format.version>
96+
<google-java-format.version>1.28.0</google-java-format.version>
9797

9898
<!-- because of https://issues.apache.org/jira/browse/MRESOURCES-99 -->
9999
<build.timestamp>${maven.build.timestamp}</build.timestamp>
@@ -233,6 +233,14 @@
233233
<scope>test</scope>
234234
</dependency>
235235

236+
<!-- add explicitly to update automatically with dependabot -->
237+
<dependency>
238+
<groupId>com.google.googlejavaformat</groupId>
239+
<artifactId>google-java-format</artifactId>
240+
<version>${google-java-format.version}</version>
241+
<scope>test</scope>
242+
</dependency>
243+
236244
</dependencies>
237245

238246
<build>
@@ -470,6 +478,8 @@
470478
<version>${google-java-format.version}</version>
471479
<style>GOOGLE</style>
472480
</googleJavaFormat>
481+
<removeUnusedImports />
482+
<forbidWildcardImports />
473483
</java>
474484
<!-- <ratchetFrom>origin/main</ratchetFrom>-->
475485
<licenseHeader> <!-- specify either content or file, but not both -->

src/main/extensions/com/rabbitmq/perf/DefaultInstanceSynchronization.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.util.concurrent.TimeUnit;
3737
import java.util.concurrent.atomic.AtomicBoolean;
3838
import java.util.concurrent.atomic.AtomicInteger;
39+
3940
import org.jgroups.JChannel;
4041
import org.jgroups.Message;
4142
import org.jgroups.Receiver;

src/main/java/com/rabbitmq/perf/Consumer.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@
1515
1616
package com.rabbitmq.perf;
1717

18-
import com.rabbitmq.client.*;
1918
import com.rabbitmq.client.AMQP.BasicProperties;
2019
import com.rabbitmq.client.AMQP.Queue.DeclareOk;
20+
import com.rabbitmq.client.AlreadyClosedException;
21+
import com.rabbitmq.client.Channel;
22+
import com.rabbitmq.client.Connection;
23+
import com.rabbitmq.client.DefaultConsumer;
24+
import com.rabbitmq.client.Envelope;
25+
import com.rabbitmq.client.GetResponse;
26+
import com.rabbitmq.client.ShutdownSignalException;
2127
import com.rabbitmq.perf.PerfTest.EXIT_WHEN;
2228
import com.rabbitmq.perf.StartListener.Type;
2329
import com.rabbitmq.perf.TopologyRecording.RecordedQueue;
@@ -27,7 +33,11 @@
2733
import java.io.IOException;
2834
import java.io.PrintStream;
2935
import java.time.Duration;
30-
import java.util.*;
36+
import java.util.ArrayList;
37+
import java.util.Collections;
38+
import java.util.HashMap;
39+
import java.util.List;
40+
import java.util.Map;
3141
import java.util.concurrent.Callable;
3242
import java.util.concurrent.ExecutorService;
3343
import java.util.concurrent.ScheduledExecutorService;

src/main/java/com/rabbitmq/perf/LocalFilesMessageBodySource.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
1616
package com.rabbitmq.perf;
1717

18-
import java.io.*;
18+
import java.io.BufferedInputStream;
19+
import java.io.File;
20+
import java.io.FileInputStream;
21+
import java.io.IOException;
1922
import java.util.ArrayList;
2023
import java.util.List;
2124

src/main/java/com/rabbitmq/perf/Log.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
import ch.qos.logback.classic.joran.JoranConfigurator;
2020
import ch.qos.logback.core.joran.spi.JoranException;
2121
import ch.qos.logback.core.util.StatusPrinter;
22-
import java.io.*;
22+
import java.io.BufferedReader;
23+
import java.io.ByteArrayInputStream;
24+
import java.io.IOException;
25+
import java.io.InputStream;
26+
import java.io.InputStreamReader;
2327
import java.nio.charset.StandardCharsets;
2428
import java.util.Map;
2529
import org.slf4j.LoggerFactory;

src/main/java/com/rabbitmq/perf/MulticastSet.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@
2222
import static java.lang.String.format;
2323
import static java.util.Collections.singletonList;
2424

25-
import com.rabbitmq.client.*;
25+
import com.rabbitmq.client.AMQP;
26+
import com.rabbitmq.client.Address;
27+
import com.rabbitmq.client.AlreadyClosedException;
28+
import com.rabbitmq.client.Connection;
29+
import com.rabbitmq.client.ConnectionFactory;
30+
import com.rabbitmq.client.Recoverable;
31+
import com.rabbitmq.client.RecoveryListener;
2632
import com.rabbitmq.client.impl.recovery.AutorecoveringConnection;
2733
import com.rabbitmq.perf.PerfTest.EXIT_WHEN;
2834
import com.rabbitmq.perf.metrics.PerformanceMetrics;

src/main/java/com/rabbitmq/perf/PerfTest.java

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@
5656
import io.netty.channel.kqueue.KQueueSocketChannel;
5757
import io.netty.channel.nio.NioIoHandler;
5858
import io.netty.channel.socket.nio.NioSocketChannel;
59-
import java.io.*;
59+
import java.io.BufferedReader;
60+
import java.io.BufferedWriter;
61+
import java.io.File;
62+
import java.io.FileReader;
63+
import java.io.FileWriter;
64+
import java.io.IOException;
65+
import java.io.PrintStream;
66+
import java.io.PrintWriter;
6067
import java.math.BigDecimal;
6168
import java.nio.charset.Charset;
6269
import java.text.SimpleDateFormat;
@@ -65,8 +72,22 @@
6572
import java.time.format.DateTimeFormatter;
6673
import java.time.format.DateTimeParseException;
6774
import java.time.temporal.TemporalAccessor;
68-
import java.util.*;
69-
import java.util.concurrent.*;
75+
import java.util.ArrayList;
76+
import java.util.Arrays;
77+
import java.util.Calendar;
78+
import java.util.Date;
79+
import java.util.LinkedHashMap;
80+
import java.util.List;
81+
import java.util.Locale;
82+
import java.util.Map;
83+
import java.util.Properties;
84+
import java.util.Set;
85+
import java.util.concurrent.ConcurrentHashMap;
86+
import java.util.concurrent.ConcurrentMap;
87+
import java.util.concurrent.ExecutorService;
88+
import java.util.concurrent.SynchronousQueue;
89+
import java.util.concurrent.ThreadPoolExecutor;
90+
import java.util.concurrent.TimeUnit;
7091
import java.util.concurrent.atomic.AtomicBoolean;
7192
import java.util.function.BooleanSupplier;
7293
import java.util.function.Consumer;

src/main/java/com/rabbitmq/perf/RandomJsonMessageBodySource.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
package com.rabbitmq.perf;
1717

1818
import java.nio.charset.Charset;
19-
import java.util.*;
19+
import java.util.ArrayList;
20+
import java.util.Collections;
21+
import java.util.Iterator;
22+
import java.util.List;
23+
import java.util.Locale;
24+
import java.util.Random;
2025
import java.util.concurrent.ThreadLocalRandom;
2126
import java.util.stream.IntStream;
2227

src/main/java/com/rabbitmq/perf/Utils.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,18 @@
1818
import static com.rabbitmq.client.ConnectionFactory.computeDefaultTlsProtocol;
1919

2020
import com.google.gson.Gson;
21-
import com.rabbitmq.client.*;
21+
import com.rabbitmq.client.AMQP;
22+
import com.rabbitmq.client.Address;
23+
import com.rabbitmq.client.Channel;
24+
import com.rabbitmq.client.Connection;
25+
import com.rabbitmq.client.ConnectionFactory;
26+
import com.rabbitmq.client.RecoveryDelayHandler;
27+
import com.rabbitmq.client.ShutdownSignalException;
28+
import com.rabbitmq.client.SocketChannelConfigurator;
29+
import com.rabbitmq.client.SocketConfigurator;
30+
import com.rabbitmq.client.SocketConfigurators;
31+
import com.rabbitmq.client.SslEngineConfigurator;
32+
import com.rabbitmq.client.SslEngineConfigurators;
2233
import com.rabbitmq.client.impl.OAuth2ClientCredentialsGrantCredentialsProvider;
2334
import com.rabbitmq.client.impl.OAuthTokenManagementException;
2435
import com.rabbitmq.client.impl.recovery.AutorecoveringConnection;

src/test/java/com/rabbitmq/perf/CommandLineProxyTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
import java.util.HashMap;
2626
import java.util.Map;
2727
import java.util.function.Function;
28-
import org.apache.commons.cli.*;
28+
import org.apache.commons.cli.CommandLine;
29+
import org.apache.commons.cli.CommandLineParser;
30+
import org.apache.commons.cli.DefaultParser;
31+
import org.apache.commons.cli.Options;
32+
import org.apache.commons.cli.ParseException;
2933
import org.junit.jupiter.api.Test;
3034

3135
public class CommandLineProxyTest {

0 commit comments

Comments
 (0)