mappum 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/java-api/pom.xml

@@ -8,7 +8,7 @@
   <groupId>pl.ivmx.mappum</groupId>
   <artifactId>mappum-core</artifactId>
   <packaging>jar</packaging>
-  <version>0.2.0</version>
+  <version>0.3.0b2</version>
   <name>Mappum Java API</name>
 
   <properties>

data/java-api/src/main/java/pl/ivmx/mappum/JavaMappumException.java

@@ -0,0 +1,151 @@
+/**
+ * 
+ */
+package pl.ivmx.mappum;
+
+import java.util.List;
+
+import org.jruby.RubyException;
+import org.jruby.exceptions.RaiseException;
+
+/**
+ * @author Jan Topinski (jtopinski@ivmx.pl)
+ *
+ */
+public class JavaMappumException extends RuntimeException {
+
+  /**
+   * 
+   */
+  public JavaMappumException() {
+    super();
+  }
+  /**
+   * @param arg0
+   * @param arg1
+   */
+  public JavaMappumException(String arg0, RubyException arg1) {
+    super(arg0, new RaiseException(arg1));
+  }
+  /**
+   * @param arg0
+   * @param arg1
+   */
+  public JavaMappumException(String arg0, Throwable arg1) {
+    super(arg0, arg1);
+  }
+  /**
+   * @param arg0
+   */
+  public JavaMappumException(String arg0) {
+    super(arg0);
+  }
+  /**
+   * @param arg0
+   */
+  public JavaMappumException(Throwable arg0) {
+    super(arg0);
+  }
+  /**
+   * @param arg0
+   */
+  public JavaMappumException(RubyException arg0) {
+    super(new RaiseException(arg0));
+  }
+  private static final long serialVersionUID = 1L;
+
+  private String fromName;
+  private String toName;
+  private Object from;
+  private Object to;
+  private Object fromRoot;
+  private Object toRoot;
+  private List<String> mappumBacktrace;
+  /**
+   * 
+   * 
+   * @return the fromName
+   */
+  public String getFromName() {
+    return fromName;
+  }
+  /**
+   * @param fromName the fromName to set
+   */
+  public void setFromName(String fromName) {
+    this.fromName = fromName;
+  }
+  /**
+   * @return the toName
+   */
+  public String getToName() {
+    return toName;
+  }
+  /**
+   * @param toName the toName to set
+   */
+  public void setToName(String toName) {
+    this.toName = toName;
+  }
+  /**
+   * @return the from
+   */
+  public Object getFrom() {
+    return from;
+  }
+  /**
+   * @param from the from to set
+   */
+  public void setFrom(Object from) {
+    this.from = from;
+  }
+  /**
+   * @return the to
+   */
+  public Object getTo() {
+    return to;
+  }
+  /**
+   * @param to the to to set
+   */
+  public void setTo(Object to) {
+    this.to = to;
+  }
+  /**
+   * @return the fromRoot
+   */
+  public Object getFromRoot() {
+    return fromRoot;
+  }
+  /**
+   * @param fromRoot the fromRoot to set
+   */
+  public void setFromRoot(Object fromRoot) {
+    this.fromRoot = fromRoot;
+  }
+  /**
+   * @return the toRoot
+   */
+  public Object getToRoot() {
+    return toRoot;
+  }
+  /**
+   * @param toRoot the toRoot to set
+   */
+  public void setToRoot(Object toRoot) {
+    this.toRoot = toRoot;
+  }
+  /**
+   * @return the mappumBacktrace
+   */
+  public List<String> getMappumBacktrace() {
+    return mappumBacktrace;
+  }
+  /**
+   * @param mappumBacktrace the mappumBacktrace to set
+   */
+  public void setMappumBacktrace(List<String> mappumBacktrace) {
+    this.mappumBacktrace = mappumBacktrace;
+  }
+
+}

data/java-api/src/main/java/pl/ivmx/mappum/JavaTransform.java

@@ -1,12 +1,44 @@
 package pl.ivmx.mappum;
 
