Cleans up some more FindBugs warnings

fcrepo · Apr 13, 2013 · 75029b1 · 75029b1
1 parent f7e391b
commit 75029b1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 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
@@ -8,7 +8,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import javax.inject.Inject;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.RepositoryException;
 import javax.ws.rs.DefaultValue;
@@ -26,7 +25,6 @@
 import org.fcrepo.generator.rdf.TripleSource;
 import org.fcrepo.generator.rdf.TripleSource.Triple;
 import org.fcrepo.generator.rdf.Utils;
-import org.fcrepo.services.ObjectService;
 import org.openrdf.model.URI;
 import org.openrdf.model.ValueFactory;
 import org.openrdf.sail.memory.model.MemValueFactory;
@@ -38,9 +36,6 @@
 public class ObjectRdfGenerator extends AbstractResource {
 
     List<TripleSource<FedoraObject>> objectGenerators;
-
-    @Inject
-    ObjectService objectService;
 
     final private static ValueFactory valFactory = new MemValueFactory();
 

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
@@ -44,6 +44,9 @@ public List<Triple> getTriples(final Datastream ds,
 
                     @Override
                     public Triple apply(Triple t) {
+                        if (t == null) {
+                            return null;
+                        }
                         try {
                             return new Triple(uriInfo.getBaseUriBuilder().path(
                                     "objects").path(ds.getObject().getName())

diff --git a/...po-generator-rdf/src/main/java/org/fcrepo/generator/rdf/DefaultFedoraObjectGenerator.java b/...po-generator-rdf/src/main/java/org/fcrepo/generator/rdf/DefaultFedoraObjectGenerator.java
@@ -44,6 +44,9 @@ public List<org.fcrepo.generator.rdf.TripleSource.Triple> getTriples(
 
                     @Override
                     public Triple apply(Triple t) {
+                        if (t == null) {
+                            return null;
+                        }
                         return new Triple(uriInfo.getBaseUriBuilder().path(
                                 t.subject).build().toString(), t.predicate,
                                 t.object);

diff --git a/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/rdf/PropertiesGenerator.java b/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/rdf/PropertiesGenerator.java
@@ -54,6 +54,9 @@ public List<Triple> getTriples(final Node source, final UriInfo... uriInfo)
 
                 @Override
                 public Triple apply(Property p) {
+                    if (p == null) {
+                        return null;
+                    }
                     try {
                         return new Triple(
                                 p.getParent().getPath(),
@@ -72,6 +75,9 @@ public Triple apply(Property p) {
 
                 @Override
                 public List<Triple> apply(Property p) {
+                    if (p == null) {
+                        return null;
+                    }
                     final Builder<Triple> triples = builder();
                     try {
                         for (Value v : p.getValues()) {
@@ -101,7 +107,7 @@ private static String expandJCRNamespace(final String name,
         @Override
         public boolean apply(Property p) {
             try {
-                return p.isMultiple();
+                return p == null ? false : p.isMultiple();
             } catch (RepositoryException e) {
                 throw new RuntimeException(e);
             }