Skip to content

Commit e617026

Browse files
committed
refactor: move default QA annotations to package 📝
1 parent a233619 commit e617026

File tree

7 files changed

+17
-27
lines changed

7 files changed

+17
-27
lines changed

library/src/main/java/com/alibaba/dcm/DnsCache.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.alibaba.dcm;
22

3-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
43
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
54

6-
import javax.annotation.ParametersAreNonnullByDefault;
75
import javax.annotation.concurrent.Immutable;
86
import java.io.Serializable;
97
import java.util.ArrayList;
@@ -17,8 +15,6 @@
1715
* @since 1.2.0
1816
*/
1917
@Immutable
20-
@ParametersAreNonnullByDefault
21-
@ReturnValuesAreNonnullByDefault
2218
public final class DnsCache implements Serializable {
2319
private static final long serialVersionUID = -8614746635950970028L;
2420

library/src/main/java/com/alibaba/dcm/DnsCacheEntry.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.alibaba.dcm;
22

3-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
43
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
54

6-
import javax.annotation.ParametersAreNonnullByDefault;
75
import javax.annotation.concurrent.Immutable;
86
import java.io.Serializable;
97
import java.text.SimpleDateFormat;
@@ -18,8 +16,6 @@
1816
* @see DnsCache
1917
*/
2018
@Immutable
21-
@ParametersAreNonnullByDefault
22-
@ReturnValuesAreNonnullByDefault
2319
public final class DnsCacheEntry implements Serializable {
2420
private static final long serialVersionUID = -7476648934387757732L;
2521

@@ -114,6 +110,7 @@ public boolean equals(Object o) {
114110
* {@inheritDoc}
115111
*/
116112
@Override
113+
@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
117114
public int hashCode() {
118115
int result = host != null ? host.hashCode() : 0;
119116
result = 31 * result + Arrays.hashCode(ips);

library/src/main/java/com/alibaba/dcm/DnsCacheManipulator.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.alibaba.dcm;
22

33
import com.alibaba.dcm.internal.InetAddressCacheUtilCommons;
4-
import com.alibaba.dcm.internal.InetAddressCacheUtilForOld;
54
import com.alibaba.dcm.internal.InetAddressCacheUtilForNew;
6-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
5+
import com.alibaba.dcm.internal.InetAddressCacheUtilForOld;
76
import sun.net.InetAddressCachePolicy;
87

98
import javax.annotation.Nullable;
10-
import javax.annotation.ParametersAreNonnullByDefault;
119
import java.io.FileInputStream;
1210
import java.io.InputStream;
1311
import java.util.Arrays;
@@ -30,8 +28,6 @@
3028
* @see DnsCacheEntry
3129
* @see DnsCacheManipulatorException
3230
*/
33-
@ParametersAreNonnullByDefault
34-
@ReturnValuesAreNonnullByDefault
3531
@SuppressWarnings("JavadocReference")
3632
public final class DnsCacheManipulator {
3733
/**

library/src/main/java/com/alibaba/dcm/internal/InetAddressCacheUtilCommons.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package com.alibaba.dcm.internal;
22

3-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
43
import org.jetbrains.annotations.ApiStatus;
54
import sun.net.InetAddressCachePolicy;
65

76
import javax.annotation.Nullable;
8-
import javax.annotation.ParametersAreNonnullByDefault;
97
import java.lang.reflect.Field;
108
import java.net.InetAddress;
119
import java.net.UnknownHostException;
@@ -16,8 +14,6 @@
1614
* @author Jerry Lee (oldratlee at gmail dot com)
1715
* @since 1.6.0
1816
*/
19-
@ParametersAreNonnullByDefault
20-
@ReturnValuesAreNonnullByDefault
2117
@ApiStatus.Internal
2218
@SuppressWarnings("JavadocReference")
2319
public final class InetAddressCacheUtilCommons {

library/src/main/java/com/alibaba/dcm/internal/InetAddressCacheUtilForNew.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import com.alibaba.dcm.DnsCache;
44
import com.alibaba.dcm.DnsCacheEntry;
5-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
65
import org.jetbrains.annotations.ApiStatus;
76

87
import javax.annotation.Nullable;
9-
import javax.annotation.ParametersAreNonnullByDefault;
108
import java.lang.reflect.Constructor;
119
import java.lang.reflect.Field;
1210
import java.lang.reflect.InvocationTargetException;
@@ -19,7 +17,9 @@
1917
import java.util.concurrent.ConcurrentMap;
2018
import java.util.concurrent.ConcurrentSkipListSet;
2119

22-
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.*;
20+
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.NEVER_EXPIRATION;
21+
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.getIpFromInetAddress;
22+
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.toInetAddressArray;
2323
import static com.alibaba.dcm.internal.TimeUtil.convertNanoTimeToTimeMillis;
2424
import static com.alibaba.dcm.internal.TimeUtil.getNanoTimeAfterMs;
2525

@@ -32,8 +32,6 @@
3232
* @author Jerry Lee (oldratlee at gmail dot com)
3333
* @since 1.6.0
3434
*/
35-
@ParametersAreNonnullByDefault
36-
@ReturnValuesAreNonnullByDefault
3735
@ApiStatus.Internal
3836
@SuppressWarnings("JavadocReference")
3937
public final class InetAddressCacheUtilForNew {

library/src/main/java/com/alibaba/dcm/internal/InetAddressCacheUtilForOld.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import com.alibaba.dcm.DnsCache;
44
import com.alibaba.dcm.DnsCacheEntry;
5-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
65
import org.jetbrains.annotations.ApiStatus;
76

87
import javax.annotation.Nullable;
9-
import javax.annotation.ParametersAreNonnullByDefault;
108
import javax.annotation.concurrent.GuardedBy;
119
import java.lang.reflect.Constructor;
1210
import java.lang.reflect.Field;
@@ -18,7 +16,9 @@
1816
import java.util.List;
1917
import java.util.Map;
2018

21-
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.*;
19+
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.NEVER_EXPIRATION;
20+
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.getIpFromInetAddress;
21+
import static com.alibaba.dcm.internal.InetAddressCacheUtilCommons.toInetAddressArray;
2222

2323
/**
2424
* Util class to manipulate dns cache for old {@code JDK 8-}.
@@ -38,8 +38,6 @@
3838
* @see InetAddress#cacheInitIfNeeded()
3939
* @see InetAddress#cacheAddresses(String, InetAddress[], boolean)
4040
*/
41-
@ParametersAreNonnullByDefault
42-
@ReturnValuesAreNonnullByDefault
4341
@ApiStatus.Internal
4442
@SuppressWarnings("JavadocReference")
4543
public final class InetAddressCacheUtilForOld {

library/src/main/java/com/alibaba/dcm/package-info.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,13 @@
44
* @author Jerry Lee (oldratlee at gmail dot com)
55
* @see com.alibaba.dcm.DnsCacheManipulator
66
*/
7+
@DefaultAnnotation(NonNull.class)
8+
@ParametersAreNonnullByDefault
9+
@ReturnValuesAreNonnullByDefault
710
package com.alibaba.dcm;
11+
12+
import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
13+
import edu.umd.cs.findbugs.annotations.NonNull;
14+
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
15+
16+
import javax.annotation.ParametersAreNonnullByDefault;

0 commit comments

Comments
 (0)