r318 - in branches/jredmine-1.x/jredmine-client/src: main/java/org/nuiton/jredmine main/java/org/nuiton/jredmine/rest test/java/org/nuiton/jredmine/rest
Author: tchemit Date: 2012-07-18 02:15:23 +0200 (Wed, 18 Jul 2012) New Revision: 318 Url: http://nuiton.org/repositories/revision/jredmine/318 Log: - clean unused code - use improved RequestBuilder api from helper-maven-plugin Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-07-17 16:50:23 UTC (rev 317) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-07-18 00:15:23 UTC (rev 318) @@ -243,66 +243,4 @@ return result; } - /////////////////////////////////////////////////////////////////////////// - /// RedmineServiceImplementor implementation - /////////////////////////////////////////////////////////////////////////// - -// @Override -// public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { -// // Force to not be loggued -// configuration.setAnonymous(true); -// if (log.isDebugEnabled()) { -// log.debug("init configuration for " + this); -// } -// return delegateImplementor.init(configuration); -// } -// -// @Override -// public <T> T getData(String requestName, -// Class<T> type, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.getData(requestName, type, args); -// } -// -// @Override -// public <T> T[] getDatas(String requestName, -// Class<T> type, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.getDatas(requestName, type, args); -// } -// -// @Override -// public <T> T sendData(String requestName, -// Class<T> klazz, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.sendData(requestName, klazz, args); -// } -// -// @Override -// public <T> T[] sendDatas(String requestName, -// Class<T> klazz, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.sendDatas(requestName, klazz, args); -// } -// -// @Override -// public boolean isInit() { -// return delegateImplementor.isInit(); -// } -// -// @Override -// public void destroy() throws RedmineServiceException { -// delegateImplementor.destroy(); -// } -// -// @Override -// public void checkNotLoggued(RestClient session) throws IllegalStateException, RedmineServiceLoginException, NullPointerException { -// delegateImplementor.checkNotLoggued(session); -// } -// -// @Override -// public void checkLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { -// delegateImplementor.checkLoggued(); -// } - } Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-07-17 16:50:23 UTC (rev 317) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-07-18 00:15:23 UTC (rev 318) @@ -307,63 +307,4 @@ return result; } - /////////////////////////////////////////////////////////////////////////// - /// RedmineServiceImplementor implementation - /////////////////////////////////////////////////////////////////////////// - -// @Override -// public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { -// if (log.isDebugEnabled()) { -// log.debug("init configuration for " + this); -// } -// return delegateImplementor.init(configuration); -// } -// -// @Override -// public <T> T getData(String requestName, -// Class<T> type, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.getData(requestName, type, args); -// } -// -// @Override -// public <T> T[] getDatas(String requestName, -// Class<T> type, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.getDatas(requestName, type, args); -// } -// -// @Override -// public <T> T sendData(String requestName, -// Class<T> klazz, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.sendData(requestName, klazz, args); -// } -// -// @Override -// public <T> T[] sendDatas(String requestName, -// Class<T> klazz, -// Object... args) throws RedmineServiceException { -// return delegateImplementor.sendDatas(requestName, klazz, args); -// } -// -// @Override -// public boolean isInit() { -// return delegateImplementor.isInit(); -// } -// -// @Override -// public void destroy() throws RedmineServiceException { -// delegateImplementor.destroy(); -// } -// -// @Override -// public void checkNotLoggued(RestClient session) throws IllegalStateException, RedmineServiceLoginException, NullPointerException { -// delegateImplementor.checkNotLoggued(session); -// } -// -// @Override -// public void checkLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { -// delegateImplementor.checkLoggued(); -// } } Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2012-07-17 16:50:23 UTC (rev 317) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2012-07-18 00:15:23 UTC (rev 318) @@ -228,12 +228,11 @@ protected <T> T getDataFromStream(Class<T> type, InputStream stream) throws RedmineServiceException { - if (stream == null) { - return null; - } - try { - T result = xpp3Helper.readObject(type, stream, false); + T result = null; + if (stream != null) { + result = xpp3Helper.readObject(type, stream, false); + } return result; } catch (Exception ex) { throw new RedmineServiceException( @@ -244,11 +243,11 @@ protected <T> T[] getDatasFromStream(Class<T> type, InputStream stream) throws RedmineServiceException { - if (stream == null) { - return null; - } try { - T[] result = xpp3Helper.readObjects(type, stream, false); + T[] result = null; + if (stream != null) { + result = xpp3Helper.readObjects(type, stream, false); + } return result; } catch (Exception ex) { throw new RedmineServiceException( Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java 2012-07-17 16:50:23 UTC (rev 317) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java 2012-07-18 00:15:23 UTC (rev 318) @@ -23,12 +23,9 @@ * #L% */ -import com.google.common.base.Joiner; import com.google.common.base.Strings; -import org.apache.commons.lang3.ArrayUtils; import org.nuiton.io.rest.AbstractRequestFactory; import org.nuiton.io.rest.RestMethod; -import org.nuiton.io.rest.RestRequest; import org.nuiton.io.rest.RestRequestBuilder; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.ModelHelper; @@ -73,6 +70,11 @@ private static final long serialVersionUID = 1L; @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(2, "userName, password", args); + } + + @Override public String[] getParameters(Object... args) { String login = (String) args[0]; String password = (String) args[1]; @@ -103,6 +105,11 @@ private static final long serialVersionUID = 1L; @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(2, "projectName, version", args); + } + + @Override public String[] getParameters(Object... args) { Version version = (Version) args[1]; String date = getVersionEffectiveDate(version); @@ -120,6 +127,11 @@ private static final long serialVersionUID = 1L; @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(2, "projectName, version", args); + } + + @Override public String[] getParameters(Object... args) { Version version = (Version) args[1]; String date = getVersionEffectiveDate(version); @@ -137,9 +149,14 @@ private static final long serialVersionUID = 1L; @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(3, + "projectName, version, oldVersionName", args); + } + + @Override public String[] getParameters(Object... args) { - Version version = (Version) args[1]; String date = getVersionEffectiveDate(version); String status = getVersionStatus(version); @@ -158,6 +175,11 @@ private static final long serialVersionUID = 1L; @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(2, "projectName, news", args); + } + + @Override public String[] getParameters(Object... args) { News news = (News) args[1]; return new String[]{ @@ -177,6 +199,12 @@ private static final long serialVersionUID = 1L; @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(3, + "projectName, versionName, attachment", args); + } + + @Override public String[] getParameters(Object... args) { String versionId = (String) args[1]; Attachment attachment = (Attachment) args[2]; @@ -203,6 +231,12 @@ private static final long serialVersionUID = 1L; @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(3, + "projectName, issueId, timeEntry", args); + } + + @Override public String[] getParameters(Object... args) { String issueId = (String) args[1]; TimeEntry timeEntry = (TimeEntry) args[2]; @@ -243,18 +277,12 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0.0 */ - protected static class DefaultRequestBuilder implements RestRequestBuilder { + protected static class DefaultRequestBuilder extends AbstractRequestBuilder { private static final long serialVersionUID = 1L; - protected String name; - - protected String[] action; - protected String scope; - protected final RestMethod method; - public DefaultRequestBuilder(String name, RestMethod method, String... action) { @@ -265,79 +293,25 @@ String scope, RestMethod method, String... action) { - this.name = name; - this.action = action; - this.method = method; + super(name, method, action); this.scope = scope; } - @Override - public String getName() { - return name; - } - + /** + * Gets the scope of this request (scope can be null,project, + * version issue,...). + * + * @return the scope of this request + */ public final String getScope() { return scope; } - /** - * @param args the args of the request - * @return TODO - */ - public String[] getParameters(Object... args) { - // by default, no parameter - return ArrayUtils.EMPTY_STRING_ARRAY; - } - - public String[] getPath(Object... args) { - // by default, path is contextPath / action - return action; - } - - public Map<String, File> getAttachments(Object... args) { - // by default, no attachments - return null; - } - @Override - public RestRequest create(final Object... args) { + public void checkRequestArgs(Object... args) { - return new RestRequest() { - - @Override - public String[] getPath() { - return DefaultRequestBuilder.this.getPath(args); - } - - @Override - public String[] getParameters() { - return DefaultRequestBuilder.this.getParameters(args); - } - - @Override - public Map<String, File> getAttachments() { - return DefaultRequestBuilder.this.getAttachments(args); - } - - @Override - public boolean containsAttachments() { - Map<String, File> attachments = getAttachments(); - return attachments != null && !attachments.isEmpty(); - } - - @Override - public String toPath(String redmineUrl) { - String result = redmineUrl + "/" + - Joiner.on('/').join(getPath()); - return result; - } - - @Override - public RestMethod getMethod() { - return method; - } - - }; + // by default request have no ags + checkRequestArgs(0, "", args); } } @@ -365,6 +339,11 @@ } @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(1, "projectName", args); + } + + @Override public String[] getPath(Object... args) { // one args : projectName @@ -396,6 +375,10 @@ super(name, ModelHelper.ISSUE_SCOPE, method, action); } + @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(2, "projectName, issueId", args); + } @Override public String[] getParameters(Object... args) { @@ -428,6 +411,11 @@ } @Override + public void checkRequestArgs(Object... args) { + checkRequestArgs(2, "projectName, versionName", args); + } + + @Override public String[] getParameters(Object... args) { // args 1 = project id @@ -440,4 +428,5 @@ }; } } + } Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java 2012-07-17 16:50:23 UTC (rev 317) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java 2012-07-18 00:15:23 UTC (rev 318) @@ -52,7 +52,8 @@ LogFactory.getLog(RedmineRestClientTest.class); @ClassRule - public static final RedmineAnonymousFixtureClassRule checkConfigRule = new RedmineAnonymousFixtureClassRule(); + public static final RedmineAnonymousFixtureClassRule checkConfigRule = + new RedmineAnonymousFixtureClassRule(); protected RedmineFixtures getFixtures() { return checkConfigRule.getFixtures(); @@ -200,7 +201,7 @@ public void getUserProjects() throws Exception { Assume.assumeTrue(!getConfiguration().isAnonymous()); - askData(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME, projectName); + askData(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME); } @Test
participants (1)
-
tchemit＠users.nuiton.org