Changeset 5730
- Timestamp:
- 10/17/14 09:33:48 (10 years ago)
- Location:
- VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0
- Property svn:mergeinfo changed
/VirtualCollectionRegistry/trunk/VirtualCollectionRegistry merged: 5708-5709
- Property svn:mergeinfo changed
-
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java
r5494 r5730 152 152 private String reproducibilityNotice; 153 153 154 @ElementCollection 154 @ElementCollection(fetch = FetchType.EAGER) 155 155 @CollectionTable(name = "keyword", 156 156 joinColumns = @JoinColumn(name="vc_id")) -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualColletionRegistryOAIRepository.java
r5427 r5730 17 17 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection_; 18 18 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionCMDIWriter; 19 19 20 import java.util.ArrayList; 20 21 import java.util.Date; … … 22 23 import java.util.List; 23 24 import java.util.Set; 25 24 26 import javax.persistence.EntityManager; 25 27 import javax.persistence.LockModeType; … … 32 34 import javax.xml.stream.XMLStreamException; 33 35 import javax.xml.stream.XMLStreamWriter; 36 34 37 import org.slf4j.Logger; 35 38 import org.slf4j.LoggerFactory; 36 39 import org.springframework.beans.factory.annotation.Autowired; 37 40 import org.springframework.stereotype.Component; 41 42 @Component //TODO: Check if this annotation is needed... it shouldn't be. See https://trac.clarin.eu/ticket/658 38 43 public class VirtualColletionRegistryOAIRepository implements Repository { 39 44 45 private static final Logger logger 46 = LoggerFactory.getLogger(VirtualColletionRegistryOAIRepository.class); 47 private VirtualCollectionRegistry registry; 40 48 @Autowired 41 49 private VirtualCollectionCMDIWriter cmdiWriter; … … 43 51 private DataStore dataStore; 44 52 45 private static final Logger logger46 = LoggerFactory.getLogger(VirtualColletionRegistryOAIRepository.class);47 48 53 private class CMDIMetadataFormat implements MetadataFormat { 49 54 … … 77 82 } // class CMDIMetadataFormat 78 83 79 private final VirtualCollectionRegistry registry;80 81 84 @Autowired 82 85 VirtualColletionRegistryOAIRepository(VirtualCollectionRegistry registry) { 86 if (registry == null) { 87 throw new NullPointerException("internal error: registry == null"); 88 } 83 89 this.registry = registry; 90 logger.info("VirtualColletionRegistryOAIRepository (hash {}) has been constructed with VCR (hash {})", hashCode(), registry.hashCode()); 84 91 } 85 92
Note: See TracChangeset
for help on using the changeset viewer.