make the storagePolicyDecisionPoint an optional bean

fcrepo · Apr 29, 2013 · d2d1751 · d2d1751
1 parent a2bc6e8
commit d2d1751
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java
@@ -19,6 +19,7 @@
 import org.fcrepo.utils.DatastreamIterator;
 import org.modeshape.jcr.api.Binary;
 import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Service for creating and retrieving Datastreams without using the JCR API.
@@ -28,7 +29,7 @@
  */
 public class DatastreamService extends RepositoryService {
 
-	@Inject
+	@Autowired(required=false)
 	PolicyDecisionPoint storagePolicyDecisionPoint;
 
     private static final Logger logger = getLogger(DatastreamService.class);
@@ -79,6 +80,12 @@ public Node createDatastreamNode(final Session session,
 		return result;
 	}
 
+	/**
+	 * Pre-create a Binary value to hand off to Datastream
+	 * @param node the JCR node to attach the Binary to
+	 * @param content a binary payload for the Binary
+	 * @return a JCR Binary reference
+	 */
 	private Binary createBinary(final Node node, final InputStream content) {
         /*
          * https://docs.jboss.org/author/display/MODE/Binary+values#Binaryvalues-
@@ -87,11 +94,23 @@ private Binary createBinary(final Node node, final InputStream content) {
          * implement this public interface, so feel free to cast the values to
          * gain access to the additional methods."
          */
-		final Binary binary = (Binary) getBinary(node, content, storagePolicyDecisionPoint.evaluatePolicies(node));
+		final Binary binary = (Binary) getBinary(node, content, getStoragePolicyDecisionPoint().evaluatePolicies(node));
 
 		return binary;
 	}
 
+	/**
+	 * Get the Policy Decision Point for this service. Initialize it if Spring didn't wire it in for us.
+	 * @return a PolicyDecisionPoint
+	 */
+	private PolicyDecisionPoint getStoragePolicyDecisionPoint() {
+		if(storagePolicyDecisionPoint == null) {
+			storagePolicyDecisionPoint = new PolicyDecisionPoint();
+		}
+
+		return storagePolicyDecisionPoint;
+	}
+
 	/**
 	 * retrieve the JCR node for a Datastream by pid and dsid
 	 * @param path

diff --git a/fcrepo-webapp/src/main/resources/spring/repo.xml b/fcrepo-webapp/src/main/resources/spring/repo.xml
@@ -20,6 +20,5 @@
     <bean class="org.fcrepo.services.ObjectService"/>
     <bean class="org.fcrepo.services.DatastreamService"/>
     <bean class="org.fcrepo.services.LowLevelStorageService"/>
-   <bean class="org.fcrepo.binary.PolicyDecisionPoint" />
 
 </beans>