Author: tchemit Date: 2012-07-13 18:28:57 +0200 (Fri, 13 Jul 2012) New Revision: 282 Url: http://nuiton.org/repositories/revision/jredmine/282 Log: remove plexus usage + open api Added: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceProviderImpl.java Modified: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineAnonymousServiceImpl.java trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRequestFactoryImpl.java trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRestClient.java trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImpl.java trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImplementorImpl.java trunk/jredmine-client-1.3.x/src/test/java/org/nuiton/jredmine/v1_3_x/RedmineFixtures.java Modified: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineAnonymousServiceImpl.java =================================================================== --- trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineAnonymousServiceImpl.java 2012-07-13 16:27:10 UTC (rev 281) +++ trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineAnonymousServiceImpl.java 2012-07-13 16:28:57 UTC (rev 282) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.io.rest.RestClient; import org.nuiton.jredmine.RedmineAnonymousService; import org.nuiton.jredmine.RedmineServiceConfiguration; import org.nuiton.jredmine.RedmineServiceException; @@ -51,7 +52,6 @@ * Created: 2 janv. 2010 * * @author tchemit <chemit@codelutin.com> - * @plexus.component role="org.nuiton.jredmine.RedmineAnonymousService" role-hint="1.3.x" * @see RedmineServiceConfiguration#isAnonymous() * @since 1.0.3 */ @@ -61,10 +61,10 @@ private static final Log log = LogFactory.getLog(RedmineAnonymousServiceImpl.class); - /** @plexus.requirement role="org.nuiton.jredmine.RedmineServiceImplementor" role-hint="1.3.x" */ protected RedmineServiceImplementor delegateImplementor; public RedmineAnonymousServiceImpl() { + delegateImplementor = new RedmineServiceImplementorImpl(); } /////////////////////////////////////////////////////////////////////////// @@ -219,6 +219,11 @@ } @Override + public RestClient getSession() { + return delegateImplementor.getSession(); + } + + @Override public int ping() { return delegateImplementor.ping(); } Modified: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRequestFactoryImpl.java =================================================================== --- trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRequestFactoryImpl.java 2012-07-13 16:27:10 UTC (rev 281) +++ trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRequestFactoryImpl.java 2012-07-13 16:28:57 UTC (rev 282) @@ -30,7 +30,6 @@ * Factory of {@link RestRequest}. * * @author tchemit <chemit@codelutin.com> - * @plexus.component role="org.nuiton.io.rest.RequestFactory" role-hint="1.3.x" * @since 1.4 */ public class RedmineRequestFactoryImpl extends AbstractRequestFactory { @@ -92,11 +91,11 @@ // misc requests -// addRequestBuilder(new DefaultRedmineRequestBuilder(PING, RestMethod.GET, "jredmine", "ping")); - addRequestBuilder(new DefaultRedmineRequestBuilder(PING, RestMethod.GET, "projects")); + addRequestBuilder(new DefaultRedmineRequestBuilder(PING, RestMethod.GET, "jredmine", "ping")); +// addRequestBuilder(new DefaultRedmineRequestBuilder(PING, RestMethod.GET, "projects")); addRequestBuilder(new DefaultRedmineRequestBuilder(LOGOUT, RestMethod.GET, "jredmine", "logout")); - addRequestBuilder(new DefaultRedmineRequestBuilder(LOGIN, RestMethod.POST, "login") { -// addRequestBuilder(new DefaultRedmineRequestBuilder(LOGIN, RestMethod.POST, "jredmine", "login") { +// addRequestBuilder(new DefaultRedmineRequestBuilder(LOGIN, RestMethod.POST, "login") { + addRequestBuilder(new DefaultRedmineRequestBuilder(LOGIN, RestMethod.POST, "jredmine", "login") { private static final long serialVersionUID = 1L; @@ -110,8 +109,8 @@ // data with no scope requests -// addRequestBuilder(new DefaultRedmineRequestBuilder(GET_PROJECT_LIST, "jredmine", "get_projects.xml")); - addRequestBuilder(new DefaultRedmineRequestBuilder(GET_PROJECT_LIST, RestMethod.GET, "projects.xml")); + addRequestBuilder(new DefaultRedmineRequestBuilder(GET_PROJECT_LIST, RestMethod.GET, "jredmine", "get_projects.xml")); +// addRequestBuilder(new DefaultRedmineRequestBuilder(GET_PROJECT_LIST, RestMethod.GET, "projects.xml")); addRequestBuilder(new DefaultRedmineRequestBuilder(GET_USER_PROJECTS, RestMethod.GET, "jredmine", "get_user_projects.xml")); addRequestBuilder(new DefaultRedmineRequestBuilder(GET_ISSUE_STATUS_LIST, RestMethod.GET, "jredmine", "get_issue_statuses.xml")); addRequestBuilder(new DefaultRedmineRequestBuilder(GET_ISSUE_PRIORITY_LIST, RestMethod.GET, "jredmine", "get_issue_priorities.xml")); Modified: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRestClient.java =================================================================== --- trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRestClient.java 2012-07-13 16:27:10 UTC (rev 281) +++ trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineRestClient.java 2012-07-13 16:28:57 UTC (rev 282) @@ -32,7 +32,6 @@ import org.codehaus.plexus.util.StringUtils; import org.nuiton.io.rest.RequestFactory; import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.io.rest.RestRequest; import org.nuiton.io.rest.RestSession; import org.nuiton.jredmine.model.Version; @@ -47,7 +46,6 @@ * {@code redmine_rest} rails plugin. * * @author tchemit <chemit@codelutin.com> - * @plexus.component role="org.nuiton.io.rest.RestClient" role-hint="1.3.x" * @since 1.0.0 */ public class RedmineRestClient extends RestClient { @@ -57,7 +55,6 @@ /** * To obtain redmine requests. * - * @plexus.requirement role="org.nuiton.io.rest.RequestFactory" role-hint="1.3.x" * @since 1.4 */ protected RequestFactory requestFactory; @@ -65,12 +62,9 @@ public final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); public RedmineRestClient() { + requestFactory = new RedmineRequestFactoryImpl(); } - public RedmineRestClient(RestClientConfiguration configuration) { - super(configuration); - } - @Override public RequestFactory getRequestFactory() { return requestFactory; Modified: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImpl.java =================================================================== --- trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImpl.java 2012-07-13 16:27:10 UTC (rev 281) +++ trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImpl.java 2012-07-13 16:28:57 UTC (rev 282) @@ -41,7 +41,6 @@ * Default {@link RedmineService} implementation based on a {@link RestClient} * * @author tchemit <chemit@codelutin.com> - * @plexus.component role="org.nuiton.jredmine.RedmineService" role-hint="1.3.x" * @since 1.0.0 */ public class RedmineServiceImpl extends RedmineAnonymousServiceImpl implements RedmineService { Modified: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImplementorImpl.java =================================================================== --- trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImplementorImpl.java 2012-07-13 16:27:10 UTC (rev 281) +++ trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceImplementorImpl.java 2012-07-13 16:28:57 UTC (rev 282) @@ -33,6 +33,7 @@ import org.nuiton.jredmine.RedmineServiceException; import org.nuiton.jredmine.RedmineServiceImplementor; import org.nuiton.jredmine.RedmineServiceLoginException; +import org.nuiton.jredmine.model.io.xpp3.DefaultRedmineXpp3Helper; import org.nuiton.jredmine.model.io.xpp3.RedmineXpp3Helper; import java.io.IOException; @@ -44,7 +45,6 @@ * Created: 2 janv. 2010 * * @author tchemit <chemit@codelutin.com> - * @plexus.component role="org.nuiton.jredmine.RedmineServiceImplementor" role-hint="1.3.x" * @see RedmineServiceImplementor * @since 1.0.3 */ @@ -54,19 +54,11 @@ private static final Log log = LogFactory.getLog(RedmineServiceImplementorImpl.class); - /** - * Client Rest. - * - * @plexus.requirement role="org.nuiton.io.rest.RestClient" role-hint="1.3.x" - */ - protected RedmineRestClient session; + /** Client Rest. */ + protected final RedmineRestClient session; - /** - * xpp3 xpp3Helper to transform xml stream to pojo. - * - * @plexus.requirement role="org.nuiton.jredmine.model.io.xpp3.RedmineXpp3Helper" role-hint="default" - */ - protected RedmineXpp3Helper xpp3Helper; + /** xpp3 xpp3Helper to transform xml stream to pojo. */ + protected final RedmineXpp3Helper xpp3Helper; /** internal state to known if service was init */ protected boolean init; @@ -79,12 +71,18 @@ log.debug("new " + this); } session = new RedmineRestClient(); + xpp3Helper = new DefaultRedmineXpp3Helper(); } /////////////////////////////////////////////////////////////////////////// /// RedmineServiceImplementor implementation /////////////////////////////////////////////////////////////////////////// + + public RedmineRestClient getSession() { + return session; + } + @Override public boolean isInit() { return init; @@ -109,7 +107,6 @@ "the client " + this + " was already opened!"); } try { - this.session = session; if (!session.isOpen()) { session.open(); Added: trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceProviderImpl.java =================================================================== --- trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceProviderImpl.java (rev 0) +++ trunk/jredmine-client-1.3.x/src/main/java/org/nuiton/jredmine/v1_3_x/RedmineServiceProviderImpl.java 2012-07-13 16:28:57 UTC (rev 282) @@ -0,0 +1,36 @@ +package org.nuiton.jredmine.v1_3_x; + +import org.nuiton.jredmine.RedmineAnonymousService; +import org.nuiton.jredmine.RedmineService; +import org.nuiton.jredmine.RedmineServiceConfiguration; +import org.nuiton.jredmine.RedmineServiceProvider; + +/** + * Implmentation of {@link RedmineServiceProvider} for this module. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.4 + @plexus.component role="org.nuiton.jredmine.RedmineServiceProvider" role-hint="1.3.x" + */ +public class RedmineServiceProviderImpl implements RedmineServiceProvider { + + @Override + public String getRedmineVersion() { + return "1.3.x"; + } + + @Override + public boolean isRequireJRedminePlugin() { + return true; + } + + @Override + public RedmineService newRedmineService(RedmineServiceConfiguration configuration) { + return new RedmineServiceImpl(); + } + + @Override + public RedmineAnonymousService newRedmineAnonymousService(RedmineServiceConfiguration configuration) { + return new RedmineAnonymousServiceImpl(); + } +} Modified: trunk/jredmine-client-1.3.x/src/test/java/org/nuiton/jredmine/v1_3_x/RedmineFixtures.java =================================================================== --- trunk/jredmine-client-1.3.x/src/test/java/org/nuiton/jredmine/v1_3_x/RedmineFixtures.java 2012-07-13 16:27:10 UTC (rev 281) +++ trunk/jredmine-client-1.3.x/src/test/java/org/nuiton/jredmine/v1_3_x/RedmineFixtures.java 2012-07-13 16:28:57 UTC (rev 282) @@ -23,7 +23,6 @@ import org.nuiton.jredmine.model.Tracker; import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; -import org.nuiton.jredmine.model.io.xpp3.DefaultRedmineXpp3Helper; import org.nuiton.jredmine.model.io.xpp3.RedmineDataConverter; import java.io.File; @@ -90,12 +89,6 @@ public RedmineAnonymousService newRedmineAnonymousService(RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { RedmineAnonymousServiceImpl service = new RedmineAnonymousServiceImpl(); - RedmineServiceImplementorImpl implementor = new RedmineServiceImplementorImpl(); - RedmineRestClient restClient = new RedmineRestClient(); - restClient.requestFactory = new RedmineRequestFactoryImpl(); - implementor.xpp3Helper = new DefaultRedmineXpp3Helper(); - implementor.session = restClient; - service.delegateImplementor = implementor; service.init(configuration); return service; } @@ -103,12 +96,6 @@ public RedmineService newRedmineService(RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { RedmineServiceImpl service = new RedmineServiceImpl(); - RedmineServiceImplementorImpl implementor = new RedmineServiceImplementorImpl(); - RedmineRestClient restClient = new RedmineRestClient(); - restClient.requestFactory = new RedmineRequestFactoryImpl(); - implementor.session = restClient; - implementor.xpp3Helper = new DefaultRedmineXpp3Helper(); - service.delegateImplementor = implementor; service.init(configuration); return service; }