Changeset 4070

Timestamp:

2010-06-09 16:34:25 (3 years ago)

Author:

bruno

Message:

Link value type: use a Link object as value rather than RecordId?. The Link object allows to specify relative links to records, that are to be resolved against the record in which they occur.
There are still some TODO's, especially (de)coding of special/reserved characters in the string representation of the link.

Location:

projects/lily/trunk

Files:

• indexer/src/main/java/org/lilycms/indexer/conf/DerefValue.java (modified) (1 diff)
• indexer/src/test/java/org/lilycms/indexer/test/IndexerTest.java (modified) (8 diffs)
• linkindex/src/main/java/org/lilycms/linkindex/LinkIndexUpdater.java (modified) (1 diff)
• linkindex/src/main/java/org/lilycms/linkindex/RecordLinkExtractor.java (modified) (3 diffs)
• linkindex/src/test/java/org/lilycms/linkindex/test/LinkIndexTest.java (modified) (2 diffs)
• repository-api-tutorial/src/test/java/org/lilycms/repository/api/tutorial/Tutorial.java (modified) (2 diffs)
• repository/api/src/main/java/org/lilycms/repository/api/Link.java (added)
• repository/api/src/main/java/org/lilycms/repository/api/TypeManager.java (modified) (1 diff)
• repository/impl/src/main/java/org/lilycms/repository/impl/AbstractTypeManager.java (modified) (1 diff)
• repository/impl/src/main/java/org/lilycms/repository/impl/primitivevaluetype/LinkValueType.java (modified) (2 diffs)
• repository/impl/src/test/java/org/lilycms/repository/impl/test/LinkTest.java (added)
• repository/impl/src/test/java/org/lilycms/repository/impl/test/ValueTypeTest.java (modified) (2 diffs)

projects/lily/trunk/indexer/src/main/java/org/lilycms/indexer/conf/DerefValue.java

@@ -98 +98 @@
 
             Object value = record.getField(fieldType.getId());
