Author: ernst
Date: 2009-06-08 12:37:55 +0200 (Mon, 08 Jun 2009)
New Revision: 35818
Added:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/converters/
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/converters/ToLowercaseConverter.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Image.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/NewsItem.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Tag.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/util/
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/util/Mapper.java
Removed:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Image.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/NewsItem.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Tag.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/converters/
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/util/
Modified:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/DummyQueryHelper.java
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/PopulatorTest.java
Log:
moved some stuff that was in the wrong place
Deleted: speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Image.java
===================================================================
--- speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Image.java
2009-06-08 09:39:46 UTC (rev 35817)
+++ speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Image.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -1,34 +0,0 @@
-package nl.vpro.mmbase;
-
-import nl.vpro.mmbase.vob.annotations.Entity;
-
-...@entity(builder = "images")
-public class Image {
- private Long number;
- private String title;
-
- public Long getNumber() {
- return number;
- }
-
- public void setNumber(Long number) {
- this.number = number;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getUrl() {
- return String.format("http://images.vpro.nl/%d";, number);
- }
-
- @Override
- public String toString() {
- return String.format("Image[%d, %s]", number, title);
- }
-}
Deleted: speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/NewsItem.java
===================================================================
--- speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/NewsItem.java
2009-06-08 09:39:46 UTC (rev 35817)
+++ speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/NewsItem.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -1,117 +0,0 @@
-package nl.vpro.mmbase;
-
-import java.util.Date;
-import java.util.List;
-
-import nl.vpro.mmbase.converters.ToLowercaseConverter;
-import nl.vpro.mmbase.vob.Direction;
-import nl.vpro.mmbase.vob.QueryDirection;
-import nl.vpro.mmbase.vob.annotations.Embedded;
-import nl.vpro.mmbase.vob.annotations.Entity;
-import nl.vpro.mmbase.vob.annotations.Field;
-import nl.vpro.mmbase.vob.annotations.PosRel;
-import nl.vpro.mmbase.vob.annotations.Rel;
-import nl.vpro.mmbase.vob.converters.EpochDateConverter;
-
-...@entity(builder = "news", root=true)
-public class NewsItem {
-
- private Long number;
- private String title;
-
- @Field(convertor = ToLowercaseConverter.class)
- private String subtitle;
-
- private String credits;
-
- @Field(nodeField = "intro")
- private String description;
-
- private String body;
-
- @Embedded(builder = "mmevents", relationRole="posrel", queryDirection =
QueryDirection.BOTH, field = "start", convertor = EpochDateConverter.class)
- private Date created;
-
- @PosRel(orderDirection = Direction.DESC, queryDirection =
QueryDirection.SOURCE)
- private List<Image> images;
-
- @Rel(orderDirection = Direction.DESC, orderField = "value",
queryDirection = QueryDirection.SOURCE)
- private List<Tag> tags;
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Long getNumber() {
- return number;
- }
-
- public void setNumber(Long number) {
- this.number = number;
- }
-
- public String getSubtitle() {
- return subtitle;
- }
-
- public void setSubtitle(String subtitle) {
- this.subtitle = subtitle;
- }
-
- public String getBody() {
- return body;
- }
-
- public void setBody(String body) {
- this.body = body;
- }
-
- public String getCredits() {
- return credits;
- }
-
- public void setCredits(String credits) {
- this.credits = credits;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public List<Image> getImages() {
- return images;
- }
-
- public void setImages(List<Image> images) {
- this.images = images;
- }
-
- public List<Tag> getTags() {
- return tags;
- }
-
- public void setTags(List<Tag> tags) {
- this.tags = tags;
- }
-
- @Override
- public String toString() {
- return String.format("News[%d, %s]", number, title);
- }
-}
Deleted: speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Tag.java
===================================================================
--- speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Tag.java
2009-06-08 09:39:46 UTC (rev 35817)
+++ speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Tag.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -1,30 +0,0 @@
-package nl.vpro.mmbase;
-
-import nl.vpro.mmbase.vob.annotations.Entity;
-
-...@entity(builder = "tags")
-public class Tag {
- private Long number;
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public Long getNumber() {
- return number;
- }
-
- public void setNumber(Long number) {
- this.number = number;
- }
-
- @Override
- public String toString() {
- return String.format("Tag[%d, %s]", number, value);
- }
-}
Modified:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/DummyQueryHelper.java
===================================================================
---
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/DummyQueryHelper.java
2009-06-08 09:39:46 UTC (rev 35817)
+++
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/DummyQueryHelper.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -1,12 +1,12 @@
package nl.vpro.mmbase.vob;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
-import nl.vpro.mmbase.util.Mapper;
+import nl.vpro.mmbase.vob.util.Mapper;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.util.MapNode;
public class DummyQueryHelper implements QueryHelper{
private String path;
Modified:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/PopulatorTest.java
===================================================================
---
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/PopulatorTest.java
2009-06-08 09:39:46 UTC (rev 35817)
+++
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/PopulatorTest.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -5,8 +5,9 @@
import java.util.*;
-import nl.vpro.mmbase.*;
-import nl.vpro.mmbase.util.Mapper;
+import nl.vpro.mmbase.vob.domain.Image;
+import nl.vpro.mmbase.vob.domain.NewsItem;
+import nl.vpro.mmbase.vob.util.Mapper;
import org.junit.Test;
import org.mmbase.bridge.Cloud;
@@ -15,10 +16,12 @@
public class PopulatorTest {
+ private static final String SCAN_CLASSPATH = "nl.vpro.mmbase.vob.domain";
+
@Test
public void testUnmarshallNode() throws IllegalArgumentException,
IllegalAccessException, SecurityException,
NoSuchFieldException {
- Populator populator = new Populator(new NoResultsQueryHelper(),
"nl.vpro");
+ Populator populator = new Populator(new NoResultsQueryHelper(),
SCAN_CLASSPATH);
Node newsItemNode = createDefaultNodeForNewsitem();
NewsItem item = (NewsItem) populator.unmarshallNode(newsItemNode,
"news");
@@ -33,7 +36,7 @@
@Test
public void testFieldConverterOnFieldAnnotation() throws
IllegalArgumentException, IllegalAccessException,
SecurityException, NoSuchFieldException {
- Populator populator = new Populator(new NoResultsQueryHelper(),
"nl.vpro");
+ Populator populator = new Populator(new NoResultsQueryHelper(),
SCAN_CLASSPATH);
MapNode newsItemNode = new Mapper().put("number",
Long.valueOf(1234)).put("subtitle", "Subtitle").getNode();
@@ -52,7 +55,7 @@
.put("number", Long.valueOf(12345))
.put("title", "image title").getNode());
- Populator populator = new Populator(queryHelper, "nl.vpro");
+ Populator populator = new Populator(queryHelper, SCAN_CLASSPATH);
MapNode newsItemNode = new Mapper()
.put("number", Long.valueOf(1234))
.put("title", "title").getNode();
@@ -69,7 +72,7 @@
// @Test
public void testEntityIsRoot(){
- Populator populator = new Populator(null, "nl.vpro");
+ Populator populator = new Populator(null, SCAN_CLASSPATH);
Node node = new Mapper()
.put("number", Long.valueOf(1234))
.getNode();
@@ -86,7 +89,7 @@
.put("mmevents.start",
Long.valueOf(createMyBirthday().getTimeInMillis() / 1000L))
.getNode();
DummyQueryHelper queryHelper = new DummyQueryHelper("mmevents",
"posrel", returnNode);
- Populator populator = new Populator(queryHelper, "nl.vpro");
+ Populator populator = new Populator(queryHelper, SCAN_CLASSPATH);
Node newsNode = createDefaultNodeForNewsitem();
NewsItem item = (NewsItem) populator.unmarshallNode(newsNode, "news");
@@ -131,7 +134,7 @@
//@Test
public void testFindEntityThatEmbeds() {
- Populator populator = new Populator(new DummyQueryHelper("mmevents",
Long.valueOf(12345), "posrel"), "nl.vpro");
+ Populator populator = new Populator(new DummyQueryHelper("mmevents",
Long.valueOf(12345), "posrel"), SCAN_CLASSPATH);
Class<?> c = populator.findEntityThatEmbeds("posrel", "mmevents");
assertEquals(NewsItem.class, c);
Copied:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/converters/ToLowercaseConverter.java
(from rev 35463,
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/converters/ToLowercaseConverter.java)
===================================================================
---
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/converters/ToLowercaseConverter.java
(rev 0)
+++
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/converters/ToLowercaseConverter.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -0,0 +1,11 @@
+package nl.vpro.mmbase.vob.converters;
+
+import org.mmbase.bridge.Node;
+
+public class ToLowercaseConverter implements FieldConverter {
+
+ public Object convert(Node node, String field) {
+ return node.getStringValue(field).toLowerCase();
+ }
+
+}
Property changes on:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/converters/ToLowercaseConverter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Image.java
(from rev 35463,
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Image.java)
===================================================================
---
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Image.java
(rev 0)
+++
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Image.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -0,0 +1,34 @@
+package nl.vpro.mmbase.vob.domain;
+
+import nl.vpro.mmbase.vob.annotations.Entity;
+
+...@entity(builder = "images")
+public class Image {
+ private Long number;
+ private String title;
+
+ public Long getNumber() {
+ return number;
+ }
+
+ public void setNumber(Long number) {
+ this.number = number;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getUrl() {
+ return String.format("http://images.vpro.nl/%d";, number);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("Image[%d, %s]", number, title);
+ }
+}
Property changes on:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Image.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/NewsItem.java
(from rev 35463,
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/NewsItem.java)
===================================================================
---
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/NewsItem.java
(rev 0)
+++
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/NewsItem.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -0,0 +1,113 @@
+package nl.vpro.mmbase.vob.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import nl.vpro.mmbase.vob.Direction;
+import nl.vpro.mmbase.vob.QueryDirection;
+import nl.vpro.mmbase.vob.annotations.*;
+import nl.vpro.mmbase.vob.converters.EpochDateConverter;
+import nl.vpro.mmbase.vob.converters.ToLowercaseConverter;
+
+...@entity(builder = "news", root=true)
+public class NewsItem {
+
+ private Long number;
+ private String title;
+
+ @Field(convertor = ToLowercaseConverter.class)
+ private String subtitle;
+
+ private String credits;
+
+ @Field(nodeField = "intro")
+ private String description;
+
+ private String body;
+
+ @Embedded(builder = "mmevents", relationRole="posrel", queryDirection =
QueryDirection.BOTH, field = "start", convertor = EpochDateConverter.class)
+ private Date created;
+
+ @PosRel(orderDirection = Direction.DESC, queryDirection =
QueryDirection.SOURCE)
+ private List<Image> images;
+
+ @Rel(orderDirection = Direction.DESC, orderField = "value",
queryDirection = QueryDirection.SOURCE)
+ private List<Tag> tags;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Long getNumber() {
+ return number;
+ }
+
+ public void setNumber(Long number) {
+ this.number = number;
+ }
+
+ public String getSubtitle() {
+ return subtitle;
+ }
+
+ public void setSubtitle(String subtitle) {
+ this.subtitle = subtitle;
+ }
+
+ public String getBody() {
+ return body;
+ }
+
+ public void setBody(String body) {
+ this.body = body;
+ }
+
+ public String getCredits() {
+ return credits;
+ }
+
+ public void setCredits(String credits) {
+ this.credits = credits;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public List<Image> getImages() {
+ return images;
+ }
+
+ public void setImages(List<Image> images) {
+ this.images = images;
+ }
+
+ public List<Tag> getTags() {
+ return tags;
+ }
+
+ public void setTags(List<Tag> tags) {
+ this.tags = tags;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("News[%d, %s]", number, title);
+ }
+}
Property changes on:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/NewsItem.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Tag.java
(from rev 35463,
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/Tag.java)
===================================================================
--- speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Tag.java
(rev 0)
+++ speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Tag.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -0,0 +1,30 @@
+package nl.vpro.mmbase.vob.domain;
+
+import nl.vpro.mmbase.vob.annotations.Entity;
+
+...@entity(builder = "tags")
+public class Tag {
+ private Long number;
+ private String value;
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public Long getNumber() {
+ return number;
+ }
+
+ public void setNumber(Long number) {
+ this.number = number;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("Tag[%d, %s]", number, value);
+ }
+}
Property changes on:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/domain/Tag.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/util/Mapper.java
(from rev 35816,
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/util/Mapper.java)
===================================================================
---
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/util/Mapper.java
(rev 0)
+++
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/util/Mapper.java
2009-06-08 10:37:55 UTC (rev 35818)
@@ -0,0 +1,28 @@
+package nl.vpro.mmbase.vob.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.util.MapNode;
+
+public class Mapper {
+ private Map<String, Object> wrapped = new HashMap<String, Object>();
+
+ public Mapper put(String key, Object value) {
+ wrapped.put(key, value);
+ return this;
+ }
+
+ public Map<String, Object> getMap() {
+ return wrapped;
+ }
+
+ public MapNode getNode(){
+ return new MapNode(wrapped, (Cloud)null);
+ }
+
+ public MapNode getNode(Cloud cloud){
+ return new MapNode(wrapped, cloud);
+ }
+}
\ No newline at end of file
Property changes on:
speeltuin/ernst/mmbase-vob/src/test/java/nl/vpro/mmbase/vob/util/Mapper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
