Skip to content

Commit 081a6cb

Browse files
acogoluegnesacogoluegnes
committed
Remove wildcard imports
1 parent 238c5d5 commit 081a6cb

File tree

74 files changed

+928
-176
lines changed

Some content is hidden

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

74 files changed

+928
-176
lines changed

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@
599599
<style>GOOGLE</style>
600600
</googleJavaFormat>
601601
<removeUnusedImports />
602+
<forbidWildcardImports />
602603
</java>
603604
<ratchetFrom>origin/main</ratchetFrom>
604605
<licenseHeader> <!-- specify either content or file, but not both -->

‎src/main/java/com/rabbitmq/stream/BackOffDelayPolicy.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
// [email protected].
1515
package com.rabbitmq.stream;
1616

17+
import static com.rabbitmq.stream.BackOffDelayPolicy.fixedWithInitialDelay;
18+
1719
import java.time.Duration;
1820

1921
/**

‎src/main/java/com/rabbitmq/stream/codec/QpidProtonCodec.java‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,23 @@
1919
import com.rabbitmq.stream.MessageBuilder;
2020
import com.rabbitmq.stream.Properties;
2121
import java.nio.ByteBuffer;
22-
import java.util.*;
22+
import java.util.Date;
23+
import java.util.LinkedHashMap;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.UUID;
2327
import java.util.function.Function;
24-
import org.apache.qpid.proton.amqp.*;
25-
import org.apache.qpid.proton.amqp.messaging.*;
28+
import org.apache.qpid.proton.amqp.Binary;
29+
import org.apache.qpid.proton.amqp.Symbol;
30+
import org.apache.qpid.proton.amqp.UnsignedByte;
31+
import org.apache.qpid.proton.amqp.UnsignedInteger;
32+
import org.apache.qpid.proton.amqp.UnsignedLong;
33+
import org.apache.qpid.proton.amqp.UnsignedShort;
34+
import org.apache.qpid.proton.amqp.messaging.AmqpValue;
35+
import org.apache.qpid.proton.amqp.messaging.ApplicationProperties;
36+
import org.apache.qpid.proton.amqp.messaging.Data;
37+
import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
38+
import org.apache.qpid.proton.amqp.messaging.Section;
2639
import org.apache.qpid.proton.codec.ReadableBuffer;
2740
import org.apache.qpid.proton.codec.WritableBuffer;
2841

‎src/main/java/com/rabbitmq/stream/codec/QpidProtonMessageBuilder.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
import com.rabbitmq.stream.MessageBuilder;
2121
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2222
import java.math.BigDecimal;
23-
import java.util.*;
23+
import java.util.Date;
24+
import java.util.LinkedHashMap;
25+
import java.util.List;
26+
import java.util.Map;
27+
import java.util.UUID;
2428
import java.util.concurrent.atomic.AtomicBoolean;
2529
import org.apache.qpid.proton.amqp.Binary;
2630
import org.apache.qpid.proton.amqp.Symbol;

‎src/main/java/com/rabbitmq/stream/codec/SwiftMqCodec.java‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,54 @@
1818
import com.rabbitmq.stream.Message;
1919
import com.rabbitmq.stream.MessageBuilder;
2020
import com.rabbitmq.stream.StreamException;
21-
import com.rabbitmq.stream.amqp.*;
22-
import com.swiftmq.amqp.v100.generated.messaging.message_format.*;
21+
import com.rabbitmq.stream.amqp.Symbol;
22+
import com.rabbitmq.stream.amqp.UnsignedByte;
23+
import com.rabbitmq.stream.amqp.UnsignedInteger;
24+
import com.rabbitmq.stream.amqp.UnsignedLong;
25+
import com.rabbitmq.stream.amqp.UnsignedShort;
26+
import com.swiftmq.amqp.v100.generated.messaging.message_format.AddressString;
27+
import com.swiftmq.amqp.v100.generated.messaging.message_format.ApplicationProperties;
28+
import com.swiftmq.amqp.v100.generated.messaging.message_format.Data;
29+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageAnnotations;
30+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdBinary;
31+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdString;
32+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdUlong;
33+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdUuid;
2334
import com.swiftmq.amqp.v100.generated.transport.definitions.SequenceNo;
2435
import com.swiftmq.amqp.v100.messaging.AMQPMessage;
25-
import com.swiftmq.amqp.v100.types.*;
36+
import com.swiftmq.amqp.v100.types.AMQPArray;
37+
import com.swiftmq.amqp.v100.types.AMQPBinary;
38+
import com.swiftmq.amqp.v100.types.AMQPBoolean;
39+
import com.swiftmq.amqp.v100.types.AMQPByte;
40+
import com.swiftmq.amqp.v100.types.AMQPChar;
41+
import com.swiftmq.amqp.v100.types.AMQPDouble;
42+
import com.swiftmq.amqp.v100.types.AMQPFloat;
43+
import com.swiftmq.amqp.v100.types.AMQPInt;
44+
import com.swiftmq.amqp.v100.types.AMQPList;
45+
import com.swiftmq.amqp.v100.types.AMQPLong;
46+
import com.swiftmq.amqp.v100.types.AMQPMap;
47+
import com.swiftmq.amqp.v100.types.AMQPNull;
48+
import com.swiftmq.amqp.v100.types.AMQPShort;
49+
import com.swiftmq.amqp.v100.types.AMQPString;
50+
import com.swiftmq.amqp.v100.types.AMQPSymbol;
51+
import com.swiftmq.amqp.v100.types.AMQPTimestamp;
52+
import com.swiftmq.amqp.v100.types.AMQPType;
53+
import com.swiftmq.amqp.v100.types.AMQPTypeDecoder;
54+
import com.swiftmq.amqp.v100.types.AMQPUnsignedByte;
55+
import com.swiftmq.amqp.v100.types.AMQPUnsignedInt;
56+
import com.swiftmq.amqp.v100.types.AMQPUnsignedLong;
57+
import com.swiftmq.amqp.v100.types.AMQPUnsignedShort;
58+
import com.swiftmq.amqp.v100.types.AMQPUuid;
2659
import com.swiftmq.tools.util.DataByteArrayOutputStream;
2760
import java.io.IOException;
2861
import java.lang.reflect.Array;
2962
import java.nio.charset.StandardCharsets;
30-
import java.util.*;
63+
import java.util.ArrayList;
64+
import java.util.Date;
65+
import java.util.LinkedHashMap;
66+
import java.util.List;
67+
import java.util.Map;
68+
import java.util.UUID;
3169

3270
public class SwiftMqCodec implements Codec {
3371

‎src/main/java/com/rabbitmq/stream/codec/SwiftMqMessageBuilder.java‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,48 @@
2020
import com.rabbitmq.stream.Message;
2121
import com.rabbitmq.stream.MessageBuilder;
2222
import com.rabbitmq.stream.StreamException;
23-
import com.swiftmq.amqp.v100.generated.messaging.message_format.*;
23+
import com.swiftmq.amqp.v100.generated.messaging.message_format.AddressString;
24+
import com.swiftmq.amqp.v100.generated.messaging.message_format.ApplicationProperties;
25+
import com.swiftmq.amqp.v100.generated.messaging.message_format.Data;
26+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageAnnotations;
27+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdBinary;
28+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdString;
29+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdUlong;
30+
import com.swiftmq.amqp.v100.generated.messaging.message_format.MessageIdUuid;
2431
import com.swiftmq.amqp.v100.generated.transport.definitions.SequenceNo;
2532
import com.swiftmq.amqp.v100.messaging.AMQPMessage;
26-
import com.swiftmq.amqp.v100.types.*;
33+
import com.swiftmq.amqp.v100.types.AMQPArray;
34+
import com.swiftmq.amqp.v100.types.AMQPBinary;
35+
import com.swiftmq.amqp.v100.types.AMQPBoolean;
36+
import com.swiftmq.amqp.v100.types.AMQPByte;
37+
import com.swiftmq.amqp.v100.types.AMQPChar;
38+
import com.swiftmq.amqp.v100.types.AMQPDouble;
39+
import com.swiftmq.amqp.v100.types.AMQPFloat;
40+
import com.swiftmq.amqp.v100.types.AMQPInt;
41+
import com.swiftmq.amqp.v100.types.AMQPList;
42+
import com.swiftmq.amqp.v100.types.AMQPLong;
43+
import com.swiftmq.amqp.v100.types.AMQPMap;
44+
import com.swiftmq.amqp.v100.types.AMQPNull;
45+
import com.swiftmq.amqp.v100.types.AMQPShort;
46+
import com.swiftmq.amqp.v100.types.AMQPString;
47+
import com.swiftmq.amqp.v100.types.AMQPSymbol;
48+
import com.swiftmq.amqp.v100.types.AMQPTimestamp;
49+
import com.swiftmq.amqp.v100.types.AMQPType;
50+
import com.swiftmq.amqp.v100.types.AMQPTypeDecoder;
51+
import com.swiftmq.amqp.v100.types.AMQPUnsignedByte;
52+
import com.swiftmq.amqp.v100.types.AMQPUnsignedInt;
53+
import com.swiftmq.amqp.v100.types.AMQPUnsignedLong;
54+
import com.swiftmq.amqp.v100.types.AMQPUnsignedShort;
55+
import com.swiftmq.amqp.v100.types.AMQPUuid;
2756
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2857
import java.io.IOException;
2958
import java.lang.reflect.Array;
3059
import java.math.BigDecimal;
31-
import java.util.*;
60+
import java.util.ArrayList;
61+
import java.util.LinkedHashMap;
62+
import java.util.List;
63+
import java.util.Map;
64+
import java.util.UUID;
3265
import java.util.concurrent.atomic.AtomicBoolean;
3366
import java.util.function.Function;
3467

‎src/main/java/com/rabbitmq/stream/codec/WrapperMessageBuilder.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,18 @@
1717
import com.rabbitmq.stream.Message;
1818
import com.rabbitmq.stream.MessageBuilder;
1919
import com.rabbitmq.stream.Properties;
20-
import com.rabbitmq.stream.amqp.*;
20+
import com.rabbitmq.stream.amqp.Symbol;
21+
import com.rabbitmq.stream.amqp.UnsignedByte;
22+
import com.rabbitmq.stream.amqp.UnsignedInteger;
23+
import com.rabbitmq.stream.amqp.UnsignedLong;
24+
import com.rabbitmq.stream.amqp.UnsignedShort;
2125
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2226
import java.math.BigDecimal;
23-
import java.util.*;
27+
import java.util.Date;
28+
import java.util.LinkedHashMap;
29+
import java.util.List;
30+
import java.util.Map;
31+
import java.util.UUID;
2432
import java.util.concurrent.atomic.AtomicBoolean;
2533

2634
public class WrapperMessageBuilder implements MessageBuilder {

‎src/main/java/com/rabbitmq/stream/impl/Client.java‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,37 @@
1414
// [email protected].
1515
package com.rabbitmq.stream.impl;
1616

17-
import static com.rabbitmq.stream.Constants.*;
17+
import static com.rabbitmq.stream.Constants.COMMAND_CLOSE;
18+
import static com.rabbitmq.stream.Constants.COMMAND_CONSUMER_UPDATE;
19+
import static com.rabbitmq.stream.Constants.COMMAND_CREATE_STREAM;
20+
import static com.rabbitmq.stream.Constants.COMMAND_CREATE_SUPER_STREAM;
21+
import static com.rabbitmq.stream.Constants.COMMAND_CREDIT;
22+
import static com.rabbitmq.stream.Constants.COMMAND_DECLARE_PUBLISHER;
23+
import static com.rabbitmq.stream.Constants.COMMAND_DELETE_PUBLISHER;
24+
import static com.rabbitmq.stream.Constants.COMMAND_DELETE_STREAM;
25+
import static com.rabbitmq.stream.Constants.COMMAND_DELETE_SUPER_STREAM;
26+
import static com.rabbitmq.stream.Constants.COMMAND_EXCHANGE_COMMAND_VERSIONS;
27+
import static com.rabbitmq.stream.Constants.COMMAND_HEARTBEAT;
28+
import static com.rabbitmq.stream.Constants.COMMAND_METADATA;
29+
import static com.rabbitmq.stream.Constants.COMMAND_OPEN;
30+
import static com.rabbitmq.stream.Constants.COMMAND_PARTITIONS;
31+
import static com.rabbitmq.stream.Constants.COMMAND_PEER_PROPERTIES;
32+
import static com.rabbitmq.stream.Constants.COMMAND_PUBLISH;
33+
import static com.rabbitmq.stream.Constants.COMMAND_QUERY_OFFSET;
34+
import static com.rabbitmq.stream.Constants.COMMAND_QUERY_PUBLISHER_SEQUENCE;
35+
import static com.rabbitmq.stream.Constants.COMMAND_ROUTE;
36+
import static com.rabbitmq.stream.Constants.COMMAND_SASL_AUTHENTICATE;
37+
import static com.rabbitmq.stream.Constants.COMMAND_SASL_HANDSHAKE;
38+
import static com.rabbitmq.stream.Constants.COMMAND_STORE_OFFSET;
39+
import static com.rabbitmq.stream.Constants.COMMAND_STREAM_STATS;
40+
import static com.rabbitmq.stream.Constants.COMMAND_SUBSCRIBE;
41+
import static com.rabbitmq.stream.Constants.COMMAND_UNSUBSCRIBE;
42+
import static com.rabbitmq.stream.Constants.RESPONSE_CODE_AUTHENTICATION_FAILURE;
43+
import static com.rabbitmq.stream.Constants.RESPONSE_CODE_AUTHENTICATION_FAILURE_LOOPBACK;
44+
import static com.rabbitmq.stream.Constants.RESPONSE_CODE_OK;
45+
import static com.rabbitmq.stream.Constants.RESPONSE_CODE_SASL_CHALLENGE;
46+
import static com.rabbitmq.stream.Constants.VERSION_1;
47+
import static com.rabbitmq.stream.Constants.VERSION_2;
1848
import static com.rabbitmq.stream.impl.ThreadUtils.threadFactory;
1949
import static com.rabbitmq.stream.impl.Utils.DEFAULT_USERNAME;
2050
import static com.rabbitmq.stream.impl.Utils.encodeRequestCode;
@@ -61,7 +91,16 @@
6191
import io.netty.buffer.ByteBuf;
6292
import io.netty.buffer.ByteBufAllocator;
6393
import io.netty.buffer.ByteBufOutputStream;
64-
import io.netty.channel.*;
94+
import io.netty.channel.Channel;
95+
import io.netty.channel.ChannelFuture;
96+
import io.netty.channel.ChannelHandlerContext;
97+
import io.netty.channel.ChannelInboundHandlerAdapter;
98+
import io.netty.channel.ChannelInitializer;
99+
import io.netty.channel.ChannelOption;
100+
import io.netty.channel.ChannelOutboundHandlerAdapter;
101+
import io.netty.channel.ChannelPromise;
102+
import io.netty.channel.ConnectTimeoutException;
103+
import io.netty.channel.EventLoopGroup;
65104
import io.netty.channel.socket.SocketChannel;
66105
import io.netty.channel.socket.nio.NioSocketChannel;
67106
import io.netty.handler.codec.DecoderException;
@@ -83,7 +122,16 @@
83122
import java.nio.charset.Charset;
84123
import java.nio.charset.StandardCharsets;
85124
import java.time.Duration;
86-
import java.util.*;
125+
import java.util.ArrayList;
126+
import java.util.Collection;
127+
import java.util.Collections;
128+
import java.util.HashMap;
129+
import java.util.HashSet;
130+
import java.util.LinkedHashMap;
131+
import java.util.List;
132+
import java.util.Map;
133+
import java.util.Objects;
134+
import java.util.Set;
87135
import java.util.concurrent.ConcurrentHashMap;
88136
import java.util.concurrent.ConcurrentMap;
89137
import java.util.concurrent.CopyOnWriteArrayList;

‎src/main/java/com/rabbitmq/stream/impl/ClientProperties.java‎

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

1717
import java.io.InputStream;
18-
import java.util.*;
18+
import java.util.Collections;
19+
import java.util.LinkedHashMap;
20+
import java.util.Map;
21+
import java.util.Properties;
1922
import org.slf4j.Logger;
2023
import org.slf4j.LoggerFactory;
2124

‎src/main/java/com/rabbitmq/stream/impl/ConsumersCoordinator.java‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,43 @@
1515
package com.rabbitmq.stream.impl;
1616

1717
import static com.rabbitmq.stream.Constants.RESPONSE_CODE_SUBSCRIPTION_ID_ALREADY_EXISTS;
18-
import static com.rabbitmq.stream.impl.Utils.*;
18+
import static com.rabbitmq.stream.impl.Utils.AVAILABLE_PROCESSORS;
19+
import static com.rabbitmq.stream.impl.Utils.brokerFromClient;
20+
import static com.rabbitmq.stream.impl.Utils.convertCodeToException;
21+
import static com.rabbitmq.stream.impl.Utils.formatConstant;
22+
import static com.rabbitmq.stream.impl.Utils.isSac;
23+
import static com.rabbitmq.stream.impl.Utils.jsonField;
24+
import static com.rabbitmq.stream.impl.Utils.keyForNode;
25+
import static com.rabbitmq.stream.impl.Utils.lock;
26+
import static com.rabbitmq.stream.impl.Utils.namedFunction;
27+
import static com.rabbitmq.stream.impl.Utils.namedRunnable;
28+
import static com.rabbitmq.stream.impl.Utils.quote;
1929
import static java.lang.String.format;
2030
import static java.util.stream.Collectors.toList;
2131

22-
import com.rabbitmq.stream.*;
32+
import com.rabbitmq.stream.BackOffDelayPolicy;
33+
import com.rabbitmq.stream.Constants;
2334
import com.rabbitmq.stream.Consumer;
35+
import com.rabbitmq.stream.ConsumerFlowStrategy;
36+
import com.rabbitmq.stream.MessageHandler;
2437
import com.rabbitmq.stream.MessageHandler.Context;
38+
import com.rabbitmq.stream.OffsetSpecification;
39+
import com.rabbitmq.stream.StreamDoesNotExistException;
40+
import com.rabbitmq.stream.StreamException;
41+
import com.rabbitmq.stream.StreamNotAvailableException;
42+
import com.rabbitmq.stream.SubscriptionListener;
2543
import com.rabbitmq.stream.SubscriptionListener.SubscriptionContext;
26-
import com.rabbitmq.stream.impl.Client.*;
44+
import com.rabbitmq.stream.impl.Client.Broker;
45+
import com.rabbitmq.stream.impl.Client.ChunkListener;
46+
import com.rabbitmq.stream.impl.Client.ClientParameters;
2747
import com.rabbitmq.stream.impl.Client.ConsumerUpdateListener;
48+
import com.rabbitmq.stream.impl.Client.CreditNotification;
49+
import com.rabbitmq.stream.impl.Client.MessageIgnoredListener;
50+
import com.rabbitmq.stream.impl.Client.MessageListener;
51+
import com.rabbitmq.stream.impl.Client.MetadataListener;
52+
import com.rabbitmq.stream.impl.Client.QueryOffsetResponse;
53+
import com.rabbitmq.stream.impl.Client.ShutdownListener;
54+
import com.rabbitmq.stream.impl.Utils.BrokerWrapper;
2855
import com.rabbitmq.stream.impl.Utils.ClientConnectionType;
2956
import com.rabbitmq.stream.impl.Utils.ClientFactory;
3057
import com.rabbitmq.stream.impl.Utils.ClientFactoryContext;
@@ -48,7 +75,8 @@
4875
import java.util.concurrent.atomic.AtomicReference;
4976
import java.util.concurrent.locks.Lock;
5077
import java.util.concurrent.locks.ReentrantLock;
51-
import java.util.function.*;
78+
import java.util.function.Function;
79+
import java.util.function.Predicate;
5280
import java.util.stream.Collectors;
5381
import java.util.stream.IntStream;
5482
import org.slf4j.Logger;

0 commit comments

Comments
 (0)