+import java.util.Map;
+
 public interface JavaTransform {
   /**
    * Transforms Pojo (plain old java bean)
    * @param from
-   * @return
+   * @return transformed object
    */
-  public Object transform(Object from, String map, Object to);
-  public Object transform(Object from, String map);
   public Object transform(Object from);
-}
+  /**
+   * Transforms Pojo (plain old java bean)
+   * @param from
+   * @param map name of map to use
+   * @return transformed object
+   */
+  public Object transform(Object from, String map);
+    /**
+   * Transforms Pojo (plain old java bean)
+   * @param from
+   * @param map name of map to use
+   * @param to object to change
+   * @return transformed object
+   */
+  public Object transform(Object from, String map, Object to);
+  /**
+   * Transforms Pojo (plain old java bean)
+   * @param from
+   * @param map name of map to use
+   * @param to object to change
+   * @param map of options for now use "context" to store context
+   * @return transformed object
+   */
+  public Object transform(Object from, String map, Object to, Map options);
+  
+  /**
+   * Transforms Pojo (plain old java bean)
+   * @param from
+   * @param map of options for now use "context" to store context
+   * @return transformed object
+   */
+  public Object transform(Object from, Map options);
+}

data/java-api/src/main/java/pl/ivmx/mappum/TreeElement.java

@@ -9,7 +9,7 @@ import java.util.List;
  * @author Jan Topinski (jtopinski@ivmx.pl)
  *
  */
