You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/12/02 10:03:13 UTC
[sling-org-apache-sling-models-jacksonexporter] branch master updated: cosmetic: code cleanup, eliminate code warnings
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git
The following commit(s) were added to refs/heads/master by this push:
new 2bd60c6 cosmetic: code cleanup, eliminate code warnings
2bd60c6 is described below
commit 2bd60c6bc997be35e73f5f23c0ca1125c6d73ce0
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Thu Dec 2 11:02:36 2021 +0100
cosmetic: code cleanup, eliminate code warnings
---
.../sling/models/jacksonexporter/impl/EnumerationSerializer.java | 2 ++
.../sling/models/jacksonexporter/impl/HttpServletRequestMixin.java | 2 +-
.../org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java | 3 +++
.../sling/models/jacksonexporter/impl/ModelSkippingSerializers.java | 2 ++
.../apache/sling/models/jacksonexporter/impl/ResourceSerializer.java | 2 ++
.../apache/sling/models/jacksonexporter/impl/ServletRequestMixin.java | 4 ++--
.../models/jacksonexporter/impl/ModelSkippingSerializersTest.java | 2 ++
7 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/EnumerationSerializer.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/EnumerationSerializer.java
index 7dfb81f..5812939 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/EnumerationSerializer.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/EnumerationSerializer.java
@@ -43,7 +43,9 @@ public class EnumerationSerializer extends JsonSerializer<Enumeration> implement
}
@Override
+ @SuppressWarnings("unchecked")
public void serialize(Enumeration value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
iteratorSerializer.serialize(new EnumerationIterator(value), jgen, provider);
}
+
}
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/HttpServletRequestMixin.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/HttpServletRequestMixin.java
index 8c007fe..78771b2 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/HttpServletRequestMixin.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/HttpServletRequestMixin.java
@@ -94,7 +94,7 @@ public abstract class HttpServletRequestMixin extends ServletRequestMixin implem
@JsonGetter
@Override
- public abstract Enumeration getHeaderNames();
+ public abstract Enumeration<String> getHeaderNames();
@JsonGetter
@Override
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java
index 03887e3..07a9e1c 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java
@@ -64,6 +64,7 @@ public class JacksonExporter implements ModelExporter {
}
@Override
+ @SuppressWarnings({ "null", "unchecked" })
public <T> T export(@NotNull Object model, @NotNull Class<T> clazz, @NotNull Map<String, String> options)
throws ExportException {
ObjectMapper mapper = new ObjectMapper();
@@ -137,6 +138,8 @@ public class JacksonExporter implements ModelExporter {
}
private static class EscapeCloseScriptBlocks extends CharacterEscapes {
+ private static final long serialVersionUID = 384022064440034138L;
+
private final int[] escapes;
EscapeCloseScriptBlocks() {
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializers.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializers.java
index 1c798b6..bec1b8e 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializers.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializers.java
@@ -25,7 +25,9 @@ import com.fasterxml.jackson.databind.SerializationConfig;
import com.fasterxml.jackson.databind.module.SimpleSerializers;
public class ModelSkippingSerializers extends SimpleSerializers {
+ private static final long serialVersionUID = -638837465287955097L;
+ @SuppressWarnings("unused")
@Override
public JsonSerializer<?> findSerializer(SerializationConfig config, JavaType type, BeanDescription beanDesc) {
Class<?> clazz = type.getRawClass();
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java
index 75ea872..07559f6 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java
@@ -47,6 +47,7 @@ public class ResourceSerializer extends JsonSerializer<Resource> implements Reso
}
/** Dump given resource in JSON, optionally recursing into its objects */
+ @SuppressWarnings({ "unused", "null" })
private void create(final Resource resource, final JsonGenerator jgen, final int currentRecursionLevel,
final SerializerProvider provider) throws IOException {
jgen.writeStartObject();
@@ -107,6 +108,7 @@ public class ResourceSerializer extends JsonSerializer<Resource> implements Reso
/**
* Write a single property
*/
+ @SuppressWarnings("null")
private void createProperty(final JsonGenerator jgen, final ValueMap valueMap, final String key, final Object value,
final SerializerProvider provider)
throws IOException {
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ServletRequestMixin.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ServletRequestMixin.java
index e2f20b9..a0cdbe0 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ServletRequestMixin.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ServletRequestMixin.java
@@ -30,7 +30,7 @@ public abstract class ServletRequestMixin implements ServletRequest {
@JsonGetter("parameters")
@Override
- public abstract Map getParameterMap();
+ public abstract Map<String,String[]> getParameterMap();
@JsonGetter
@Override
@@ -65,7 +65,7 @@ public abstract class ServletRequestMixin implements ServletRequest {
public abstract boolean isSecure();
@Override
- public abstract Enumeration getLocales();
+ public abstract Enumeration<Locale> getLocales();
@Override
public abstract String getCharacterEncoding();
diff --git a/src/test/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializersTest.java b/src/test/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializersTest.java
index c32c563..1316218 100644
--- a/src/test/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializersTest.java
+++ b/src/test/java/org/apache/sling/models/jacksonexporter/impl/ModelSkippingSerializersTest.java
@@ -98,6 +98,7 @@ public class ModelSkippingSerializersTest {
}
@Override
+ @SuppressWarnings("null")
public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
return null;
}
@@ -161,6 +162,7 @@ public class ModelSkippingSerializersTest {
}
@Override
+ @SuppressWarnings("null")
public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
return null;
}