-            if (value instanceof RecordId) {
-                IdRecord linkedRecord = resolveRecordId((RecordId)value, vtag, repository);
+            if (value instanceof Link) {
+                RecordId recordId = ((Link)value).resolve(record, repository.getIdGenerator());
+                IdRecord linkedRecord = resolveRecordId(recordId, vtag, repository);
                 return linkedRecord == null ? null : Collections.singletonList(linkedRecord);
-            } else if (value instanceof List && ((List)value).size() > 0 && ((List)value).get(0) instanceof RecordId) {
+            } else if (value instanceof List && ((List)value).size() > 0 && ((List)value).get(0) instanceof Link) {
                 List list = (List)value;
                 List<IdRecord> result = new ArrayList<IdRecord>(list.size());
-                for (Object recordId : list) {
-                    IdRecord linkedRecord = resolveRecordId((RecordId)recordId, vtag, repository);
+                for (Object link : list) {
+                    RecordId recordId = ((Link)link).resolve(record, repository.getIdGenerator());
+                    IdRecord linkedRecord = resolveRecordId(recordId, vtag, repository);
                     if (linkedRecord != null) {
                         result.add(linkedRecord);

projects/lily/trunk/indexer/src/test/java/org/lilycms/indexer/test/IndexerTest.java

@@ -48 +48 @@
     private static SolrTestingUtility SOLR_TEST_UTIL;
     private static TestLilyQueue queue;
-    private static Repository repository;
+    private static HBaseRepository repository;
     private static TypeManager typeManager;
     private static IdGenerator idGenerator;
@@ -114 +114 @@
     @AfterClass
     public static void tearDownAfterClass() throws Exception {
-        indexer.stop();        
+        indexer.stop();
+        repository.stop();
 
         TEST_UTIL.shutdownMiniCluster();
@@ -303 +304 @@
             Record record2 = repository.newRecord();
             record2.setRecordType("NVRecordType1", null);
-            record2.setField(nvLinkField1.getName(), record1.getId());
+            record2.setField(nvLinkField1.getName(), new Link(record1.getId()));
             record2 = repository.create(record2);
             sendEvent(EVENT_RECORD_CREATED, record2.getId(), nvLinkField1.getId());
@@ -357 +358 @@
             Record record2 = repository.newRecord();
             record2.setRecordType("NVRecordType1", null);
-            record2.setField(nvLinkField1.getName(), record1.getId());
+            record2.setField(nvLinkField1.getName(), new Link(record1.getId()));
             record2.setField(nvfield1.getName(), "mushroom");
             record2 = repository.create(record2);
@@ -514 +515 @@
             Record record2 = repository.newRecord();
             record2.setRecordType("VRecordType1", null);
-            record2.setField(vLinkField1.getName(), record1.getId());
+            record2.setField(vLinkField1.getName(), new Link(record1.getId()));
             record2.setField(liveTag.getName(), Long.valueOf(1));
             record2 = repository.create(record2);
@@ -642 +643 @@
             Record record2 = repository.newRecord();
             record2.setRecordType("VRecordType1", null);
-            record2.setField(nvLinkField2.getName(), record1.getId());
+            record2.setField(nvLinkField2.getName(), new Link(record1.getId()));
             record2 = repository.create(record2);
             sendEvent(EVENT_RECORD_CREATED, record2.getId(), nvLinkField2.getId());
@@ -707 +708 @@
             Record record2 = repository.newRecord();
             record2.setRecordType("VRecordType1", null);
-            record2.setField(vLinkField1.getName(), record1.getId());
+            record2.setField(vLinkField1.getName(), new Link(record1.getId()));
             record2.setField(liveTag.getName(), 1L);
             record2 = repository.create(record2);
@@ -714 +715 @@
             Record record3 = repository.newRecord();
             record3.setRecordType("VRecordType1", null);
-            record3.setField(nvLinkField2.getName(), record2.getId());
+            record3.setField(nvLinkField2.getName(), new Link(record2.getId()));
             record3 = repository.create(record3);
             sendEvent(EVENT_RECORD_CREATED, record3.getId(), (Long)null, null, nvLinkField2.getId());

projects/lily/trunk/linkindex/src/main/java/org/lilycms/linkindex/LinkIndexUpdater.java

@@ -180 +180 @@
             } else {
                 LinkCollector collector = new LinkCollector();
-                RecordLinkExtractor.extract(versionRecord, collector, typeManager);
+                RecordLinkExtractor.extract(versionRecord, collector, repository);
                 links = collector.getLinks();
             }

projects/lily/trunk/linkindex/src/main/java/org/lilycms/linkindex/RecordLinkExtractor.java

@@ -13 +13 @@
      * be "fully loaded" (= contain all fields).
      */
-    public static void extract(IdRecord record, LinkCollector collector, TypeManager typeManager) throws RepositoryException {
+    public static void extract(IdRecord record, LinkCollector collector, Repository repository) throws RepositoryException {
         for (Map.Entry<String, Object> field : record.getFieldsById().entrySet()) {
             FieldType fieldType;
             try {
-                fieldType = typeManager.getFieldTypeById(field.getKey());
+                fieldType = repository.getTypeManager().getFieldTypeById(field.getKey());
             } catch (FieldTypeNotFoundException e) {
                 // Can not do anything with a field if we cannot load its type
@@ -26 +26 @@
 
             if (valueType.getPrimitive().getName().equals("LINK")) {
-                extract(value, collector, fieldType.getId());
+                extract(value, collector, fieldType.getId(), record.getId(), repository.getIdGenerator());
             } else if (valueType.getPrimitive().getName().equals("BLOB")) {
                 // TODO implement link extraction from blob fields
@@ -33 +33 @@
     }
 
-    private static void extract(Object value, LinkCollector collector, String fieldTypeId) {
+    private static void extract(Object value, LinkCollector collector, String fieldTypeId, RecordId ctx,
+            IdGenerator idGenerator) {
         if (value instanceof List) {
             List list = (List)value;
             for (Object item : list) {
-                extract(item, collector, fieldTypeId);
+                extract(item, collector, fieldTypeId, ctx, idGenerator);
             }
         } else if (value instanceof HierarchyPath) {
             HierarchyPath path = (HierarchyPath)value;
             for (Object item : path.getElements()) {
-                extract(item, collector, fieldTypeId);
+                extract(item, collector, fieldTypeId, ctx, idGenerator);
             }
-        } else if (value instanceof RecordId) {
-            collector.addLink((RecordId)value, fieldTypeId);
+        } else if (value instanceof Link) {
+            RecordId recordId = ((Link)value).resolve(ctx, idGenerator);
+            collector.addLink(recordId, fieldTypeId);
         } else {
-            throw new RuntimeException("Encountered an unexpected kind of object from a link field: " + value.getClass().getName());
+            throw new RuntimeException("Encountered an unexpected kind of object from a link field: " +
+                    value.getClass().getName());
         }
     }

projects/lily/trunk/linkindex/src/test/java/org/lilycms/linkindex/test/LinkIndexTest.java

@@ -141 +141 @@
             Record record = repository.newRecord();
             record.setRecordType(recordType.getId(), null);
-            record.setField(nonVersionedFt.getName(), ids.newRecordId("foo1"));
+            record.setField(nonVersionedFt.getName(), new Link(ids.newRecordId("foo1")));
             record = repository.create(record);
 
@@ -157 +157 @@
 
             // Now perform an update so that there is a version
-            record.setField(versionedFt.getName(), Arrays.asList(ids.newRecordId("foo2"), ids.newRecordId("foo3")));
+            record.setField(versionedFt.getName(), Arrays.asList(new Link(ids.newRecordId("foo2")), new Link(ids.newRecordId("foo3"))));
             record = repository.update(record);
 

projects/lily/trunk/repository-api-tutorial/src/test/java/org/lilycms/repository/api/tutorial/Tutorial.java

@@ -16 +16 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.lilycms.repository.api.Blob;
-import org.lilycms.repository.api.FieldType;
-import org.lilycms.repository.api.IdGenerator;
-import org.lilycms.repository.api.QName;
-import org.lilycms.repository.api.Record;
-import org.lilycms.repository.api.RecordId;
-import org.lilycms.repository.api.RecordType;
-import org.lilycms.repository.api.Repository;
-import org.lilycms.repository.api.Scope;
-import org.lilycms.repository.api.TypeManager;
-import org.lilycms.repository.api.ValueType;
+import org.lilycms.repository.api.*;
 import org.lilycms.repository.impl.DFSBlobStoreAccess;
 import org.lilycms.repository.impl.HBaseRepository;
@@ -299 +289 @@
         record2.setRecordType("Book", null);
         record2.setField(new QName(NS, "title"), "Fishing 2");
-        record2.setField(new QName(NS, "sequel_to"), record1.getId());
+        record2.setField(new QName(NS, "sequel_to"), new Link(record1.getId()));
         record2 = repository.create(record2);
 
         // (3)
-        RecordId sequelTo = (RecordId)record2.getField(new QName(NS, "sequel_to"));
+        Link sequelToLink = (Link)record2.getField(new QName(NS, "sequel_to"));
+        RecordId sequelTo = sequelToLink.resolve(record2.getId(), repository.getIdGenerator());
         Record linkedRecord = repository.read(sequelTo);
         System.out.println(linkedRecord.getField(new QName(NS, "title")));

projects/lily/trunk/repository/api/src/main/java/org/lilycms/repository/api/TypeManager.java

@@ -162 +162 @@
      * <tr><td>LONG</td>     <td>java.lang.Long</td></tr>
      * <tr><td>BOOLEAN</td>  <td>java.lang.Boolean</td></tr>
-     * <tr><td>DATE</td>     <td>java.util.Date</td></tr>
+     * <tr><td>DATE</td>     <td>org.joda.time.LocalDate</td></tr>
+     * <tr><td>DATETIME</td> <td>org.joda.time.DateTime</td></tr>
      * <tr><td>BLOB</td>     <td>org.lilycms.repository.api.Blob</td></tr>
-     * <tr><td>LINK</td>     <td>org.lilycms.repository.api.RecordId</td></tr>
+     * <tr><td>LINK</td>     <td>org.lilycms.repository.api.Link</td></tr>
      * </tbody>
      * </table>

projects/lily/trunk/repository/impl/src/main/java/org/lilycms/repository/impl/AbstractTypeManager.java

@@ -57 +57 @@
     // TODO get this from some configuration file
     protected void registerDefaultValueTypes() {
+        //
+        // Important:
+        //
+        // When adding a type below, please update the list of built-in
+        // types in the javadoc of the method TypeManager.getValueType.
+        //
+
         registerPrimitiveValueType(new StringValueType());
         registerPrimitiveValueType(new IntegerValueType());

projects/lily/trunk/repository/impl/src/main/java/org/lilycms/repository/impl/primitivevaluetype/LinkValueType.java

@@ -17 +17 @@
 
 import org.lilycms.repository.api.IdGenerator;
+import org.lilycms.repository.api.Link;
 import org.lilycms.repository.api.PrimitiveValueType;
 import org.lilycms.repository.api.RecordId;
@@ -37 +38 @@
     }
 
-    public RecordId fromBytes(byte[] bytes) {
-        return idGenerator.fromBytes(bytes);
+    public Link fromBytes(byte[] bytes) {
+        return Link.fromBytes(bytes, idGenerator);
     }
 
     public byte[] toBytes(Object value) {
-        return ((RecordId)value).toBytes();
+        return ((Link)value).toBytes();
     }
 

projects/lily/trunk/repository/impl/src/test/java/org/lilycms/repository/impl/test/ValueTypeTest.java

@@ -29 +29 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.lilycms.repository.api.Blob;
-import org.lilycms.repository.api.BlobStoreAccessFactory;
-import org.lilycms.repository.api.FieldType;
-import org.lilycms.repository.api.HierarchyPath;
-import org.lilycms.repository.api.PrimitiveValueType;
-import org.lilycms.repository.api.QName;
-import org.lilycms.repository.api.Record;
-import org.lilycms.repository.api.RecordType;
-import org.lilycms.repository.api.Scope;
+import org.lilycms.repository.api.*;
 import org.lilycms.repository.impl.AbstractTypeManager;
 import org.lilycms.repository.impl.DFSBlobStoreAccess;
@@ -117 +109 @@
     @Test
     public void testLinkType() throws Exception {
-        runValueTypeTests("linkRecordTypeId", "LINK", idGenerator.newRecordId(), idGenerator.newRecordId(), idGenerator.newRecordId());
+        runValueTypeTests("linkRecordTypeId", "LINK", new Link(idGenerator.newRecordId()), new Link(idGenerator.newRecordId()), new Link(idGenerator.newRecordId()));
     }