More Sonar medicine

fcrepo · Apr 21, 2013 · 6e4f4d3 · 6e4f4d3
1 parent 853bad8
commit 6e4f4d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/ObjectRdfGenerator.java b/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/ObjectRdfGenerator.java
@@ -3,6 +3,7 @@
 
 import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
 import static javax.ws.rs.core.MediaType.TEXT_XML;
+import static org.slf4j.LoggerFactory.getLogger;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,20 +30,18 @@
 import org.openrdf.model.ValueFactory;
 import org.openrdf.sail.memory.model.MemValueFactory;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component
 @Path("/rest/objects/{pid}/rdf")
 @Produces({TEXT_XML, "text/turtle", TEXT_PLAIN})
 public class ObjectRdfGenerator extends AbstractResource {
 
-    List<TripleSource<FedoraObject>> objectGenerators;
+    private List<TripleSource<FedoraObject>> objectGenerators;
 
-    final private static ValueFactory valFactory = new MemValueFactory();
+    private static final ValueFactory valFactory = new MemValueFactory();
 
-    final private Logger logger = LoggerFactory
-            .getLogger(ObjectRdfGenerator.class);
+    private static final Logger logger = getLogger(ObjectRdfGenerator.class);
 
     @GET
     @Path("/")

diff --git a/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/rdf/DefaultDatastreamGenerator.java b/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/rdf/DefaultDatastreamGenerator.java
@@ -4,6 +4,7 @@
 import static com.google.common.collect.ImmutableList.copyOf;
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Lists.transform;
+import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.List;
 
@@ -14,20 +15,18 @@
 
 import org.fcrepo.Datastream;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 
 public class DefaultDatastreamGenerator implements TripleSource<Datastream> {
 
-    final private static PropertiesGenerator propertiesGenerator =
+    private static final PropertiesGenerator propertiesGenerator =
             new PropertiesGenerator();
 
-    final private static NodeTypesGenerator nodeTypesGenerator =
+    private static final NodeTypesGenerator nodeTypesGenerator =
             new NodeTypesGenerator();
 
-    final private Logger logger = LoggerFactory
-            .getLogger(DefaultDatastreamGenerator.class);
+    private static final Logger logger =
+            getLogger(DefaultDatastreamGenerator.class);
 
     @Override
     public List<Triple> getTriples(final Datastream ds,

diff --git a/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/rdf/TripleSource.java b/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/rdf/TripleSource.java
@@ -27,7 +27,7 @@ List<Triple> getTriples(final T source, final UriInfo... uriInfo)
      * @author ajs6f
      *
      */
-    public static class Triple {
+    static class Triple {
 
         public Triple(final String s, final String p, final String o) {
             subject = s;