This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 73f7a18 Fix some indentation issues
73f7a18 is described below
commit 73f7a1801a86d37d8def039084626eb2c795e553
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 1 19:29:29 2021 +0100
Fix some indentation issues
Helps readability but mainly to trigger a CI build
---
java/javax/ejb/EJB.java | 14 +++++++-------
java/javax/el/BeanELResolver.java | 6 ++----
java/javax/el/ExpressionFactory.java | 3 +--
java/javax/el/ListELResolver.java | 3 +--
java/javax/el/Util.java | 20 ++++++++------------
java/javax/persistence/PersistenceContext.java | 10 +++++-----
java/javax/persistence/PersistenceProperty.java | 4 ++--
java/javax/persistence/PersistenceUnit.java | 4 ++--
res/checkstyle/checkstyle.xml | 9 ++++++++-
9 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/java/javax/ejb/EJB.java b/java/javax/ejb/EJB.java
index 2b16782..0ab4f17 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/javax/ejb/EJB.java
@@ -27,11 +27,11 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface EJB {
- String name() default "";
- String description() default "";
- @SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
- Class beanInterface() default java.lang.Object.class;
- String beanName() default "";
- String mappedName() default "";
- String lookup() default "";
+ String name() default "";
+ String description() default "";
+ @SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
+ Class beanInterface() default java.lang.Object.class;
+ String beanName() default "";
+ String mappedName() default "";
+ String lookup() default "";
}
diff --git a/java/javax/el/BeanELResolver.java
b/java/javax/el/BeanELResolver.java
index 3f4b454..74316a3 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -37,8 +37,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class BeanELResolver extends ELResolver {
private static final int CACHE_SIZE;
- private static final String CACHE_SIZE_PROP =
- "org.apache.el.BeanELResolver.CACHE_SIZE";
+ private static final String CACHE_SIZE_PROP =
"org.apache.el.BeanELResolver.CACHE_SIZE";
static {
String cacheSizeStr;
@@ -59,8 +58,7 @@ public class BeanELResolver extends ELResolver {
private final boolean readOnly;
- private final ConcurrentCache<String, BeanProperties> cache =
- new ConcurrentCache<>(CACHE_SIZE);
+ private final ConcurrentCache<String, BeanProperties> cache = new
ConcurrentCache<>(CACHE_SIZE);
public BeanELResolver() {
this.readOnly = false;
diff --git a/java/javax/el/ExpressionFactory.java
b/java/javax/el/ExpressionFactory.java
index 59ee53e..3aa15d8 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -43,8 +43,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
*/
public abstract class ExpressionFactory {
- private static final boolean IS_SECURITY_ENABLED =
- (System.getSecurityManager() != null);
+ private static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
private static final String PROPERTY_NAME = "javax.el.ExpressionFactory";
diff --git a/java/javax/el/ListELResolver.java
b/java/javax/el/ListELResolver.java
index cd88620..50a0ff0 100644
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -28,8 +28,7 @@ public class ListELResolver extends ELResolver {
private final boolean readOnly;
- private static final Class<?> UNMODIFIABLE =
- Collections.unmodifiableList(new ArrayList<>()).getClass();
+ private static final Class<?> UNMODIFIABLE =
Collections.unmodifiableList(new ArrayList<>()).getClass();
public ListELResolver() {
this.readOnly = false;
diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index 43b3642..7a30b75 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -365,7 +365,7 @@ class Util {
throw new MethodNotFoundException(message(
null, "util.method.ambiguous", clazz, name,
paramString(paramTypes)));
- }
+ }
}
// Handle case where no match at all was found
@@ -424,12 +424,11 @@ class Util {
}
for (Wrapper<T> c : candidates) {
- if (c.getParameterTypes()[nonMatchIndex] ==
- paramTypes[nonMatchIndex]) {
- // Methods have different non-matching parameters
- // Result is ambiguous
- return null;
- }
+ if (c.getParameterTypes()[nonMatchIndex] ==
paramTypes[nonMatchIndex]) {
+ // Methods have different non-matching parameters
+ // Result is ambiguous
+ return null;
+ }
}
// Can't be null
@@ -632,11 +631,8 @@ class Util {
parameterTypes[i]);
}
// Last parameter is the varargs
- Class<?> varArgClass =
- parameterTypes[varArgIndex].getComponentType();
- final Object varargs = Array.newInstance(
- varArgClass,
- (paramCount - varArgIndex));
+ Class<?> varArgClass =
parameterTypes[varArgIndex].getComponentType();
+ final Object varargs = Array.newInstance(varArgClass,
(paramCount - varArgIndex));
for (int i = (varArgIndex); i < paramCount; i++) {
Array.set(varargs, i - varArgIndex,
factory.coerceToType(params[i], varArgClass));
diff --git a/java/javax/persistence/PersistenceContext.java
b/java/javax/persistence/PersistenceContext.java
index e273953..428fa09 100644
--- a/java/javax/persistence/PersistenceContext.java
+++ b/java/javax/persistence/PersistenceContext.java
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceContext {
- String name() default "";
- String unitName() default "";
- PersistenceContextType type() default PersistenceContextType.TRANSACTION;
- PersistenceProperty[] properties() default {};
- SynchronizationType synchronization() default
SynchronizationType.SYNCHRONIZED;
+ String name() default "";
+ String unitName() default "";
+ PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+ PersistenceProperty[] properties() default {};
+ SynchronizationType synchronization() default
SynchronizationType.SYNCHRONIZED;
}
diff --git a/java/javax/persistence/PersistenceProperty.java
b/java/javax/persistence/PersistenceProperty.java
index 20a42c5..61cabfc 100644
--- a/java/javax/persistence/PersistenceProperty.java
+++ b/java/javax/persistence/PersistenceProperty.java
@@ -25,6 +25,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceProperty {
- String name();
- String value();
+ String name();
+ String value();
}
diff --git a/java/javax/persistence/PersistenceUnit.java
b/java/javax/persistence/PersistenceUnit.java
index 9f34198..56de1fe 100644
--- a/java/javax/persistence/PersistenceUnit.java
+++ b/java/javax/persistence/PersistenceUnit.java
@@ -27,6 +27,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceUnit {
- String name() default "";
- String unitName() default "";
+ String name() default "";
+ String unitName() default "";
}
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index f881d92..f8c0548 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -77,7 +77,14 @@
<module name="RedundantImport"/>
<module name="UnusedImports"/>
- <!-- Modifiers -->
+ <!-- Miscellaneous -->
+ <!-- ~5500 errors
+ <module name="Indentation">
+ <property name="lineWrappingIndentation" value="8"/>
+ </module>
+ -->
+
+ <!-- Modifiers -->
<module name="ModifierOrder"/>
<!-- ~1750 errors
<module name="RedundantModifier"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
