This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 062199ec9f ARTEMIS-6020 add checkstyle for generic whitespace
062199ec9f is described below
commit 062199ec9f5dee6daacd6300eea2a470a3b1b746
Author: Justin Bertram <[email protected]>
AuthorDate: Wed Apr 22 16:44:15 2026 -0500
ARTEMIS-6020 add checkstyle for generic whitespace
---
.../org/apache/activemq/artemis/utils/sm/SecurityManagerShim.java | 4 ++--
.../core/config/federation/FederationStreamConfiguration.java | 2 +-
.../core/impl/wireformat/FederationStreamConnectMessage.java | 2 +-
.../activemq/artemis/core/server/impl/ServerConsumerImpl.java | 4 ++--
.../activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java | 6 +++---
etc/checkstyle.xml | 1 +
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/sm/SecurityManagerShim.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/sm/SecurityManagerShim.java
index baeebdf915..828c38b34c 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/sm/SecurityManagerShim.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/sm/SecurityManagerShim.java
@@ -138,7 +138,7 @@ public class SecurityManagerShim {
* @return the value returned by the {@code action}.
* @throws NullPointerException if {@code action} is {@code null}.
*/
- public static<T> T doPrivileged(final PrivilegedAction<T> action) {
+ public static <T> T doPrivileged(final PrivilegedAction<T> action) {
Objects.requireNonNull(action, "action must be provided");
return AccessController.doPrivileged(action);
@@ -163,7 +163,7 @@ public class SecurityManagerShim {
* @return the value returned by the {@code action}.
* @throws NullPointerException if {@code action} is {@code null}.
*/
- public static<T> T doPrivileged(final PrivilegedAction<T> action, final
Object accessControlContext) {
+ public static <T> T doPrivileged(final PrivilegedAction<T> action, final
Object accessControlContext) {
// AccessControlContext may be null
Objects.requireNonNull(action, "action must be provided");
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/config/federation/FederationStreamConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/config/federation/FederationStreamConfiguration.java
index 628d4d2d3a..33c0ac0d40 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/config/federation/FederationStreamConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/config/federation/FederationStreamConfiguration.java
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
-public abstract class FederationStreamConfiguration <T extends
FederationStreamConfiguration<T>> implements Serializable {
+public abstract class FederationStreamConfiguration<T extends
FederationStreamConfiguration<T>> implements Serializable {
private String name;
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/FederationStreamConnectMessage.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/FederationStreamConnectMessage.java
index dd5970769f..e92968187a 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/FederationStreamConnectMessage.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/FederationStreamConnectMessage.java
@@ -28,7 +28,7 @@ import
org.apache.activemq.artemis.core.config.federation.FederationTransformerC
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
-public abstract class FederationStreamConnectMessage <T extends
FederationStreamConfiguration> extends PacketImpl {
+public abstract class FederationStreamConnectMessage<T extends
FederationStreamConfiguration> extends PacketImpl {
private String name;
private Credentials credentials;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 88edc94613..4ae7147db1 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -1674,7 +1674,7 @@ public class ServerConsumerImpl implements
ServerConsumer, ReadyListener {
private volatile int messagesAcknowledgedAwaitingCommit = 0;
- private static final
AtomicLongFieldUpdater<ServerConsumerMetrics>messagesDeliveredSizeUpdater =
AtomicLongFieldUpdater.newUpdater(ServerConsumerMetrics.class,
"messagesDeliveredSize");
+ private static final AtomicLongFieldUpdater<ServerConsumerMetrics>
messagesDeliveredSizeUpdater =
AtomicLongFieldUpdater.newUpdater(ServerConsumerMetrics.class,
"messagesDeliveredSize");
private volatile long messagesDeliveredSize = 0;
@@ -1682,7 +1682,7 @@ public class ServerConsumerImpl implements
ServerConsumer, ReadyListener {
private volatile long lastAcknowledgedTime = 0;
- private static final
AtomicLongFieldUpdater<ServerConsumerMetrics>messagesDeliveredUpdater =
AtomicLongFieldUpdater.newUpdater(ServerConsumerMetrics.class,
"messagesDelivered");
+ private static final AtomicLongFieldUpdater<ServerConsumerMetrics>
messagesDeliveredUpdater =
AtomicLongFieldUpdater.newUpdater(ServerConsumerMetrics.class,
"messagesDelivered");
private volatile long messagesDelivered = 0;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
index 0175e58fc3..f787872581 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
@@ -400,7 +400,7 @@ public class LDAPLoginModule implements AuditLoginModule {
NamingEnumeration<SearchResult> results = null;
try {
- results = SecurityManagerShim.callAs(brokerGssapiIdentity,
(Callable< NamingEnumeration<SearchResult>>) () ->
context.search(getLDAPPropertyValue(ConfigKey.USER_BASE), filter, constraints));
+ results = SecurityManagerShim.callAs(brokerGssapiIdentity,
(Callable<NamingEnumeration<SearchResult>>) () ->
context.search(getLDAPPropertyValue(ConfigKey.USER_BASE), filter, constraints));
} catch (CompletionException e) {
Throwable cause = e.getCause();
FailedLoginException ex = new FailedLoginException("Error
executing search query to resolve DN");
@@ -526,7 +526,7 @@ public class LDAPLoginModule implements AuditLoginModule {
Queue<String> pendingNameExpansion = new LinkedList<>();
NamingEnumeration<SearchResult> results = null;
try {
- results = SecurityManagerShim.callAs(brokerGssapiIdentity, (Callable<
NamingEnumeration<SearchResult>>) () ->
context.search(getLDAPPropertyValue(ConfigKey.ROLE_BASE), filter, constraints));
+ results = SecurityManagerShim.callAs(brokerGssapiIdentity,
(Callable<NamingEnumeration<SearchResult>>) () ->
context.search(getLDAPPropertyValue(ConfigKey.ROLE_BASE), filter, constraints));
} catch (CompletionException e) {
Throwable cause = e.getCause();
NamingException ex = new NamingException("Error executing search
query to resolve roles");
@@ -563,7 +563,7 @@ public class LDAPLoginModule implements AuditLoginModule {
logger.debug(" filter: {}", expandFilter);
}
try {
- results = SecurityManagerShim.callAs(brokerGssapiIdentity,
(Callable< NamingEnumeration<SearchResult>>) () ->
context.search(getLDAPPropertyValue(ConfigKey.ROLE_BASE), expandFilter,
constraints));
+ results = SecurityManagerShim.callAs(brokerGssapiIdentity,
(Callable<NamingEnumeration<SearchResult>>) () ->
context.search(getLDAPPropertyValue(ConfigKey.ROLE_BASE), expandFilter,
constraints));
} catch (CompletionException e) {
Throwable cause = e.getCause();
NamingException ex = new NamingException("Error executing
search query to expand roles");
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index 89f5e8d8d3..0bc3e2f05c 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -93,6 +93,7 @@ under the License.
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA"/>
</module>
+ <module name="GenericWhitespace"/>
<module name="ParenPad">
<property name="option" value="nospace"/>
</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
