You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2016/11/30 20:36:22 UTC
svn commit: r1772112 -
/sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java
Author: justin
Date: Wed Nov 30 20:36:22 2016
New Revision: 1772112
URL: http://svn.apache.org/viewvc?rev=1772112&view=rev
Log:
code cleanup
Modified:
sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java
Modified: sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java?rev=1772112&r1=1772111&r2=1772112&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java (original)
+++ sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/JacksonExporter.java Wed Nov 30 20:36:22 2016
@@ -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.Cha
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
@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
}
@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;