This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.models.jacksonexporter-1.0.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-jacksonexporter.git
commit 251763cbb8d669f7ac34cf7833e7a95ad55f9c83 Author: Justin Edelson <[email protected]> AuthorDate: Wed Nov 30 20:36:22 2016 +0000 code cleanup git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/jackson-exporter@1772112 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/models/jacksonexporter/impl/JacksonExporter.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 8c149ad..d6dd2c6 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 @@ -23,7 +23,6 @@ import java.io.StringWriter; import java.util.Map; import com.fasterxml.jackson.databind.MapperFeature; -import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; @@ -41,8 +40,6 @@ import com.fasterxml.jackson.core.io.CharacterEscapes; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import org.apache.sling.models.jacksonexporter.ModuleProvider; -import org.apache.sling.models.spi.Injector; -import org.apache.sling.models.spi.injectorspecific.InjectAnnotationProcessorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,15 +61,15 @@ public class JacksonExporter implements ModelExporter { @Reference(name = "moduleProvider", referenceInterface = ModuleProvider.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC) - private final @Nonnull RankedServices<ModuleProvider> moduleProviders = new RankedServices<ModuleProvider>(Order.ASCENDING); + private final RankedServices<ModuleProvider> moduleProviders = new RankedServices<ModuleProvider>(Order.ASCENDING); @Override - public boolean isSupported(Class<?> clazz) { + public boolean isSupported(@Nonnull Class<?> clazz) { return clazz.equals(String.class) || clazz.equals(Map.class); } @Override - public <T> T export(Object model, Class<T> clazz, Map<String, String> options) + public <T> T export(@Nonnull Object model, @Nonnull Class<T> clazz, @Nonnull Map<String, String> options) throws ExportException { ObjectMapper mapper = new ObjectMapper(); for (Map.Entry<String, String> optionEntry : options.entrySet()) { @@ -137,14 +134,14 @@ public class JacksonExporter implements ModelExporter { } @Override - public String getName() { + public @Nonnull String getName() { return "jackson"; } private static class EscapeCloseScriptBlocks extends CharacterEscapes { private final int[] escapes; - public EscapeCloseScriptBlocks() { + EscapeCloseScriptBlocks() { int[] baseEscapes = standardAsciiEscapesForJSON(); baseEscapes['<'] = CharacterEscapes.ESCAPE_STANDARD; baseEscapes['>'] = CharacterEscapes.ESCAPE_STANDARD; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
