r296 - branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3 - Jredmine-commits

14 Jul 2012

Author: tchemit
Date: 2012-07-14 19:06:09 +0200 (Sat, 14 Jul 2012)
New Revision: 296

Url: http://nuiton.org/repositories/revision/jredmine/296

Log:
fixes #2033: Improve xpp3 reader api

Modified:
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java
   branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java
===================================================================

--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -29,8 +29,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Attachment} reader.
  *
@@ -46,17 +44,17 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(Attachment.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "author-id",
                                  "container-id",
                                  "filesize",
                                  "downloads",
                                  "id");
 
-        addTagTextContentMappers(Attachment.class, RedmineDataConverter.Datetime, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Datetime, true,
                                  "created-on");
 
-        addTagTextContentMappers(Attachment.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "container-type",
                                  "content-type",
                                  "description",

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -30,8 +30,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Issue} reader.
  *
@@ -47,12 +45,12 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(IssueCategory.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers( RedmineDataConverter.Integer, true, 
                                  "project-id",
                                  "assigned-to-id",
                                  "id");
 
-        addTagTextContentMappers(IssueCategory.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers( RedmineDataConverter.Text, true, 
                                  "name");
     }
 }

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -30,8 +30,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Issue} reader.
  *
@@ -48,17 +46,17 @@
     protected void initMappers() throws IntrospectionException {
 
 
-        addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true, 
                                  "id",
                                  "parent-id",
                                  "project-id",
                                  "position");
 
-        addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Boolean, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Boolean, true, 
                                  "is-default",
                                  "active");
 
-        addTagTextContentMappers(IssuePriority.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true, 
                                  "name",
                                  "opt");
     }

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -30,8 +30,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Issue} reader.
  *
@@ -47,16 +45,16 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true, 
                                  "id",
                                  "position",
                                  "default-done-ratio");
 
-        addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Boolean, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Boolean, true, 
                                  "is-closed",
                                  "is-default");
 
-        addTagTextContentMappers(IssueStatus.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true, 
                                  "name");
     }
 }

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -26,12 +26,9 @@
 
 import org.nuiton.io.xpp3.AbstractXpp3Reader;
 import org.nuiton.jredmine.model.Issue;
-import org.nuiton.jredmine.model.Project;
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Issue} reader.
  *
@@ -47,7 +44,7 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(Issue.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "assigned-to-id",
                                  "author-id",
                                  "category-id",
@@ -64,22 +61,22 @@
                                  "lft",
                                  "rgt");
 
-        addTagTextContentMappers(Issue.class, RedmineDataConverter.Float, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Float, true,
                                  "estimated-hours");
 
-        addTagTextContentMappers(Issue.class, RedmineDataConverter.Datetime, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Datetime, true,
                                  "created-on",
                                  "updated-on");
 
-        addTagTextContentMappers(Issue.class, RedmineDataConverter.Date, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Date, true,
                                  "due-date",
                                  "start-date");
 
-        addTagTextContentMappers(Issue.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "description",
                                  "subject");
 
-        addTagTextContentMappers(Issue.class, RedmineDataConverter.Boolean, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Boolean, true,
                                  "is-private");
     }
 }

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -29,8 +29,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * @author tchemit <chemit@codelutin.com>
  * @since 1.0.0
@@ -44,16 +42,16 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(News.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "id",
                                  "author-id",
                                  "project-id",
                                  "comments-count");
 
-        addTagTextContentMappers(News.class, RedmineDataConverter.Datetime, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Datetime, true,
                                  "created-on");
 
-        addTagTextContentMappers(News.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "description",
                                  "summary",
                                  "title");

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -29,8 +29,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Project} reader.
  *
@@ -46,7 +44,7 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(Project.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "id",
                                  "lft",
                                  "rgt",
@@ -54,14 +52,14 @@
                                  "projects-count",
                                  "status");
 
-        addTagTextContentMappers(Project.class, RedmineDataConverter.Boolean, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Boolean, true,
                                  "is-public");
 
-        addTagTextContentMappers(Project.class, RedmineDataConverter.Datetime, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Datetime, true,
                                  "created-on",
                                  "updated-on");
 
-        addTagTextContentMappers(Project.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "description",
                                  "homepage",
                                  "identifier",

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -29,8 +29,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * Created: 31 déc. 2009
  *
@@ -45,7 +43,7 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "id",
                                  "activity-id",
                                  "issue-id",
@@ -56,18 +54,18 @@
                                  "tweek"
         );
 
-        addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Float, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Float, true,
                                  "hours"
         );
 
-        addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Datetime, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Datetime, true,
                                  "created-on",
                                  "updated-on");
 
-        addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Date, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Date, true,
                                  "spent-on");
 
-        addTagTextContentMappers(TimeEntry.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "comments");
     }
 }

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -29,8 +29,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Tracker} reader.
  *
@@ -46,17 +44,17 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(Tracker.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "id",
                                  "project-id",
                                  "tracker-id",
                                  "position");
 
-        addTagTextContentMappers(Tracker.class, RedmineDataConverter.Boolean, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Boolean, true,
                                  "is-in-chlog",
                                  "is-in-roadmap");
 
-        addTagTextContentMappers(Tracker.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "name");
     }
 }

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -29,8 +29,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link User} reader.
  *
@@ -46,23 +44,23 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(User.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "id",
                                  "auth-source-id",
                                  "member-id",
                                  "role-id",
                                  "status");
 
-        addTagTextContentMappers(User.class, RedmineDataConverter.Boolean, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Boolean, true,
                                  "admin",
                                  "mail-notification");
 
-        addTagTextContentMappers(User.class, RedmineDataConverter.Datetime, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Datetime, true,
                                  "created-on",
                                  "updated-on",
                                  "last-login-on");
 
-        addTagTextContentMappers(User.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "firstname",
                                  "hashed-password",
                                  "language",

Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java
===================================================================
--- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java	2012-07-14 16:58:29 UTC (rev 295)
+++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java	2012-07-14 17:06:09 UTC (rev 296)
@@ -29,8 +29,6 @@
 
 import java.beans.IntrospectionException;
 
-import static org.nuiton.io.xpp3.Xpp3Helper.addTagTextContentMappers;
-
 /**
  * {@link Version} reader.
  *
@@ -46,17 +44,17 @@
     @Override
     protected void initMappers() throws IntrospectionException {
 
-        addTagTextContentMappers(Version.class, RedmineDataConverter.Integer, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Integer, true,
                                  "id",
                                  "project-id");
 
-        addTagTextContentMappers(Version.class, RedmineDataConverter.Datetime, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Datetime, true,
                                  "created-on",
                                  "updated-on");
-        addTagTextContentMappers(Version.class, RedmineDataConverter.Date, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Date, true,
                                  "effective-date");
 
-        addTagTextContentMappers(Version.class, RedmineDataConverter.Text, true, allMappers,
+        addTagTextContentMappers(RedmineDataConverter.Text, true,
                                  "name",
                                  "description",
                                  "wiki-page-title",

    

r296 - branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3

tchemit＠users.nuiton.org

tags

participants (1)