Author: adietish Date: 2011-09-06 04:46:34 -0400 (Tue, 06 Sep 2011) New Revision: 34534 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java Log: [JBIDE-9591] Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.java (from rev 34533, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.java 2011-09-06 08:46:34 UTC (rev 34534) @@ -0,0 +1,8 @@ +package org.jboss.ide.eclipse.as.openshift.core; + +import org.jboss.ide.eclipse.as.openshift.internal.core.HttpClientException; + +public interface IHttpClient { + + public String post(String data) throws HttpClientException; +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java 2011-09-06 07:32:43 UTC (rev 34533) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java 2011-09-06 08:46:34 UTC (rev 34534) @@ -6,9 +6,10 @@ import org.eclipse.osgi.util.NLS; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.OpenshiftJsonRequestFactory; -import org.jboss.ide.eclipse.as.openshift.internal.core.HttpClient; +import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.HttpClientException; import org.jboss.ide.eclipse.as.openshift.internal.core.UrlConnectionHttpClient; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.utils.UrlBuilder; public class Openshift { @@ -26,12 +27,10 @@ public UserInfo getUserInfo() throws OpenshiftException { UrlBuilder userInfoUrlBuilder = new UrlBuilder(BASE_URL).path("userinfo"); try { - ModelNode node = new ModelNode(); - node.get("rhlogin").set(username); - node.get("debug").set("true"); - HttpClient httpClient = createHttpClient(userInfoUrlBuilder.toUrl()); - String request = new OpenshiftJsonRequestFactory(password, node.toJSONString(true)).create(); - String userInfoResponse = httpClient.post(request); + String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall(new UserInfoRequest(username, true)); + IHttpClient iHttpClient = createHttpClient(userInfoUrlBuilder.toUrl()); + String request = new OpenshiftJsonRequestFactory(password, userInfoRequest).create(); + String userInfoResponse = iHttpClient.post(request); ModelNode userInfoReponse = ModelNode.fromJSONString(userInfoResponse); return new UserInfo( userInfoReponse.get("rhlogin").asString(), @@ -52,7 +51,7 @@ } - private HttpClient createHttpClient(URL url) { + private IHttpClient createHttpClient(URL url) { return new UrlConnectionHttpClient(url); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java 2011-09-06 07:32:43 UTC (rev 34533) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java 2011-09-06 08:46:34 UTC (rev 34534) @@ -1,5 +1,9 @@ package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; -public interface IOpenshiftRequestMarshaller<OPENSHIFTREQUEST> { +import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; +public interface IOpenshiftRequestMarshaller<REQUEST> { + + public String marshall(REQUEST request); + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-06 07:32:43 UTC (rev 34533) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-06 08:46:34 UTC (rev 34534) @@ -6,13 +6,7 @@ public class UserInfoRequestJsonMarshaller implements IOpenshiftRequestMarshaller<UserInfoRequest> { - private UserInfoRequest userInfoRequest; - - public UserInfoRequestJsonMarshaller(UserInfoRequest userInfoRequest) { - this.userInfoRequest = userInfoRequest; - } - - public String create() { + public String marshall(UserInfoRequest userInfoRequest) { ModelNode node = new ModelNode(); node.get(IOpenshiftJsonConstants.PROPERTY_RHLOGIN).set(userInfoRequest.getRhLogin()); node.get(IOpenshiftJsonConstants.PROPERTY_DEBUG).set(String.valueOf(userInfoRequest.isDebug())); Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java 2011-09-06 07:32:43 UTC (rev 34533) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java 2011-09-06 08:46:34 UTC (rev 34534) @@ -1,6 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.internal.core; - -public interface HttpClient { - - public String post(String data) throws HttpClientException; -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java 2011-09-06 07:32:43 UTC (rev 34533) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java 2011-09-06 08:46:34 UTC (rev 34534) @@ -6,9 +6,10 @@ import java.net.URL; import java.text.MessageFormat; +import org.jboss.ide.eclipse.as.openshift.core.IHttpClient; import org.jboss.ide.eclipse.as.openshift.internal.core.utils.StreamUtils; -public class UrlConnectionHttpClient implements HttpClient { +public class UrlConnectionHttpClient implements IHttpClient { private static final String PROPERTY_CONTENT_TYPE = "Content-Type"; private static final int TIMEOUT = 10 * 1024; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java 2011-09-06 07:32:43 UTC (rev 34533) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java 2011-09-06 08:46:34 UTC (rev 34534) @@ -32,7 +32,7 @@ public void canMarshallRequestCorrectly() throws OpenshiftException { String expectedRequestString = "password=" + PASSWORD + "&json_data=%7B%22rhlogin%22+%3A+%22dietisheim%40gmx.net%22%2C+%22debug%22+%3A+%22true%22%7D"; - String userInfoRequest = new UserInfoRequestJsonMarshaller(new UserInfoRequest(USERNAME, true)).create(); + String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall(new UserInfoRequest(USERNAME, true)); String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, userInfoRequest).create(); assertEquals(expectedRequestString, effectiveRequest);