Skip to content

Commit eb6c2dc

Browse files
发布2.3.34
1 parent a011e76 commit eb6c2dc

52 files changed

Lines changed: 182 additions & 222 deletions

Some content is hidden

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

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -477,15 +477,15 @@
477477
<encoding>UTF-8</encoding>
478478
<docencoding>UTF-8</docencoding>
479479
<links>
480-
<link>http://docs.oracle.com/javase/8/docs/api</link>
480+
<link>https://docs.oracle.com/javase/8/docs/api</link>
481481
</links>
482482
</configuration>
483483
</plugin>
484484

485485
<plugin>
486486
<groupId>org.apache.maven.plugins</groupId>
487487
<artifactId>maven-gpg-plugin</artifactId>
488-
<version>1.6</version>
488+
<version>3.2.8</version>
489489
<executions>
490490
<execution>
491491
<id>sign-artifacts</id>
@@ -499,7 +499,7 @@
499499
<plugin>
500500
<groupId>org.sonatype.central</groupId>
501501
<artifactId>central-publishing-maven-plugin</artifactId>
502-
<version>0.8.0</version>
502+
<version>0.9.0</version>
503503
<extensions>true</extensions>
504504
<configuration>
505505
<publishingServerId>central</publishingServerId>
@@ -570,15 +570,15 @@
570570
<encoding>UTF-8</encoding>
571571
<docencoding>UTF-8</docencoding>
572572
<links>
573-
<link>http://docs.oracle.com/javase/8/docs/api</link>
573+
<link>https://docs.oracle.com/javase/8/docs/api</link>
574574
</links>
575575
</configuration>
576576
</plugin>
577577

578578
<plugin>
579579
<groupId>org.apache.maven.plugins</groupId>
580580
<artifactId>maven-gpg-plugin</artifactId>
581-
<version>1.6</version>
581+
<version>3.2.8</version>
582582
<executions>
583583
<execution>
584584
<id>sign-artifacts</id>
@@ -592,7 +592,7 @@
592592
<plugin>
593593
<groupId>org.sonatype.central</groupId>
594594
<artifactId>central-publishing-maven-plugin</artifactId>
595-
<version>0.8.0</version>
595+
<version>0.9.0</version>
596596
<extensions>true</extensions>
597597
<configuration>
598598
<publishingServerId>central</publishingServerId>

