Skip to content

Commit ae14058

Browse files
committed
= update external source code info in docs and comments
1 parent cc71b9b commit ae14058

File tree

7 files changed

+49
-18
lines changed

7 files changed

+49
-18
lines changed

library/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,11 @@ private static void cacheAddresses(String hostname,
314314
该项目的[使用文档](http://leopard.io/modules/javahost)
315315
本项目如何设置`Java DNS Cache`的解法来自该项目。刚开始在持续集成项目中碰到`host`绑定的问题时,也是使用该项目来解决的 :+1:
316316
-`InetAddress`的源代码:
317-
- `JDK 6`[`InetAddress`](http://hg.openjdk.java.net/jdk6/jdk6/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l739)
318-
- `JDK 7`[`InetAddress`](http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l742)
319-
- `JDK 8`[`InetAddress`](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l748)
320-
- `JDK 9`[`InetAddress`](http://hg.openjdk.java.net/jdk9/jdk9/jdk/file/65464a307408/src/java.base/share/classes/java/net/InetAddress.java#783)
317+
- `JDK 6`[`InetAddress`](https://hg.openjdk.java.net/jdk6/jdk6/jdk/file/8deef18bb749/src/share/classes/java/net/InetAddress.java#l739)
318+
- `JDK 7`[`InetAddress`](https://hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/4dd5e486620d/src/share/classes/java/net/InetAddress.java#l742)
319+
- `JDK 8`[`InetAddress`](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/45e4e636b757/src/share/classes/java/net/InetAddress.java#l748)
320+
- `JDK 9`[`InetAddress`](https://hg.openjdk.java.net/jdk9/jdk9/jdk/file/65464a307408/src/java.base/share/classes/java/net/InetAddress.java#l783)
321+
- `JDK 11`[`InetAddress`](https://hg.openjdk.java.net/jdk/jdk11/file/1ddf9a99e4ad/src/java.base/share/classes/java/net/InetAddress.java#l787)
321322
- [`JVM Networking Properties` - `java docs`](http://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html)
322323
- [`java dns`解析缓存之源码解析](http://rongmayisheng.com/?p=1006),写得很完整,源码解析。给出值得注意的结论:
323324
- 打开`Java`中的`SecurityManager``DNS`缓存将不会失效。

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1+
/*
2+
* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
125
package com.alibaba.dcm.internal;
226

327

428
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
529
//
6-
// this source code file is copied from jdk sun.net.util.IPAddressUtil,
7-
// remove unused members.
30+
// This source code file is copied from jdk 11 and remove unused members:
31+
//
32+
// https://hg.openjdk.java.net/jdk/jdk11/file/1ddf9a99e4ad/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
833
//
934
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
1035

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ private static Object newCacheEntry(String host, String[] ips, long expiration)
6363
// - for jdk 6, constructor signature is CacheEntry(Object address, long expiration)
6464
// - for jdk 7+, constructor signature is CacheEntry(InetAddress[] addresses, long expiration)
6565
// code in jdk 6:
66-
// http://hg.openjdk.java.net/jdk6/jdk6/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l739
66+
// https://hg.openjdk.java.net/jdk6/jdk6/jdk/file/8deef18bb749/src/share/classes/java/net/InetAddress.java#l739
6767
// code in jdk 7:
68-
// http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l742
68+
// https://hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/4dd5e486620d/src/share/classes/java/net/InetAddress.java#l742
6969
// code in jdk 8:
70-
// http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l748
70+
// https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/45e4e636b757/src/share/classes/java/net/InetAddress.java#l748
7171
Constructor<?> constructor = clazz.getDeclaredConstructors()[0];
7272
constructor.setAccessible(true);
7373
return constructor.newInstance(toInetAddressArray(host, ips), expiration);
@@ -214,11 +214,11 @@ private static List<DnsCacheEntry> convert(Map<String, Object> cache) throws Ill
214214
// - for jdk 6, address and expiration
215215
// - for jdk 7+, addresses(*renamed* from 6!) and expiration
216216
// code in jdk 6:
217-
// http://hg.openjdk.java.net/jdk6/jdk6/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l739
217+
// https://hg.openjdk.java.net/jdk6/jdk6/jdk/file/8deef18bb749/src/share/classes/java/net/InetAddress.java#l739
218218
// code in jdk 7:
219-
// http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l742
219+
// https://hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/4dd5e486620d/src/share/classes/java/net/InetAddress.java#l742
220220
// code in jdk 8:
221-
// http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/tip/src/share/classes/java/net/InetAddress.java#l748
221+
// https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/45e4e636b757/src/share/classes/java/net/InetAddress.java#l748
222222
final Field[] fields = cacheEntryClass.getDeclaredFields();
223223
for (Field field : fields) {
224224
final String name = field.getName();

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ private static Object newCachedAddresses(String host, String[] ips, long expirat
5252
throws ClassNotFoundException, UnknownHostException, IllegalAccessException, InvocationTargetException, InstantiationException {
5353
Class<?> clazz = Class.forName(inetAddress$CachedAddresses_ClassName);
5454
// InetAddress.CachedAddresses has only a constructor:
55-
// - for jdk 9-jdk12, constructor signature is CachedAddresses(String host, InetAddress[] inetAddresses, long expiryTime)
56-
// code in jdk 9-jdk12:
57-
// http://hg.openjdk.java.net/jdk9/jdk9/jdk/file/65464a307408/src/java.base/share/classes/java/net/InetAddress.java#783
55+
// - for jdk 9-jdk12, constructor signature is CachedAddresses(String host, InetAddress[] inetAddresses, long expiryTime)
56+
// code in jdk 9:
57+
// https://hg.openjdk.java.net/jdk9/jdk9/jdk/file/65464a307408/src/java.base/share/classes/java/net/InetAddress.java#l783
58+
// code in jdk 11:
59+
// https://hg.openjdk.java.net/jdk/jdk11/file/1ddf9a99e4ad/src/java.base/share/classes/java/net/InetAddress.java#l787
5860
Constructor<?> constructor = clazz.getDeclaredConstructors()[0];
5961
constructor.setAccessible(true);
6062
return constructor.newInstance(host, toInetAddressArray(host, ips), expiration);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ static byte[] ip2ByteArray(String ip) {
3434
address = IPAddressUtil.textToNumericFormatV6(ip);
3535
if (address != null) return address;
3636

37-
3837
if (ipv6Expected) {
3938
throw new IllegalArgumentException(ip + INVALID_IPV_6_ADDRESS);
4039
} else {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616
*/
1717
package com.alibaba.dcm.internal;
1818

19+
1920
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
2021
//
21-
// this source code file is copied and small adopted from commons-lang-3.12.0:
22+
// This source code file is copied and small adopted from commons-lang-3.12.0:
2223
//
2324
// https://github.com/apache/commons-lang/blob/rel/commons-lang-3.12.0/src/main/java/org/apache/commons/lang3/JavaVersion.java
2425
//
2526
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
2627

28+
2729
/**
2830
* <p>An enum representing all the versions of the Java specification.
2931
* This is intended to mirror available values from the

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ public static boolean isJdkAtMost8() {
1010
return JAVA_SPECIFICATION_VERSION_AS_ENUM.atMost(JavaVersion.JAVA_1_8);
1111
}
1212

13+
1314
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
1415
//
15-
// blow source code is copied from commons-lang-3.12.0:
16+
// Blow source code is copied from commons-lang-3.12.0:
1617
//
1718
// https://github.com/apache/commons-lang/blob/rel/commons-lang-3.12.0/src/main/java/org/apache/commons/lang3/SystemUtils.java
1819
//
1920
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
2021

22+
2123
private static final String JAVA_SPECIFICATION_VERSION = getSystemProperty("java.specification.version");
2224
private static final JavaVersion JAVA_SPECIFICATION_VERSION_AS_ENUM = JavaVersion.get(JAVA_SPECIFICATION_VERSION);
2325

0 commit comments

Comments
 (0)