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/01 19:15:38 UTC
[sling-org-apache-sling-models-jacksonexporter] branch master updated (3c6d311 -> 8fe5f4c)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git.
from 3c6d311 SLING-10962 Sling Models Exporter: Switch to Commons Collections 4
new f986549 cosmetic: remove unused (and outdated) dependency
new 8fe5f4c cosmetic: organize imports, remove unused imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 6 ------
.../sling/models/jacksonexporter/ModuleProvider.java | 3 ++-
.../jacksonexporter/impl/HttpServletRequestMixin.java | 9 +++++----
.../models/jacksonexporter/impl/JacksonExporter.java | 8 ++++----
.../jacksonexporter/impl/ModelSkippingSerializers.java | 3 ++-
.../jacksonexporter/impl/RequestModuleProvider.java | 15 +++++++--------
.../jacksonexporter/impl/ResourceModuleProvider.java | 8 ++++----
.../jacksonexporter/impl/ResourceSerializer.java | 18 +++++++++---------
.../jacksonexporter/impl/ServletRequestMixin.java | 9 +++++----
.../impl/SlingHttpServletRequestMixin.java | 7 ++++---
.../impl/ModelSkippingSerializersTest.java | 13 +++++++------
11 files changed, 49 insertions(+), 50 deletions(-)
[sling-org-apache-sling-models-jacksonexporter] 01/02: cosmetic: remove unused (and outdated) dependency
Posted by ss...@apache.org.
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
commit f986549e1fe0ac4854893040f61223760872a66e
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 1 20:12:33 2021 +0100
cosmetic: remove unused (and outdated) dependency
---
pom.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index dceab6e..f35563a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,12 +98,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <version>2.6</version>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.4.0</version>
[sling-org-apache-sling-models-jacksonexporter] 02/02: cosmetic: organize imports, remove unused imports
Posted by ss...@apache.org.
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
commit 8fe5f4c39a443f1d1618f00a6863b24792d4c12e
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 1 20:13:32 2021 +0100
cosmetic: organize imports, remove unused imports
---
.../sling/models/jacksonexporter/ModuleProvider.java | 3 ++-
.../jacksonexporter/impl/HttpServletRequestMixin.java | 9 +++++----
.../models/jacksonexporter/impl/JacksonExporter.java | 8 ++++----
.../jacksonexporter/impl/ModelSkippingSerializers.java | 3 ++-
.../jacksonexporter/impl/RequestModuleProvider.java | 15 +++++++--------
.../jacksonexporter/impl/ResourceModuleProvider.java | 8 ++++----
.../jacksonexporter/impl/ResourceSerializer.java | 18 +++++++++---------
.../jacksonexporter/impl/ServletRequestMixin.java | 9 +++++----
.../impl/SlingHttpServletRequestMixin.java | 7 ++++---
.../impl/ModelSkippingSerializersTest.java | 13 +++++++------
10 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/ModuleProvider.java b/src/main/java/org/apache/sling/models/jacksonexporter/ModuleProvider.java
index 01d9b0a..29dd8a8 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/ModuleProvider.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/ModuleProvider.java
@@ -16,9 +16,10 @@
*/
package org.apache.sling.models.jacksonexporter;
-import aQute.bnd.annotation.ConsumerType;
import com.fasterxml.jackson.databind.Module;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Extension interface which allows for plugging in Jackson Modules
* into the Jackson Exporter
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 383ae2a..8c007fe 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
@@ -16,13 +16,14 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonGetter;
+import java.security.Principal;
+import java.util.Enumeration;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
-import java.util.Enumeration;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonGetter;
@JsonAutoDetect(getterVisibility = JsonAutoDetect.Visibility.NONE, fieldVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
public abstract class HttpServletRequestMixin extends ServletRequestMixin implements HttpServletRequest {
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 a4da47e..9bac480 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
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.StringWriter;
import java.util.Map;
-import com.fasterxml.jackson.databind.MapperFeature;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
@@ -32,17 +31,18 @@ import org.apache.sling.commons.osgi.Order;
import org.apache.sling.commons.osgi.RankedServices;
import org.apache.sling.models.export.spi.ModelExporter;
import org.apache.sling.models.factory.ExportException;
+import org.apache.sling.models.jacksonexporter.ModuleProvider;
import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.SerializableString;
import com.fasterxml.jackson.core.io.CharacterEscapes;
+import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import org.apache.sling.models.jacksonexporter.ModuleProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Component
@Service
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 8fe6bc9..1c798b6 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
@@ -16,12 +16,13 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
+import org.apache.sling.models.annotations.Model;
+
import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializationConfig;
import com.fasterxml.jackson.databind.module.SimpleSerializers;
-import org.apache.sling.models.annotations.Model;
public class ModelSkippingSerializers extends SimpleSerializers {
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/RequestModuleProvider.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/RequestModuleProvider.java
index 0ee0d8c..3312058 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/RequestModuleProvider.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/RequestModuleProvider.java
@@ -16,21 +16,20 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
-import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.module.SimpleSerializers;
-import org.apache.felix.scr.annotations.Activate;
+import java.util.Enumeration;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.jacksonexporter.ModuleProvider;
import org.osgi.framework.Constants;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.module.SimpleModule;
@Component
@Service
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceModuleProvider.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceModuleProvider.java
index 343fd37..1027a93 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceModuleProvider.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceModuleProvider.java
@@ -16,9 +16,8 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
-import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.module.SimpleSerializers;
+import java.util.Map;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
@@ -28,7 +27,8 @@ import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.models.jacksonexporter.ModuleProvider;
import org.osgi.framework.Constants;
-import java.util.Map;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.module.SimpleModule;
@Component(metatype = true, label = "Apache Sling Models Jackson Exporter - Resource object support",
description = "Provider of a Jackson Module which enables support for proper serialization of Resource objects")
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 ace84cd..75ea872 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
@@ -16,22 +16,22 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.ResolvableSerializer;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ValueMap;
-
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Array;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Iterator;
import java.util.Map;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ValueMap;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ResolvableSerializer;
+
public class ResourceSerializer extends JsonSerializer<Resource> implements ResolvableSerializer {
private final int maxRecursionLevels;
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 a98c9f7..e2f20b9 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
@@ -16,14 +16,15 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonGetter;
-
-import javax.servlet.ServletRequest;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
+import javax.servlet.ServletRequest;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonGetter;
+
@JsonAutoDetect(getterVisibility = JsonAutoDetect.Visibility.NONE, fieldVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
public abstract class ServletRequestMixin implements ServletRequest {
diff --git a/src/main/java/org/apache/sling/models/jacksonexporter/impl/SlingHttpServletRequestMixin.java b/src/main/java/org/apache/sling/models/jacksonexporter/impl/SlingHttpServletRequestMixin.java
index a4567c4..8535943 100644
--- a/src/main/java/org/apache/sling/models/jacksonexporter/impl/SlingHttpServletRequestMixin.java
+++ b/src/main/java/org/apache/sling/models/jacksonexporter/impl/SlingHttpServletRequestMixin.java
@@ -16,13 +16,14 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonGetter;
+import java.util.Enumeration;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
-import java.util.Enumeration;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonGetter;
@JsonAutoDetect(getterVisibility = JsonAutoDetect.Visibility.NONE, fieldVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
public abstract class SlingHttpServletRequestMixin extends HttpServletRequestMixin implements SlingHttpServletRequest {
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 52fda00..c32c563 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
@@ -16,9 +16,11 @@
*/
package org.apache.sling.models.jacksonexporter.impl;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.Resource;
@@ -28,9 +30,8 @@ import org.apache.sling.models.annotations.Model;
import org.junit.Before;
import org.junit.Test;
-import java.util.Iterator;
-
-import static org.junit.Assert.*;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
public class ModelSkippingSerializersTest {