src/main/java/com/github/netty/StartupServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ protected void startAfter(ChannelFuture future) {
136136
/**
137137
* 自适应写(maxBytesPerGatheringWrite):
138138
* Netty 批量写数据时,如果想写的都写进去了,接下来的尝试写更多(调整 maxBytesPerGatheringWrite)。
139-
* <p>
139+
*
140140
* 连续写(writeSpinCount):
141141
* 同连接读一样,每个连接默认最多连续写 16 次,即使还有数据也暂时不处理了,先处理下一个连接。
142-
* <p>
142+
*
143143
* 注册 OP_WRITE 事件
144144
* 如果 socket sendbuf 已经写不动,那就注册 OP_WRITE 事件。当触发 OP_WRITE 事件时,则取消 OP_WRITE 事件,并继续写。
145-
* <p>
145+
*
146146
* 高低水位线(writeBufferWaterMark)
147147
* Netty 待写数据太多,超过一定的水位线(writeBufferWaterMark.high()),会将可写的标志位改成
148148
* false ,让应用自己做决定要不要发送数据了。

src/main/java/com/github/netty/core/util/AntPathMatcher.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
/**
2525
* implementation for Ant-style path patterns.
2626
*
27-
* <p>Part of this mapping code has been kindly borrowed from <a href="http://ant.apache.org">Apache Ant</a>.
27+
* Part of this mapping code has been kindly borrowed from <a href="http://ant.apache.org">Apache Ant</a>.
2828
*
29-
* <p>The mapping matches URLs using the following rules:
29+
* The mapping matches URLs using the following rules:
3030
* <ul>
3131
* <li>{@code ?} matches one character</li>
3232
* <li>{@code *} matches zero or more characters</li>
@@ -51,7 +51,7 @@
5151
* to the {@code filename} variable</li>
5252
* </ul>
5353
*
54-
* <p><strong>Note:</strong> a pattern and a path must both be absolute or must
54+
* <strong>Note:</strong> a pattern and a path must both be absolute or must
5555
* both be relative in order for the two to match. Therefore it is recommended
5656
* that users of this implementation to sanitize patterns in order to prefix
5757
* them with "/" as it makes sense in the context in which they're used.
@@ -188,7 +188,7 @@ public void setTrimTokens(boolean trimTokens) {
188188
* into this matcher's {@link #match} method. A value of {@code true}
189189
* activates an unlimited pattern cache; a value of {@code false} turns
190190
* the pattern cache off completely.
191-
* <p>Default is for the cache to be on, but with the variant to automatically
191+
* Default is for the cache to be on, but with the variant to automatically
192192
* turn it off when encountering too many patterns to cache at runtime
193193
* (the threshold is 65536), assuming that arbitrary permutations of patterns
194194
* are coming in, with little chance for encountering a recurring pattern.
@@ -412,7 +412,7 @@ private boolean isWildcardChar(char c) {
412412

413413
/**
414414
* Tokenize the given path pattern into parts, based on this matcher's settings.
415-
* <p>Performs caching based on {@link #setCachePatterns}, delegating to
415+
* Performs caching based on {@link #setCachePatterns}, delegating to
416416
* {@link #tokenizePath(String)} for the actual tokenization algorithm.
417417
*
418418
* @param pattern the pattern to tokenize
@@ -467,13 +467,13 @@ private boolean matchStrings(String pattern, String str, Map<String, String> uri
467467

468468
/**
469469
* Build or retrieve an {@link AntPathStringMatcher} for the given pattern.
470-
* <p>The default implementation checks this AntPathMatcher's internal cache
470+
* The default implementation checks this AntPathMatcher's internal cache
471471
* (see {@link #setCachePatterns}), creating a new AntPathStringMatcher instance
472472
* if no cached copy is found.
473-
* <p>When encountering too many patterns to cache at runtime (the threshold is 65536),
473+
* When encountering too many patterns to cache at runtime (the threshold is 65536),
474474
* it turns the default cache off, assuming that arbitrary permutations of patterns
475475
* are coming in, with little chance for encountering a recurring pattern.
476-
* <p>This method may be overridden to implement a custom cache strategy.
476+
* This method may be overridden to implement a custom cache strategy.
477477
*
478478
* @param pattern the pattern to match against (never {@code null})
479479
* @return a corresponding AntPathStringMatcher (never {@code null})
@@ -503,7 +503,7 @@ protected AntPathStringMatcher getStringMatcher(String pattern) {
503503

504504
/**
505505
* Given a pattern and a full path, determine the pattern-mapped part.
506-
* <p>For example: <ul>
506+
* For example: <ul>
507507
* <li>'{@code /docs/cvs/commit.html}' and '{@code /docs/cvs/commit.html} -- ''</li>
508508
* <li>'{@code /docs/*}' and '{@code /docs/cvs/commit} -- '{@code cvs/commit}'</li>
509509
* <li>'{@code /docs/cvs/*.html}' and '{@code /docs/cvs/commit.html} -- '{@code commit.html}'</li>
@@ -512,7 +512,7 @@ protected AntPathStringMatcher getStringMatcher(String pattern) {
512512
* <li>'{@code /*.html}' and '{@code /docs/cvs/commit.html} -- '{@code docs/cvs/commit.html}'</li>
513513
* <li>'{@code *.html}' and '{@code /docs/cvs/commit.html} -- '{@code /docs/cvs/commit.html}'</li>
514514
* <li>'{@code *}' and '{@code /docs/cvs/commit.html} -- '{@code /docs/cvs/commit.html}'</li> </ul>
515-
* <p>Assumes that {@link #match} returns {@code true} for '{@code pattern}' and '{@code path}', but
515+
* Assumes that {@link #match} returns {@code true} for '{@code pattern}' and '{@code path}', but
516516
* does <strong>not</strong> enforce this.
517517
*
518518
* @param pattern pattern
@@ -552,7 +552,7 @@ public Map<String, String> extractUriTemplateVariables(String pattern, String pa
552552

553553
/**
554554
* Combine two patterns into a new pattern.
555-
* <p>This implementation simply concatenates the two patterns, unless
555+
* This implementation simply concatenates the two patterns, unless
556556
* the first pattern contains a file extension match (e.g., {@code *.html}).
557557
* In that case, the second pattern will be merged into the first. Otherwise,
558558
* an {@code IllegalArgumentException} will be thrown.
@@ -628,15 +628,15 @@ private String concat(String path1, String path2) {
628628
/**
629629
* Given a full path, returns a {@link Comparator} suitable for sorting patterns in order of
630630
* explicitness.
631-
* <p>This{@code Comparator} will {@linkplain Collections#sort(List, Comparator) sort}
631+
* This{@code Comparator} will {@linkplain Collections#sort(List, Comparator) sort}
632632
* a list so that more specific patterns (without uri templates or wild cards) come before
633633
* generic patterns. So given a list with the following patterns:
634634
* <ol>
635635
* <li>{@code /hotels/new}</li>
636636
* <li>{@code /hotels/{hotel}}</li> <li>{@code /hotels/*}</li>
637637
* </ol>
638638
* the returned comparator will sort this list so that the order will be as indicated.
639-
* <p>The full path given as parameter is used to test for exact matches. So when the given path
639+
* The full path given as parameter is used to test for exact matches. So when the given path
640640
* is {@code /hotels/2}, the pattern {@code /hotels/2} will be sorted before {@code /hotels/1}.
641641
*
642642
* @param path the full path to use for comparison
@@ -649,7 +649,7 @@ public Comparator<String> getPatternComparator(String path) {
649649

650650
/**
651651
* Tests whether or not a string matches against a pattern via a {@link Pattern}.
652-
* <p>The pattern may contain special characters: '*' means zero or more characters; '?' means one and
652+
* The pattern may contain special characters: '*' means zero or more characters; '?' means one and
653653
* only one character; '{' and '}' indicate a URI template pattern. For example <tt>/users/{user}</tt>.
654654
*/
655655
protected static class AntPathStringMatcher {
@@ -737,7 +737,7 @@ public boolean matchStrings(String str, Map<String, String> uriTemplateVariables
737737
/**
738738
* The default {@link Comparator} implementation returned by
739739
* {@link #getPatternComparator(String)}.
740-
* <p>In order, the most "generic" pattern is determined by the following:
740+
* In order, the most "generic" pattern is determined by the following:
741741
* <ul>
742742
* <li>if it's null or a capture all pattern (i.e. it is equal to "/**")</li>
743743
* <li>if the other pattern is an actual match</li>

src/main/java/com/github/netty/core/util/ApplicationX.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ public BeanDefinition addBeanDefinition(String beanName, BeanDefinition definiti
994994

995995
/**
996996
* Callback after singleton creation.
997-
* <p>The default implementation marks the singleton as not in creation anymore.
997+
* The default implementation marks the singleton as not in creation anymore.
998998
*
999999
* @param beanName the name of the singleton that has been created
10001000
* @see #isSingletonCurrentlyInCreation
@@ -1007,7 +1007,7 @@ protected void afterSingletonCreation(String beanName) {
10071007

10081008
/**
10091009
* Callback before singleton creation.
1010-
* <p>The default implementation register the singleton as currently in creation.
1010+
* The default implementation register the singleton as currently in creation.
10111011
*
10121012
* @param beanName the name of the singleton about to be created
10131013
* @see #isSingletonCurrentlyInCreation
@@ -1351,7 +1351,7 @@ public interface PropertyEditor {
13511351
public @interface Bean {
13521352
/**
13531353
* The name of this bean, or if several names, a primary bean name plus aliases.
1354-
* <p>If left unspecified, the name of the bean is the name of the annotated method.
1354+
* If left unspecified, the name of the bean is the name of the annotated method.
13551355
* If specified, the method name is ignored.
13561356
*
13571357
* @return String[]
@@ -1443,7 +1443,7 @@ public interface PropertyEditor {
14431443
* Extension of the {@link Ordered} interface, expressing a <em>priority</em>
14441444
* ordering: {@code PriorityOrdered} objects are always applied before
14451445
* <em>plain</em> {@link Ordered} objects regardless of their order values.
1446-
* <p>Note: {@code PriorityOrdered} post-processor beans are initialized in
1446+
* Note: {@code PriorityOrdered} post-processor beans are initialized in
14471447
* a special phase, ahead of other post-processor beans. This subtly
14481448
* affects their autowiring behavior: they will only be autowired against
14491449
* beans which do not require eager initialization for type matching.

src/main/java/com/github/netty/core/util/CaseInsensitiveKeyMap.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
/**
66
* 不敏感大小写的map
7-
* <p>
7+
*
88
* A Map implementation that uses case-insensitive (using {@link
99
* Locale#ENGLISH}) strings as keys.
10-
* <p>
10+
*
1111
* Keys must be instances of {@link String}. Note that this means that
1212
* <code>null</code> keys are not permitted.
13-
* <p>
13+
*
1414
* This implementation is not thread-safe.
1515
*
1616
* @param <V> Type of values placed in this Map.
@@ -43,7 +43,7 @@ public V put(String key, V value) {
4343

4444
/**
4545
* {@inheritDoc}
46-
* <p>
46+
*
4747
* <b>Use this method with caution</b>. If the input Map contains duplicate
4848
* keys when the keys are compared in a case insensitive manner then some
4949
* values will be lost when inserting via this method.

src/main/java/com/github/netty/core/util/ChunkedWriteHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* transfer requires complicated state management in a {@link ChannelHandler}
2626
* implementation. {@link ChunkedWriteHandler} manages such complicated states
2727
* so that you can send a large data stream without difficulties.
28-
* <p>
28+
*
2929
* To use {@link ChunkedWriteHandler} in your application, you have to insert
3030
* a new {@link ChunkedWriteHandler} instance:
3131
* <pre>
@@ -42,7 +42,7 @@
4242
* </pre>
4343
*
4444
* <h3>Sending a stream which generates a chunk intermittently</h3>
45-
* <p>
45+
*
4646
* Some {@link ChunkedInput} generates a chunk on a certain event or timing.
4747
* Such {@link ChunkedInput} implementation often returns {@code null} on
4848
* {@link ChunkedInput#readChunk(ByteBufAllocator)}, resulting in the indefinitely suspended

0 commit comments

Comments
 (0)