Skip to content

Commit 6ed8ce8

Browse files
authored
Merge pull request #1655 from baranowb/UNDERTOW-2431_max
[UNDERTOW-2431] Bump jboss-parent to 46, checkstyle and slightly upda…
2 parents d4b3aba + 31c5150 commit 6ed8ce8

File tree

78 files changed

+173
-174
lines changed

Some content is hidden

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

78 files changed

+173
-174
lines changed

core/src/main/java/io/undertow/UndertowLogger.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public interface UndertowLogger extends BasicLogger {
8181

8282
// @LogMessage(level = INFO)
8383
// @Message(id = 5002, value = "Exception reading file %s: %s")
84-
// void exceptionReadingFile(final Path file, final IOException e);
84+
// void exceptionReadingFile(Path file, IOException e);
8585

8686
@LogMessage(level = ERROR)
8787
@Message(id = 5003, value = "IOException reading from channel")
@@ -101,15 +101,15 @@ public interface UndertowLogger extends BasicLogger {
101101

102102
@LogMessage(level = DEBUG)
103103
@Message(id = 5008, value = "An invalid token '%s' with value '%s' has been received.")
104-
void invalidTokenReceived(final String tokenName, final String tokenValue);
104+
void invalidTokenReceived(String tokenName, String tokenValue);
105105

106106
@LogMessage(level = DEBUG)
107107
@Message(id = 5009, value = "A mandatory token %s is missing from the request.")
108-
void missingAuthorizationToken(final String tokenName);
108+
void missingAuthorizationToken(String tokenName);
109109

110110
@LogMessage(level = DEBUG)
111111
@Message(id = 5010, value = "Verification of authentication tokens for user '%s' has failed using mechanism '%s'.")
112-
void authenticationFailed(final String userName, final String mechanism);
112+
void authenticationFailed(String userName, String mechanism);
113113

114114
@LogMessage(level = ERROR)
115115
@Message(id = 5011, value = "Ignoring AJP request with prefix %s")
@@ -443,23 +443,23 @@ void nodeConfigCreated(URI connectionURI, String balancer, String domain, String
443443

444444
@LogMessage(level = DEBUG)
445445
@Message(id = 5096, value = "Authentication failed for digest header %s in %s")
446-
void authenticationFailedFor(final String header, final HttpServerExchange exchange, final @Cause Exception e);
446+
void authenticationFailedFor(String header, HttpServerExchange exchange, @Cause Exception e);
447447

448448
@LogMessage(level = DEBUG)
449449
@Message(id = 5097, value = "Failed to obtain subject for %s")
450-
void failedToObtainSubject(final HttpServerExchange exchange, final @Cause GeneralSecurityException e);
450+
void failedToObtainSubject(HttpServerExchange exchange, @Cause GeneralSecurityException e);
451451

452452
@LogMessage(level = DEBUG)
453453
@Message(id = 5098, value = "GSSAPI negotiation failed for %s")
454-
void failedToNegotiateAtGSSAPI(final HttpServerExchange exchange, final @Cause Throwable e);
454+
void failedToNegotiateAtGSSAPI(HttpServerExchange exchange, @Cause Throwable e);
455455

456456
@LogMessage(level = WARN)
457457
@Message(id = 5099, value = "Failed to create SSO for session '%s'")
458-
void failedToCreateSSOForSession(final String sessionId);
458+
void failedToCreateSSOForSession(String sessionId);
459459

460460
@LogMessage(level = DEBUG)
461461
@Message(id = 5100, value = "Failed to list paths for '%s'")
462-
void failedToListPathsForFile(final Path f);
462+
void failedToListPathsForFile(Path f);
463463

464464
@LogMessage(level = DEBUG)
465465
@Message(id = 5101, value = "No source to list resources from")

core/src/main/java/io/undertow/UndertowMessages.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public interface UndertowMessages {
8585
IllegalStateException sessionManagerNotFound();
8686

8787
@Message(id = 13, value = "Argument %s cannot be null")
88-
IllegalArgumentException argumentCannotBeNull(final String argument);
88+
IllegalArgumentException argumentCannotBeNull(String argument);
8989

9090
// @Message(id = 14, value = "close() called with data still to be flushed. Please call shutdownWrites() and then call flush() until it returns true before calling close()")
9191
// IOException closeCalledWithDataStillToBeFlushed();
@@ -112,13 +112,13 @@ public interface UndertowMessages {
112112
IllegalArgumentException hashAlgorithmNotFound(String algorithmName);
113113

114114
@Message(id = 23, value = "An invalid Base64 token has been received.")
115-
IllegalArgumentException invalidBase64Token(@Cause final IOException cause);
115+
IllegalArgumentException invalidBase64Token(@Cause IOException cause);
116116

117117
@Message(id = 24, value = "An invalidly formatted nonce has been received.")
118118
IllegalArgumentException invalidNonceReceived();
119119

120120
@Message(id = 25, value = "Unexpected token '%s' within header.")
121-
IllegalArgumentException unexpectedTokenInHeader(final String name);
121+
IllegalArgumentException unexpectedTokenInHeader(String name);
122122

123123
@Message(id = 26, value = "Invalid header received.")
124124
IllegalArgumentException invalidHeader();
@@ -133,10 +133,10 @@ public interface UndertowMessages {
133133
IOException chunkedChannelClosedMidChunk();
134134

135135
@Message(id = 30, value = "User %s successfully authenticated.")
136-
String userAuthenticated(final String userName);
136+
String userAuthenticated(String userName);
137137

138138
@Message(id = 31, value = "User %s has logged out.")
139-
String userLoggedOut(final String userName);
139+
String userLoggedOut(String userName);
140140
//
141141
// @Message(id = 33, value = "Authentication type %s cannot be combined with %s")
142142
// IllegalStateException authTypeCannotBeCombined(String type, String existing);
@@ -154,7 +154,7 @@ public interface UndertowMessages {
154154
RuntimeException failedToParsePath();
155155

156156
@Message(id = 38, value = "Authentication failed, requested user name '%s'")
157-
String authenticationFailed(final String userName);
157+
String authenticationFailed(String userName);
158158

159159
@Message(id = 39, value = "Too many query parameters, cannot have more than %s query parameters")
160160
BadRequestException tooManyQueryParameters(int noParams);

core/src/main/java/io/undertow/attribute/ExchangeAttribute.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public interface ExchangeAttribute {
3333
* @param exchange The exchange
3434
* @return The attribute
3535
*/
36-
String readAttribute(final HttpServerExchange exchange);
36+
String readAttribute(HttpServerExchange exchange);
3737

3838
/**
3939
* Sets a new value for the attribute. Not all attributes are writable.
4040
* @param exchange The exchange
4141
* @param newValue The new value for the attribute
4242
* @throws ReadOnlyAttributeException when attribute cannot be written
4343
*/
44-
void writeAttribute(final HttpServerExchange exchange, final String newValue) throws ReadOnlyAttributeException;
44+
void writeAttribute(HttpServerExchange exchange, String newValue) throws ReadOnlyAttributeException;
4545
}

core/src/main/java/io/undertow/attribute/ExchangeAttributeBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public interface ExchangeAttributeBuilder {
4141
* @param token The string token
4242
* @return The exchange attribute, or null
4343
*/
44-
ExchangeAttribute build(final String token);
44+
ExchangeAttribute build(String token);
4545

4646
/**
4747
* The priority of the builder. Builders will be tried in priority builder. Built in builders use the priority range 0-100,

core/src/main/java/io/undertow/client/ClientConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public interface ClientConnection extends Channel {
5656
*
5757
* @param request The request to send.
5858
*/
59-
void sendRequest(final ClientRequest request, final ClientCallback<ClientExchange> clientCallback);
59+
void sendRequest(ClientRequest request, ClientCallback<ClientExchange> clientCallback);
6060

6161
/**
6262
* Upgrade the connection, if the underlying protocol supports it. This should only be called after an upgrade request

core/src/main/java/io/undertow/client/ClientExchange.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
*/
2828
public interface ClientExchange extends Attachable {
2929

30-
void setResponseListener(final ClientCallback<ClientExchange> responseListener);
30+
void setResponseListener(ClientCallback<ClientExchange> responseListener);
3131

32-
void setContinueHandler(final ContinueNotification continueHandler);
32+
void setContinueHandler(ContinueNotification continueHandler);
3333

3434
void setPushHandler(PushCallback pushCallback);
3535

core/src/main/java/io/undertow/client/ClientProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ public interface ClientProvider {
3838

3939
Set<String> handlesSchemes();
4040

41-
void connect(final ClientCallback<ClientConnection> listener, final URI uri, final XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
41+
void connect(ClientCallback<ClientConnection> listener, URI uri, XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
4242

43-
void connect(final ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, final URI uri, final XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
43+
void connect(ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, URI uri, XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
4444

45-
void connect(final ClientCallback<ClientConnection> listener, final URI uri, final XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
45+
void connect(ClientCallback<ClientConnection> listener, URI uri, XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
4646

47-
void connect(final ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, final URI uri, final XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
47+
void connect(ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, URI uri, XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
4848

4949
}

core/src/main/java/io/undertow/client/UndertowClientMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public interface UndertowClientMessages {
4646

4747
// 1020
4848
@Message(id = 1020, value = "Failed to upgrade channel due to response %s (%s)")
49-
String failedToUpgradeChannel(final int responseCode, String reason);
49+
String failedToUpgradeChannel(int responseCode, String reason);
5050

5151
// 1030
5252
@Message(id = 1030, value = "invalid content length %d")

core/src/main/java/io/undertow/conduits/AbstractFramedStreamSinkConduit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public interface FrameCallBack {
256256

257257
void done();
258258

259-
void failed(final IOException e);
259+
void failed(IOException e);
260260

261261
}
262262

core/src/main/java/io/undertow/io/BufferWritableOutputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
*/
3131
public interface BufferWritableOutputStream {
3232

33-
void write(final ByteBuffer[] buffers) throws IOException;
33+
void write(ByteBuffer[] buffers) throws IOException;
3434

35-
void write(final ByteBuffer byteBuffer) throws IOException;
35+
void write(ByteBuffer byteBuffer) throws IOException;
3636

3737
void transferFrom(FileChannel source) throws IOException;
3838

0 commit comments

Comments
 (0)