Author: tchemit Date: 2012-10-17 01:24:12 +0200 (Wed, 17 Oct 2012) New Revision: 372 Url: http://nuiton.org/repositories/revision/jredmine/372 Log: use new apis Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2012-10-16 23:21:58 UTC (rev 371) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2012-10-16 23:24:12 UTC (rev 372) @@ -26,7 +26,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.util.StringUtils; -import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Project; import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.service.RedmineServiceException; @@ -176,7 +175,7 @@ try { users = service.getProjectMembers(projectId); - User user = ModelHelper.byLogin(username, users); + User user = User.byLogin(username, users); if (user == null) { Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java 2012-10-16 23:21:58 UTC (rev 371) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java 2012-10-16 23:24:12 UTC (rev 372) @@ -26,7 +26,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.util.StringUtils; -import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; import org.nuiton.jredmine.service.RedmineServiceException; @@ -149,7 +148,7 @@ } protected Version getProjectVersion(String versionId) { - Version v = ModelHelper.byVersionName(versionId, projectVersions); + Version v = Version.byVersionName(versionId, projectVersions); return v; } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-10-16 23:21:58 UTC (rev 371) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-10-16 23:24:12 UTC (rev 372) @@ -33,11 +33,11 @@ import org.nuiton.jredmine.client.RedmineRequestHelper; import org.nuiton.jredmine.model.I18nAble; import org.nuiton.jredmine.model.IdAble; +import org.nuiton.jredmine.model.IdAbles; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.model.IssueCategory; import org.nuiton.jredmine.model.IssuePriority; import org.nuiton.jredmine.model.IssueStatus; -import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.News; import org.nuiton.jredmine.model.Project; import org.nuiton.jredmine.model.Tracker; @@ -279,7 +279,7 @@ } List<IdAble> list = Arrays.asList(datas); if (sortById) { - Collections.sort(list, ModelHelper.ID_ABLE_COMPARATOR); + Collections.sort(list, IdAbles.ID_ABLE_COMPARATOR); } buffer.append("\nValues of '").append(dataTypeName).append('\''); if (DataScope.VERSION.equals(scope) || Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-10-16 23:21:58 UTC (rev 371) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-10-16 23:24:12 UTC (rev 372) @@ -36,10 +36,10 @@ import org.apache.maven.plugins.changes.model.io.xpp3.ChangesXpp3Writer; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XmlStreamWriter; +import org.nuiton.jredmine.model.IdAbles; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.model.IssueCategory; import org.nuiton.jredmine.model.IssueStatus; -import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Tracker; import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; @@ -399,7 +399,7 @@ Integer id = Integer.valueOf(parts[1].trim()); - Tracker t = ModelHelper.byId(id, releaseTrackers); + Tracker t = IdAbles.byId(id, releaseTrackers); if (t == null) { throw new MojoExecutionException("could not obtain the tracker with id " + id); @@ -417,7 +417,7 @@ for (String s : statusIds.split(",")) { Integer id = Integer.valueOf(s.trim()); - IssueStatus t = ModelHelper.byId(id, statuses); + IssueStatus t = IdAbles.byId(id, statuses); if (t == null) { throw new MojoExecutionException("could not obtain the status with id " + id); @@ -435,7 +435,7 @@ for (String s : categoryIds.split(",")) { Integer id = Integer.valueOf(s.trim()); - IssueCategory t = ModelHelper.byId(id, categories); + IssueCategory t = IdAbles.byId(id, categories); if (t == null) { throw new MojoExecutionException("could not obtain the category with id " + id); @@ -604,7 +604,7 @@ boolean treateReleaseVersion = v.getId() == version.getId(); - Issue[] issuesForVersion = ModelHelper.byVersionId(v.getId(), issues); + Issue[] issuesForVersion = Issue.byVersionId(v.getId(), issues); Release release = new Release(); body.addRelease(release); @@ -640,7 +640,7 @@ String type = entry.getValue(); // get issues for the tracker - Issue[] issuesForTracker = ModelHelper.byTrackerId(entry.getKey(), issuesForVersion); + Issue[] issuesForTracker = Issue.byTrackerId(entry.getKey(), issuesForVersion); for (Issue issue : issuesForTracker) { @@ -670,7 +670,7 @@ getLog().warn("issue " + issue.getSubject() + " is not created to any user, this is not normal..."); id = issue.getAuthorId(); } - a = ModelHelper.byId(id, users); + a = IdAbles.byId(id, users); if (a != null) { action.setDueTo(a.getFirstname() + " " + a.getLastname()); @@ -684,7 +684,7 @@ getLog().warn("issue " + issue.getSubject() + " is not assigned to any user, this is not normal..."); id = issue.getAuthorId(); } - a = ModelHelper.byId(id, users); + a = IdAbles.byId(id, users); if (a != null) { //TODO should check this is a developper name on pom.xml Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2012-10-16 23:21:58 UTC (rev 371) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2012-10-16 23:24:12 UTC (rev 372) @@ -25,11 +25,11 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.logging.Log; +import org.nuiton.jredmine.model.IdAbles; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.model.IssueCategory; import org.nuiton.jredmine.model.IssuePriority; import org.nuiton.jredmine.model.IssueStatus; -import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Tracker; import org.nuiton.jredmine.model.Version; import org.nuiton.jredmine.service.RedmineService; @@ -104,7 +104,7 @@ versions = service.getVersions(projectId); if (versionIds != null) { // filtre sur version - versions = ModelHelper.byIds(Version.class, versions, versionIds.toArray(new Integer[versionIds.size()])); + versions = IdAbles.byIds(Version.class, versions, versionIds.toArray(new Integer[versionIds.size()])); } int nbIssues = 0; Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-10-16 23:21:58 UTC (rev 371) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-10-16 23:24:12 UTC (rev 372) @@ -28,7 +28,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.util.StringUtils; -import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; import org.nuiton.plugin.PluginHelper; @@ -224,7 +223,7 @@ if (StringUtils.isNotBlank(previousVersionName)) { // retrieve previous version - Version previousVersion = ModelHelper.byVersionName(previousVersionName); + Version previousVersion = Version.byVersionName(previousVersionName); if (previousVersion == null) { getLog().warn("can not find the previous version " + previousVersionName); } else {