Changeset 5730

Timestamp:

10/17/14 09:33:48 (10 years ago)

Author:

Twan Goosen

Message:

Merged Oliver's fixes from trunk to 1.0 branch (tested and working locally)

Location:

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0

Files:

• . (modified) (1 prop)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualColletionRegistryOAIRepository.java (modified) (5 diffs)

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java

@@ -152 +152 @@
     private String reproducibilityNotice;
 
-    @ElementCollection
+    @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "keyword",
                      joinColumns = @JoinColumn(name="vc_id"))

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualColletionRegistryOAIRepository.java

@@ -17 +17 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection_;
 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionCMDIWriter;
+
 import java.util.ArrayList;
 import java.util.Date;
@@ -22 +23 @@
 import java.util.List;
 import java.util.Set;
+
 import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
@@ -32 +34 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
+import org.springframework.stereotype.Component;
+
+@Component //TODO: Check if this annotation is needed... it shouldn't be. See https://trac.clarin.eu/ticket/658
 public class VirtualColletionRegistryOAIRepository implements Repository {
 
+    private static final Logger logger
+            = LoggerFactory.getLogger(VirtualColletionRegistryOAIRepository.class);
+    private VirtualCollectionRegistry registry;
     @Autowired
     private VirtualCollectionCMDIWriter cmdiWriter;
@@ -43 +51 @@
     private DataStore dataStore;
 
-    private static final Logger logger
-            = LoggerFactory.getLogger(VirtualColletionRegistryOAIRepository.class);
-
     private class CMDIMetadataFormat implements MetadataFormat {
 
@@ -77 +82 @@
     } // class CMDIMetadataFormat
 
-    private final VirtualCollectionRegistry registry;
-
     @Autowired
     VirtualColletionRegistryOAIRepository(VirtualCollectionRegistry registry) {
+        if (registry == null) {
+            throw new NullPointerException("internal error: registry == null");
+        }
         this.registry = registry;
+        logger.info("VirtualColletionRegistryOAIRepository (hash {}) has been constructed with VCR (hash {})", hashCode(), registry.hashCode());
     }