-public interface TreeElement {
+public interface TreeElement extends Comparable<TreeElement>{
   public String getName();
   public void setName(String name);
   public List<TreeElement> getElements();

data/java-api/src/test/java/iv/Client.java

@@ -1,6 +1,8 @@
 package iv;
 
 import java.util.Date;
+import java.util.Set;
+import java.util.HashMap;
 
 public class Client {
   
@@ -71,12 +73,12 @@ public class Client {
   private String surname;
   private String sexId;
   private String[] phones;
-  private String[] emails;
+  private HashMap emails;
   private String mainPhone;
   private String mainPhoneType;
   private Address address;
   private String orderBy;
-  private NameType[] partners;
+  private Set<NameType> partners;
   private Date updated;
 
   public Date getUpdated() {
@@ -92,11 +94,11 @@ public class Client {
   public void setOrderBy(String orderBy) {
     this.orderBy = orderBy;
   }
-  public NameType[] getPartners() {
+  public Set<NameType> getPartners() {
     return partners;
   }
 
-  public void setPartners(NameType[] partners) {
+  public void setPartners(Set<NameType> partners) {
     this.partners = partners;
   }
   /**
@@ -186,13 +188,13 @@ public class Client {
   /**
    * @return the emails
    */
-  public String[] getEmails() {
+  public HashMap getEmails() {
     return emails;
   }
   /**
    * @param emails the emails to set
    */
-  public void setEmails(String[] emails) {
+  public void setEmails(HashMap emails) {
     this.emails = emails;
   }
   /**

data/java-api/src/test/java/pl/ivmx/mappum/MappumTest.java

@@ -6,6 +6,8 @@ package pl.ivmx.mappum;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import iv.Client;
 import iv.Person;
@@ -16,7 +18,15 @@ import junit.framework.TestCase;
  *
  */
 public class MappumTest extends TestCase {
-
+   class Context {
+      Map properties;
+      public Map getProperties() {
+        return properties;
+      }
+      public void setProperties(Map properties) {
+        this.properties = properties;
+      }
+   }
   /* (non-Javadoc)
    * @see junit.framework.TestCase#setUp()
    */
@@ -33,10 +43,62 @@ public class MappumTest extends TestCase {
     assertEquals(null,treeElement.getClazz());
     assertEquals("Client",treeElement.getName());
     assertEquals(false,treeElement.getIsArray());
-    assertEquals(10,treeElement.getElements().size());
+    assertEquals(11,treeElement.getElements().size());
     wl.cleanup();
   }
+  
+  public void testError(){
+    MappumApi mp = new MappumApi();
+    mp.loadMaps();
+    JavaTransform jt = mp.getJavaTransform("Error");
+
+    Person per = newPerson();
+    try {
+      jt.transform(per);     
+      fail("Exception shall be thrown");
+    } catch (JavaMappumException e) {
+      assertTrue(e.getMappumBacktrace().get(0).indexOf("error_map.rb:") > -1);
+      assertEquals("/address/wrong", e.getFromName());
+      assertEquals("/address/name", e.getToName());
+
+      assertEquals(per.getAddress(), e.getFrom());
+      assertEquals(null, e.getTo());
+      //FIXME
+      //assertEquals(per, e.getFromRoot());
+      assertEquals(null, e.getToRoot());
+      
+    }
+    
+  }
+  
+  public void testContext(){
+    MappumApi mp = new MappumApi();
+    mp.loadMaps();
+    JavaTransform jt = mp.getJavaTransform();
 
+    Person per = newPerson();
+    Client cli = null;
+    Person person = null;
+   
+    HashMap<String, String> props = new HashMap<String, String>();
+    props.put("Title", "Sir");
+    Context context = new Context();
+    context.setProperties(props);
+    HashMap<String, Object> options = new HashMap<String, Object>();
+    options.put("context", context);
+   
+    cli = (Client) jt.transform(per, options);     
+    person = (Person) jt.transform(cli, options);
+
+    assertEquals("2",cli.getSexId());
+    assertEquals("Skoryski",cli.getSurname());
+    assertEquals("M",person.getSex());
+    assertEquals("Skory",person.getName());
+    assertEquals("sir",person.getTitle());
+    assertEquals("Skoryski",context.getProperties().get("Name"));
+    
+  }
+  
   public void testTransform(){
     MappumApi mp = new MappumApi();
     mp.loadMaps();
@@ -46,10 +108,18 @@ public class MappumTest extends TestCase {
     Client cli = null;
     Person person = null;
     
+    HashMap<String, String> props = new HashMap<String, String>();
+    props.put("Title", "Sir");
+    Context context = new Context();
+    context.setProperties(props);
+    HashMap<String, Object> options = new HashMap<String, Object>();
+    options.put("context", context);
+    
     long time = System.currentTimeMillis();
     for (int i = 0; i < 200; i++) {
-      cli = (Client) jt.transform(per);     
-      person = (Person) jt.transform(cli);
+
+      cli = (Client) jt.transform(per, options);     
+      person = (Person) jt.transform(cli, options);
     }
     time = System.currentTimeMillis()-time;
     System.out.println(time);
@@ -58,6 +128,8 @@ public class MappumTest extends TestCase {
     assertEquals("M",person.getSex());
     assertEquals("Skory",person.getName());
   }
+
+
   /**
    * @return
    */
@@ -94,11 +166,17 @@ public class MappumTest extends TestCase {
     Runnable  task = new Runnable(){
       
       public void run() {
+        HashMap<String, String> props = new HashMap<String, String>();
+        props.put("Title", "Sir");
+        Context context = new Context();
+        context.setProperties(props);
+        HashMap<String, Object> options = new HashMap<String, Object>();
+        options.put("context", context);
         
         Person per = newPerson();
         for (int j = 0; j < loops; j++) {
-          Client cli = (Client) jt.transform(per); 
-          Person person = (Person) jt.transform(cli);
+          Client cli = (Client) jt.transform(per, options); 
+          Person person = (Person) jt.transform(cli, options);
         }
       }
       

data/java-api/src/test/resources/map/error_map.rb

@@ -0,0 +1,17 @@
+# Example of map for given object domains CRM and ERP
+require 'mappum'
+require 'java'
+import 'iv.Client'
+import 'iv.Person'
+require 'date'
+
+Mappum.catalogue_add "Error" do
+
+  map Person,Client do |p, c|
+    #submaps
+    map p.address(Person::Address) <=> c.address(Client::Address) do |a, b|
+      map a.wrong <=> b.name
+    end
+      
+  end
+end

data/java-api/src/test/resources/map/example_map.rb

@@ -10,8 +10,10 @@ Mappum.catalogue_add do
   map Person,Client do |p, c|
 
     #simple mapping
-    map p.title <=> c.title
+    map p.title <=> context.properties["Title"]
 
+    map context.properties["Name"] <<  c.surname
+    
     #map with simple function call
     map p.person_id << c.cid.downcase
     map p.person_id.upcase >> c.cid
@@ -41,11 +43,11 @@ Mappum.catalogue_add do
     map p.email2 <=> c.emails[1]
     map p.email3 <=> c.emails[2]
     
-    map p.spouse(Person) <=> c.partners(Client::NameType)[0] do |ps,cp|
+    map p.spouse(Person) <=> c.partners(Client::NameType).find{|cp|cp.type == "Wife"} do |ps,cp|
       map ps.name <=> cp.name
       "Wife" >> cp.type
     end
-    map p.spouse(Person) <=> c.partners(Client::NameType)[1] do |ps,cp|
+    map p.spouse(Person) <=> c.partners(Client::NameType).find{|cp|cp.type == "Friend"} do |ps,cp|
       map ps.name <=> cp.name
       "Friend" >> cp.type
     end