You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gg...@apache.org on 2023/06/24 03:48:58 UTC
[juneau] 22/29: [juneau-marshall] Remove redundant modifiers
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 89e35a42f94409a4d85687d01ce75553119fcb5a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:36:50 2023 -0400
[juneau-marshall] Remove redundant modifiers
---
.../java/org/apache/juneau/AnnotationProvider.java | 5 ++-
.../src/main/java/org/apache/juneau/BeanMeta.java | 2 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../src/main/java/org/apache/juneau/ClassMeta.java | 2 +-
.../src/main/java/org/apache/juneau/Delegate.java | 2 +-
.../main/java/org/apache/juneau/PropertyNamer.java | 2 +-
.../org/apache/juneau/collections/JsonList.java | 2 +-
.../org/apache/juneau/collections/JsonMap.java | 6 ++--
.../main/java/org/apache/juneau/cp/FileFinder.java | 8 ++---
.../apache/juneau/csv/CsvSerializerSession.java | 4 +--
.../org/apache/juneau/html/HtmlDocTemplate.java | 2 +-
.../org/apache/juneau/html/HtmlParserSession.java | 8 ++---
.../java/org/apache/juneau/html/HtmlWidget.java | 8 ++---
.../org/apache/juneau/httppart/HttpPartParser.java | 10 +++---
.../juneau/httppart/HttpPartParserSession.java | 2 +-
.../apache/juneau/httppart/HttpPartSerializer.java | 6 ++--
.../juneau/httppart/HttpPartSerializerSession.java | 2 +-
.../org/apache/juneau/internal/ArrayUtils.java | 8 ++---
.../java/org/apache/juneau/internal/DateUtils.java | 2 +-
.../org/apache/juneau/json/JsonParserSession.java | 6 ++--
.../apache/juneau/msgpack/MsgPackOutputStream.java | 36 +++++++++++-----------
.../juneau/msgpack/MsgPackSerializerSession.java | 4 +--
.../org/apache/juneau/objecttools/ObjectTool.java | 2 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 16 +++++-----
.../org/apache/juneau/reflect/ConstructorInfo.java | 10 +++---
.../java/org/apache/juneau/reflect/FieldInfo.java | 2 +-
.../java/org/apache/juneau/reflect/MethodInfo.java | 12 ++++----
.../main/java/org/apache/juneau/uon/UonReader.java | 4 +--
.../main/java/org/apache/juneau/uon/UonUtils.java | 2 +-
.../main/java/org/apache/juneau/uon/UonWriter.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 6 ++--
.../main/java/org/apache/juneau/xml/XmlUtils.java | 34 ++++++++++----------
32 files changed, 109 insertions(+), 110 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
index 0ab895670..47d07a1a0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
@@ -31,13 +31,12 @@ public interface AnnotationProvider {
/**
* Disable annotation caching.
*/
- static final boolean DISABLE_ANNOTATION_CACHING = Boolean.getBoolean("juneau.disableAnnotationCaching");
+ boolean DISABLE_ANNOTATION_CACHING = Boolean.getBoolean("juneau.disableAnnotationCaching");
/**
* Default metadata provider.
*/
- @SuppressWarnings("unchecked")
- public static final AnnotationProvider DEFAULT = new AnnotationProvider() {
+ @SuppressWarnings("unchecked") AnnotationProvider DEFAULT = new AnnotationProvider() {
private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> classAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getAnnotationsByType);
private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> declaredClassAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getDeclaredAnnotationsByType);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 3061a0ccd..13b6f6f84 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -574,7 +574,7 @@ public class BeanMeta<T> {
/**
* Possible property method types.
*/
- static enum MethodType {
+ enum MethodType {
UNKNOWN,
GETTER,
SETTER,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 428d33eb8..419442531 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -612,7 +612,7 @@ public final class BeanPropertyMeta implements Comparable<BeanPropertyMeta> {
* Converts a raw bean property value to serialized form.
* Applies transforms and child property filters.
*/
- final Object toSerializedForm(BeanSession session, Object o) {
+ Object toSerializedForm(BeanSession session, Object o) {
try {
o = transform(session, o);
if (o == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 109f897c6..293b123bf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -213,7 +213,7 @@ public final class ClassMeta<T> implements Type {
/**
* Causes thread to wait until constructor has exited.
*/
- final void waitForInit() {
+ void waitForInit() {
try (SimpleLock x = lock.read()) {}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java
index d95bb1dc9..fd99deaf5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java
@@ -33,5 +33,5 @@ public interface Delegate<T> {
*
* @return The class type of the represented object.
*/
- public ClassMeta<T> getClassMeta();
+ ClassMeta<T> getClassMeta();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java
index 1fea1df04..2b9ed1684 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java
@@ -40,5 +40,5 @@ public interface PropertyNamer {
* @param name The original bean property name.
* @return The converted property name.
*/
- public String getPropertyName(String name);
+ String getPropertyName(String name);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index ace844a58..a0d689b06 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -1039,7 +1039,7 @@ public class JsonList extends LinkedList<Object> {
}
@Override
- public final boolean isUnmodifiable() {
+ public boolean isUnmodifiable() {
return true;
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index efcf0e854..998a0661b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -1786,17 +1786,17 @@ public class JsonMap extends LinkedHashMap<String,Object> {
}
@Override
- public final Object put(String key, Object val) {
+ public Object put(String key, Object val) {
throw new UnsupportedOperationException("Not supported on read-only object.");
}
@Override
- public final Object remove(Object key) {
+ public Object remove(Object key) {
throw new UnsupportedOperationException("Not supported on read-only object.");
}
@Override
- public final boolean isUnmodifiable() {
+ public boolean isUnmodifiable() {
return true;
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index d16f270bd..12465c14c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -99,7 +99,7 @@ public interface FileFinder {
* @param beanStore The bean store to use for creating beans.
* @return A new builder for this object.
*/
- public static Builder create(BeanStore beanStore) {
+ static Builder create(BeanStore beanStore) {
return new Builder(beanStore);
}
@@ -108,7 +108,7 @@ public interface FileFinder {
*
* @return A new builder for this object.
*/
- public static Builder create() {
+ static Builder create() {
return new Builder(BeanStore.INSTANCE);
}
@@ -262,7 +262,7 @@ public interface FileFinder {
* @return The resolved resource contents, or <jk>null</jk> if the resource was not found.
* @throws IOException Thrown by underlying stream.
*/
- public Optional<InputStream> getStream(String name, Locale locale) throws IOException;
+ Optional<InputStream> getStream(String name, Locale locale) throws IOException;
/**
* Returns the file with the specified name as a string.
@@ -274,5 +274,5 @@ public interface FileFinder {
* @return The contents of the file as a string. Assumes UTF-8 encoding.
* @throws IOException If file could not be read.
*/
- public Optional<String> getString(String name, Locale locale) throws IOException;
+ Optional<String> getString(String name, Locale locale) throws IOException;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index fa3468d10..b25efffd7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -212,7 +212,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
@SuppressWarnings("rawtypes")
@Override /* SerializerSession */
- protected final void doSerialize(SerializerPipe pipe, Object o) throws IOException, SerializeException {
+ protected void doSerialize(SerializerPipe pipe, Object o) throws IOException, SerializeException {
try (CsvWriter w = getCsvWriter(pipe)) {
ClassMeta<?> cm = getClassMetaForObject(o);
@@ -274,7 +274,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
}
}
- final CsvWriter getCsvWriter(SerializerPipe out) {
+ CsvWriter getCsvWriter(SerializerPipe out) {
Object output = out.getRawOutput();
if (output instanceof CsvWriter)
return (CsvWriter)output;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
index 271e9e2fe..e4a27fbd2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
@@ -72,5 +72,5 @@ public interface HtmlDocTemplate {
* @param o The object being serialized.
* @throws Exception Any exception can be thrown.
*/
- public void writeTo(HtmlDocSerializerSession session, HtmlWriter w, Object o) throws Exception;
+ void writeTo(HtmlDocSerializerSession session, HtmlWriter w, Object o) throws Exception;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 2ddb44964..55a634b60 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -780,7 +780,7 @@ public final class HtmlParserSession extends XmlParserSession {
* @throws XMLStreamException Thrown by underlying XML stream.
*/
@Override /* XmlParserSession */
- protected final String parseText(XmlReader r) throws IOException, ParseException, XMLStreamException {
+ protected String parseText(XmlReader r) throws IOException, ParseException, XMLStreamException {
StringBuilder sb = getStringBuilder();
@@ -872,19 +872,19 @@ public final class HtmlParserSession extends XmlParserSession {
* @throws ParseException Malformed input encountered.
*/
@Override /* XmlParserSession */
- protected final String getElementText(XmlReader r) throws IOException, XMLStreamException, ParseException {
+ protected String getElementText(XmlReader r) throws IOException, XMLStreamException, ParseException {
r.next();
return parseText(r);
}
@Override /* XmlParserSession */
- protected final boolean isWhitespaceElement(XmlReader r) {
+ protected boolean isWhitespaceElement(XmlReader r) {
String s = r.getLocalName();
return whitespaceElements.contains(s);
}
@Override /* XmlParserSession */
- protected final String parseWhitespaceElement(XmlReader r) throws IOException, ParseException, XMLStreamException {
+ protected String parseWhitespaceElement(XmlReader r) throws IOException, ParseException, XMLStreamException {
HtmlTag tag = HtmlTag.forEvent(this, r);
int et = r.next();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
index 56f9f025b..72d5ec4b0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
@@ -38,7 +38,7 @@ public interface HtmlWidget {
*
* @return A unique identifying name for this widget.
*/
- public String getName();
+ String getName();
/**
* Resolves the HTML content for this widget.
@@ -49,7 +49,7 @@ public interface HtmlWidget {
* @param session The current serializer session.
* @return The HTML content of this widget.
*/
- public String getHtml(VarResolverSession session);
+ String getHtml(VarResolverSession session);
/**
* Resolves any Javascript that should be added to the <xt><head>/<script></xt> element.
@@ -60,7 +60,7 @@ public interface HtmlWidget {
* @param session The current serializer session.
* @return The Javascript needed by this widget.
*/
- public String getScript(VarResolverSession session);
+ String getScript(VarResolverSession session);
/**
* Resolves any CSS styles that should be added to the <xt><head>/<style></xt> element.
@@ -71,5 +71,5 @@ public interface HtmlWidget {
* @param session The current serializer session.
* @return The CSS styles needed by this widget.
*/
- public String getStyle(VarResolverSession session);
+ String getStyle(VarResolverSession session);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
index f4de5a131..4783a58e0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
@@ -47,13 +47,13 @@ public interface HttpPartParser {
* <p>
* Used to represent the absence of a part parser in annotations.
*/
- public static interface Void extends HttpPartParser {}
+ public interface Void extends HttpPartParser {}
/**
* Instantiates a creator for a part parser.
* @return A new creator.
*/
- public static Creator creator() {
+ static Creator creator() {
return new Creator();
}
@@ -111,7 +111,7 @@ public interface HttpPartParser {
*
* @return A new parser session.
*/
- public HttpPartParserSession getPartSession();
+ HttpPartParserSession getPartSession();
/**
* Returns metadata about the specified class.
@@ -120,7 +120,7 @@ public interface HttpPartParser {
* @param c The class type.
* @return Metadata about the specified class.
*/
- public <T> ClassMeta<T> getClassMeta(Class<T> c);
+ <T> ClassMeta<T> getClassMeta(Class<T> c);
/**
* Returns metadata about the specified class.
@@ -130,5 +130,5 @@ public interface HttpPartParser {
* @param args The class type args.
* @return Metadata about the specified class.
*/
- public <T> ClassMeta<T> getClassMeta(Type t, Type...args);
+ <T> ClassMeta<T> getClassMeta(Type t, Type...args);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
index 7d8b18dc6..65485418c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
@@ -43,5 +43,5 @@ public interface HttpPartParserSession {
* @throws ParseException Malformed input encountered.
* @throws SchemaValidationException If the input or resulting HTTP part object fails schema validation.
*/
- public <T> T parse(HttpPartType partType, HttpPartSchema schema, String in, ClassMeta<T> toType) throws ParseException, SchemaValidationException;
+ <T> T parse(HttpPartType partType, HttpPartSchema schema, String in, ClassMeta<T> toType) throws ParseException, SchemaValidationException;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
index 1b0be724b..1e9caf6f6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
@@ -59,13 +59,13 @@ public interface HttpPartSerializer {
* <p>
* Used to represent the absence of a part serializer in annotations.
*/
- public static interface Void extends HttpPartSerializer {}
+ public interface Void extends HttpPartSerializer {}
/**
* Instantiates a creator for a part serializer.
* @return A new creator.
*/
- public static Creator creator() {
+ static Creator creator() {
return new Creator();
}
@@ -124,5 +124,5 @@ public interface HttpPartSerializer {
*
* @return A new serializer session.
*/
- public HttpPartSerializerSession getPartSession();
+ HttpPartSerializerSession getPartSession();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
index fc46dfe60..5a4388863 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
@@ -44,5 +44,5 @@ public interface HttpPartSerializerSession {
* @throws SerializeException If a problem occurred while trying to parse the input.
* @throws SchemaValidationException If the output fails schema validation.
*/
- public String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException;
+ String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index 5bc0a0daa..60027ac45 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -293,7 +293,7 @@ public final class ArrayUtils {
* @param array The array to check.
* @return <jk>true</jk> if the specified array is not null and has a length greater than zero.
*/
- public static final boolean isNotEmptyArray(Object[] array) {
+ public static boolean isNotEmptyArray(Object[] array) {
return array != null && array.length > 0;
}
@@ -303,7 +303,7 @@ public final class ArrayUtils {
* @param array The array to check.
* @return <jk>true</jk> if the specified array is null or has a length of zero.
*/
- public static final boolean isEmptyArray(Object[] array) {
+ public static boolean isEmptyArray(Object[] array) {
return array == null || array.length == 0;
}
@@ -314,7 +314,7 @@ public final class ArrayUtils {
* @param array2 The array to check.
* @return <jk>true</jk> if the specified array is null or has a length of zero.
*/
- public static final boolean isEmptyArray(Object[] array1, Object[] array2) {
+ public static boolean isEmptyArray(Object[] array1, Object[] array2) {
return isEmptyArray(array1) && isEmptyArray(array2);
}
@@ -325,7 +325,7 @@ public final class ArrayUtils {
* @param array The array to reverse.
* @return The same array.
*/
- public static final <E> E[] reverse(E[] array) {
+ public static <E> E[] reverse(E[] array) {
for (int i = 0; i < array.length / 2; i++) {
E temp = array[i];
array[i] = array[array.length - i - 1];
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
index 41ef22111..0c0b3a1b4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
@@ -162,7 +162,7 @@ public final class DateUtils {
* @param in The string to pad.
* @return The padded string.
*/
- public static final String toValidISO8601DT(String in) {
+ public static String toValidISO8601DT(String in) {
// "2001-07-04T15:30:45Z"
final int
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 0bc7b3b9c..e46e4fd33 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -220,7 +220,7 @@ public final class JsonParserSession extends ReaderParserSession {
* @param cp The codepoint.
* @return <jk>true</jk> if the specified character is whitespace.
*/
- protected final boolean isWhitespace(int cp) {
+ protected boolean isWhitespace(int cp) {
if (isStrict())
return cp <= 0x20 && (cp == 0x09 || cp == 0x0A || cp == 0x0D || cp == 0x20);
return Character.isWhitespace(cp);
@@ -232,7 +232,7 @@ public final class JsonParserSession extends ReaderParserSession {
* @param cp The codepoint.
* @return <jk>true</jk> if the specified character is whitespace or '/'.
*/
- protected final boolean isCommentOrWhitespace(int cp) {
+ protected boolean isCommentOrWhitespace(int cp) {
if (cp == '/')
return true;
if (isStrict())
@@ -960,7 +960,7 @@ public final class JsonParserSession extends ReaderParserSession {
* <jk>true</jk> if after parsing a POJO from the input, verifies that the remaining input in
* the stream consists of only comments or whitespace.
*/
- protected final boolean isValidateEnd() {
+ protected boolean isValidateEnd() {
return ctx.isValidateEnd();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
index bcab3d2b6..65f3efbf0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
@@ -58,7 +58,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Same as {@link #write(int)}.
*/
- final MsgPackOutputStream append(byte b) {
+ MsgPackOutputStream append(byte b) {
try {
os.write(b);
} catch (IOException e) {
@@ -70,7 +70,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Same as {@link #write(byte[])}.
*/
- final MsgPackOutputStream append(byte[] b) {
+ MsgPackOutputStream append(byte[] b) {
try {
os.write(b);
} catch (IOException e) {
@@ -82,7 +82,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends one byte to the stream.
*/
- final MsgPackOutputStream append1(int i) {
+ MsgPackOutputStream append1(int i) {
try {
os.write(i);
} catch (IOException e) {
@@ -94,42 +94,42 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends two bytes to the stream.
*/
- final MsgPackOutputStream append2(int i) {
+ MsgPackOutputStream append2(int i) {
return append1(i>>8).append1(i);
}
/**
* Appends four bytes to the stream.
*/
- final MsgPackOutputStream append4(int i) {
+ MsgPackOutputStream append4(int i) {
return append1(i>>24).append1(i>>16).append1(i>>8).append1(i);
}
/**
* Appends eight bytes to the stream.
*/
- final MsgPackOutputStream append8(long l) {
+ MsgPackOutputStream append8(long l) {
return append1((int)(l>>56)).append1((int)(l>>48)).append1((int)(l>>40)).append1((int)(l>>32)).append1((int)(l>>24)).append1((int)(l>>16)).append1((int)(l>>8)).append1((int)(l));
}
/**
* Appends a NULL flag to the stream.
*/
- final MsgPackOutputStream appendNull() {
+ MsgPackOutputStream appendNull() {
return append1(NIL);
}
/**
* Appends a boolean to the stream.
*/
- final MsgPackOutputStream appendBoolean(boolean b) {
+ MsgPackOutputStream appendBoolean(boolean b) {
return append1(b ? TRUE : FALSE);
}
/**
* Appends an integer to the stream.
*/
- final MsgPackOutputStream appendInt(int i) {
+ MsgPackOutputStream appendInt(int i) {
// POSFIXINT_L = 0x00, // pos fixint 0xxxxxxx 0x00 - 0x7f
// POSFIXINT_U = 0x7F,
// UINT8 = 0xCC, // uint 8 11001100 0xcc
@@ -163,7 +163,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a long to the stream.
*/
- final MsgPackOutputStream appendLong(long l) {
+ MsgPackOutputStream appendLong(long l) {
if (l < L2X31 && l > -(L2X31))
return appendInt((int)l);
return append1(INT64).append8(l);
@@ -172,7 +172,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a generic Number to the stream.
*/
- final MsgPackOutputStream appendNumber(Number n) {
+ MsgPackOutputStream appendNumber(Number n) {
Class<?> c = n.getClass();
if (c == Integer.class || c == Short.class || c == Byte.class || c == AtomicInteger.class)
return appendInt(n.intValue());
@@ -192,7 +192,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a float to the stream.
*/
- final MsgPackOutputStream appendFloat(float f) {
+ MsgPackOutputStream appendFloat(float f) {
// FLOAT32 = 0xCA, // float 32 11001010 0xca
return append1(FLOAT32).append4(Float.floatToIntBits(f));
@@ -201,7 +201,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a double to the stream.
*/
- final MsgPackOutputStream appendDouble(double d) {
+ MsgPackOutputStream appendDouble(double d) {
// FLOAT64 = 0xCB, // float 64 11001011 0xcb
return append1(FLOAT64).append8(Double.doubleToLongBits(d));
}
@@ -209,7 +209,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a string to the stream.
*/
- final MsgPackOutputStream appendString(CharSequence cs) {
+ MsgPackOutputStream appendString(CharSequence cs) {
// fixstr stores a byte array whose length is up to 31 bytes:
// +--------+========+
@@ -258,7 +258,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a binary field to the stream.
*/
- final MsgPackOutputStream appendBinary(byte[] b) {
+ MsgPackOutputStream appendBinary(byte[] b) {
// bin 8 stores a byte array whose length is up to (2^8)-1 bytes:
// +--------+--------+========+
// | 0xc4 |XXXXXXXX| data |
@@ -290,7 +290,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a binary field to the stream.
*/
- final MsgPackOutputStream appendBinary(InputStream is) {
+ MsgPackOutputStream appendBinary(InputStream is) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
IOUtils.pipe(is, baos, x -> { throw new SerializeException(x); });
@@ -328,7 +328,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends an array data type flag to the stream.
*/
- final MsgPackOutputStream startArray(int size) {
+ MsgPackOutputStream startArray(int size) {
// fixarray stores an array whose length is up to 15 elements:
// +--------+~~~~~~~~~~~~~~~~~+
// |1001XXXX| N objects |
@@ -360,7 +360,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a map data type flag to the stream.
*/
- final MsgPackOutputStream startMap(int size) {
+ MsgPackOutputStream startMap(int size) {
// fixmap stores a map whose length is up to 15 elements
// +--------+~~~~~~~~~~~~~~~~~+
// |1000XXXX| N*2 objects |
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 5cb3506d0..1355ff130 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -206,7 +206,7 @@ public final class MsgPackSerializerSession extends OutputStreamSerializerSessio
/*
* Converts the specified output target object to an {@link MsgPackOutputStream}.
*/
- private static final MsgPackOutputStream getMsgPackOutputStream(SerializerPipe out) throws IOException {
+ private static MsgPackOutputStream getMsgPackOutputStream(SerializerPipe out) throws IOException {
Object output = out.getRawOutput();
if (output instanceof MsgPackOutputStream)
return (MsgPackOutputStream)output;
@@ -393,7 +393,7 @@ public final class MsgPackSerializerSession extends OutputStreamSerializerSessio
//-----------------------------------------------------------------------------------------------------------------
@Override
- protected final boolean isAddBeanTypes() {
+ protected boolean isAddBeanTypes() {
return ctx.isAddBeanTypes();
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
index 7ac131746..8317cf399 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
@@ -33,5 +33,5 @@ public interface ObjectTool<T> {
* @param args The arguments.
* @return The output POJO.
*/
- public Object run(BeanSession session, Object input, T args);
+ Object run(BeanSession session, Object input, T args);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index d0d07e53d..f3b35484b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -449,7 +449,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachPublicMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachPublicMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getPublicMethods())
consume(filter, action, mi);
return this;
@@ -461,7 +461,7 @@ public final class ClassInfo {
* @param filter A predicate to apply to the entries to determine if value should be used. Can be <jk>null</jk>.
* @return The first matching method, or <jk>null</jk> if no methods matched.
*/
- public final MethodInfo getPublicMethod(Predicate<MethodInfo> filter) {
+ public MethodInfo getPublicMethod(Predicate<MethodInfo> filter) {
for (MethodInfo mi : _getPublicMethods())
if (test(filter, mi))
return mi;
@@ -487,7 +487,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachDeclaredMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachDeclaredMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getDeclaredMethods())
consume(filter, action, mi);
return this;
@@ -525,7 +525,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getAllMethods())
consume(filter, action, mi);
return this;
@@ -563,7 +563,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachAllMethodParentFirst(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachAllMethodParentFirst(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getAllMethodsParentFirst())
consume(filter, action, mi);
return this;
@@ -650,7 +650,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachPublicConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
+ public ClassInfo forEachPublicConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
for (ConstructorInfo mi : _getPublicConstructors())
consume(filter, action, mi);
return this;
@@ -687,7 +687,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachDeclaredConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
+ public ClassInfo forEachDeclaredConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
for (ConstructorInfo mi : _getDeclaredConstructors())
consume(filter, action, mi);
return this;
@@ -785,7 +785,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachPublicField(Predicate<FieldInfo> filter, Consumer<FieldInfo> action) {
+ public ClassInfo forEachPublicField(Predicate<FieldInfo> filter, Consumer<FieldInfo> action) {
for (FieldInfo mi : _getPublicFields())
consume(filter, action, mi);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
index ec5c12aa4..a1f704270 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
@@ -98,7 +98,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return The annotation if found, or <jk>null</jk> if not.
*/
- public final <A extends Annotation> A getAnnotation(Class<A> type) {
+ public <A extends Annotation> A getAnnotation(Class<A> type) {
return getAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -110,7 +110,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return The first annotation found, or <jk>null</jk> if it doesn't exist.
*/
- public final <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
Value<A> t = Value.empty();
annotationProvider.forEachAnnotation(type, c, x -> true, x -> t.set(x));
return t.orElse(null);
@@ -123,7 +123,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this constructor.
*/
- public final <A extends Annotation> boolean hasAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(Class<A> type) {
return hasAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -135,7 +135,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this constructor.
*/
- public final <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
return annotationProvider.firstAnnotation(type, c, x -> true) != null;
}
@@ -147,7 +147,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this constructor.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
return ! hasAnnotation(annotationProvider, type);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
index 480c4c8b0..3cd9070be 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
@@ -141,7 +141,7 @@ public final class FieldInfo implements Comparable<FieldInfo> {
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this field.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
return ! hasAnnotation(type);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index f7f792143..3ea0ea988 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -221,7 +221,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return The annotation if found, or <jk>null</jk> if not.
*/
- public final <A extends Annotation> A getAnnotation(Class<A> type) {
+ public <A extends Annotation> A getAnnotation(Class<A> type) {
return getAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -237,7 +237,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return The first annotation found, or <jk>null</jk> if it doesn't exist.
*/
- public final <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
if (type == null)
return null;
Value<A> t = Value.empty();
@@ -256,7 +256,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this method.
*/
- public final <A extends Annotation> boolean hasAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(Class<A> type) {
return hasAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -268,7 +268,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this method.
*/
- public final <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
for (MethodInfo m2 : _getMatching())
if (annotationProvider.firstAnnotation(type, m2.inner(), x -> true) != null)
return true;
@@ -283,7 +283,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this method.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
return ! hasAnnotation(annotationProvider, type);
}
@@ -294,7 +294,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this method.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
return getAnnotation(type) == null;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
index ce3514063..bda448d75 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
@@ -61,7 +61,7 @@ public final class UonReader extends ParserReader {
}
@Override /* Reader */
- public final int read(char[] cbuf, int off, int len) throws IOException {
+ public int read(char[] cbuf, int off, int len) throws IOException {
if (! decodeChars)
return super.read(cbuf, off, len);
@@ -194,7 +194,7 @@ public final class UonReader extends ParserReader {
}
@Override /* ParserReader */
- public final UonReader unread() throws IOException {
+ public UonReader unread() throws IOException {
super.unread();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
index a65bba2c0..6863a5046 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
@@ -37,7 +37,7 @@ public final class UonUtils {
* @param s The string to test.
* @return <jk>true</jk> if the specified string needs to be quoted per UON notation.
*/
- public static final boolean needsQuotes(String s) {
+ public static boolean needsQuotes(String s) {
char c0 = s.isEmpty() ? 0 : s.charAt(0);
return (
s.isEmpty()
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
index 84c76313d..826af8992 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
@@ -79,7 +79,7 @@ public final class UonWriter extends SerializerWriter {
* @param isTopAttrName If this is a top-level attribute name we're serializing.
* @return This object.
*/
- public final UonWriter appendObject(Object o, boolean isTopAttrName) {
+ public UonWriter appendObject(Object o, boolean isTopAttrName) {
if (o instanceof Boolean)
return appendBoolean(o);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 589844509..44b3baaf9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -856,11 +856,11 @@ public class XmlSerializerSession extends WriterSerializerSession {
return out;
}
- static enum JsonType {
+ enum JsonType {
STRING("string"),BOOLEAN("boolean"),NUMBER("number"),ARRAY("array"),OBJECT("object"),NULL("null");
private final String value;
- private JsonType(String value) {
+ JsonType(String value) {
this.value = value;
}
@@ -881,7 +881,7 @@ public class XmlSerializerSession extends WriterSerializerSession {
* Identifies what the contents were of a serialized bean.
*/
@SuppressWarnings("javadoc")
- public static enum ContentResult {
+ public enum ContentResult {
CR_VOID, // No content...append "/>" to the start tag.
CR_EMPTY, // No content...append "/>" to the start tag if XML, "/></end>" if HTML.
CR_MIXED, // Mixed content...don't add whitespace.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
index e75e1099b..a53541be1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -45,7 +45,7 @@ public final class XmlUtils {
* @param value The object being encoded.
* @return The same writer passed in.
*/
- public static final Writer encodeElementName(Writer w, Object value) {
+ public static Writer encodeElementName(Writer w, Object value) {
try {
if (value == null)
return w.append("_x0000_");
@@ -65,7 +65,7 @@ public final class XmlUtils {
* @param value The object being encoded.
* @return The encoded element name string.
*/
- public static final String encodeElementName(Object value) {
+ public static String encodeElementName(Object value) {
if (value == null)
return "_x0000_";
String s = value.toString();
@@ -84,7 +84,7 @@ public final class XmlUtils {
return s;
}
- private static final Writer encodeElementNameInner(Writer w, String s) throws IOException {
+ private static Writer encodeElementNameInner(Writer w, String s) throws IOException {
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if ((c >= 'A' && c <= 'Z')
@@ -117,7 +117,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsElementNameEncoding(String value) {
+ private static boolean needsElementNameEncoding(String value) {
// Note that this doesn't need to be perfect, just fast.
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
@@ -137,7 +137,7 @@ public final class XmlUtils {
* @param value The object being encoded.
* @return The encoded string.
*/
- public static final String escapeText(Object value) {
+ public static String escapeText(Object value) {
if (value == null)
return "_x0000_";
String s = value.toString();
@@ -182,7 +182,7 @@ public final class XmlUtils {
* If <jk>true</jk>, leading and trailing whitespace characters will be encoded.
* @return The same writer passed in.
*/
- public static final Writer encodeText(Writer w, Object value, boolean trim, boolean preserveWhitespace) {
+ public static Writer encodeText(Writer w, Object value, boolean trim, boolean preserveWhitespace) {
try {
if (value == null)
@@ -218,7 +218,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsTextEncoding(String value) {
+ private static boolean needsTextEncoding(String value) {
// See if we need to convert the string.
// Conversion is somewhat expensive, so make sure we need to do so before hand.
final int len = value.length();
@@ -253,7 +253,7 @@ public final class XmlUtils {
* @return This object.
* @throws IOException If a problem occurred.
*/
- public static final Writer encodeAttrName(Writer w, Object value) throws IOException {
+ public static Writer encodeAttrName(Writer w, Object value) throws IOException {
if (value == null)
return w.append("_x0000_");
String s = value.toString();
@@ -284,7 +284,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsAttrNameEncoding(String value) {
+ private static boolean needsAttrNameEncoding(String value) {
// Note that this doesn't need to be perfect, just fast.
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
@@ -314,7 +314,7 @@ public final class XmlUtils {
* If <jk>true</jk>, leading and trailing whitespace characters will be encoded.
* @return The same writer passed in.
*/
- public static final Writer encodeAttrValue(Writer w, Object value, boolean trim) {
+ public static Writer encodeAttrValue(Writer w, Object value, boolean trim) {
try {
if (value == null)
return w.append("_x0000_");
@@ -349,7 +349,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsAttrValueEncoding(String value) {
+ private static boolean needsAttrValueEncoding(String value) {
// See if we need to convert the string.
// Conversion is somewhat expensive, so make sure we need to do so before hand.
final int len = value.length();
@@ -385,7 +385,7 @@ public final class XmlUtils {
* @param sb The string builder to use as a scratch pad.
* @return The decoded string.
*/
- public static final String decode(String value, StringBuilder sb) {
+ public static String decode(String value, StringBuilder sb) {
if (value == null)
return null;
if (value.isEmpty() || value.indexOf('_') == -1)
@@ -448,13 +448,13 @@ public final class XmlUtils {
//-----------------------------------------------------------------------------------------------------------------
// Returns true if the specified character can safely be used in XML text or an attribute.
- private static final boolean isValidXmlCharacter(char c) {
+ private static boolean isValidXmlCharacter(char c) {
return (c >= 0x20 && c <= 0xD7FF) /*|| c == 0xA || c == 0xD*/ || (c >= 0xE000 && c <= 0xFFFD);
}
// Returns true if the string at the specified position is of the form "_x####_"
// where '#' are hexadecimal characters.
- private static final boolean isEscapeSequence(String s, int i) {
+ private static boolean isEscapeSequence(String s, int i) {
return s.length() > i+6
&& s.charAt(i) == '_'
&& s.charAt(i+1) == 'x'
@@ -466,12 +466,12 @@ public final class XmlUtils {
}
// Returns true if the character is a hexadecimal character
- private static final boolean isHexCharacter(char c) {
+ private static boolean isHexCharacter(char c) {
return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F');
}
// Converts an integer to a hexadecimal string padded to 4 places.
- private static final Writer appendPaddedHexChar(Writer out, int num) throws IOException {
+ private static Writer appendPaddedHexChar(Writer out, int num) throws IOException {
out.append("_x");
for (char c : toHex4(num))
out.append(c);
@@ -553,7 +553,7 @@ public final class XmlUtils {
* @param r The XML stream reader whose current event is to be converted to a readable string.
* @return The event in human-readable form.
*/
- public static final String toReadableEvent(XMLStreamReader r) {
+ public static String toReadableEvent(XMLStreamReader r) {
int t = r.getEventType();
if (t == 1)
return "<"+r.getLocalName()+">";