Author: adietish Date: 2011-09-14 10:25:45 -0400 (Wed, 14 Sep 2011) New Revision: 34731 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftRequest.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.java Log: [JBIDE-9510] Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-14 14:25:05 UTC (rev 34730) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-14 14:25:45 UTC (rev 34731) @@ -14,6 +14,6 @@ Export-Package: org.jboss.dmr;x-friends:="org.jboss.ide.eclipse.as.openshift.test", org.jboss.ide.eclipse.as.openshift.core, org.jboss.ide.eclipse.as.openshift.core.internal;x-friends:="org.jboss.ide.eclipse.as.openshift.test", - org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test", org.jboss.ide.eclipse.as.openshift.core.internal.request;x-friends:="org.jboss.ide.eclipse.as.openshift.test", + org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test", org.jboss.ide.eclipse.as.openshift.core.internal.response;x-friends:="org.jboss.ide.eclipse.as.openshift.test" Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-14 14:25:05 UTC (rev 34730) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -28,10 +28,6 @@ import org.jboss.ide.eclipse.as.openshift.core.internal.httpclient.HttpClientException; import org.jboss.ide.eclipse.as.openshift.core.internal.httpclient.UnauthorizedException; import org.jboss.ide.eclipse.as.openshift.core.internal.httpclient.UrlConnectionHttpClient; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.DomainRequestJsonMarshaller; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ListCartridgesRequestJsonMarshaller; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.request.AbstractDomainRequest; import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationAction; import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationRequest; @@ -40,11 +36,16 @@ import org.jboss.ide.eclipse.as.openshift.core.internal.request.ListCartridgesRequest; import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftJsonRequestFactory; import org.jboss.ide.eclipse.as.openshift.core.internal.request.UserInfoRequest; +import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ApplicationRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.DomainRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ListCartridgesRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.UserInfoRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.response.ApplicationResponseUnmarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.response.DomainResponseUnmarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer; import org.jboss.ide.eclipse.as.openshift.core.internal.response.ListCartridgesResponseUnmarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.response.OpenshiftResponse; +import org.jboss.ide.eclipse.as.openshift.core.internal.response.UserInfoResponseUnmarshaller; /** * @author André Dietisheim @@ -62,13 +63,16 @@ } public UserInfo getUserInfo() throws OpenshiftException { - UserInfoRequest userInfoRequest = new UserInfoRequest(username, true); - String url = userInfoRequest.getUrlString(BASE_URL); + UserInfoRequest request = new UserInfoRequest(username, true); + String url = request.getUrlString(BASE_URL); try { - String userInfoRequestString = new UserInfoRequestJsonMarshaller().marshall(userInfoRequest); - String request = new OpenshiftJsonRequestFactory(password, userInfoRequestString).create(); - String userInfoResponse = createHttpClient(url).post(request); - throw new UnsupportedOperationException(); + String requestString = new UserInfoRequestJsonMarshaller().marshall(request); + String openShiftRequestString = new OpenshiftJsonRequestFactory(password, requestString).create(); + String responseString = createHttpClient(url).post(openShiftRequestString); + responseString = JsonSanitizer.sanitize(responseString); + OpenshiftResponse<UserInfo> response = + new UserInfoResponseUnmarshaller().unmarshall(responseString); + return response.getData(); } catch (MalformedURLException e) { throw new OpenshiftEndpointException( url, e, "Could not get user info for user \"{0}\" at \"{1}\"", username, url, e); @@ -185,10 +189,9 @@ */ @Override public Status getStatus(Application application) throws OpenshiftException { + application = requestApplicationAction( + new ApplicationRequest(application.getName(), application.getCartridge(),ApplicationAction.STATUS, username, true)); throw new UnsupportedOperationException(); - // requestApplicationAction( - // new ApplicationRequest(application.getName(), - // application.getCartridge(), ApplicationAction.STOP, username, true)); } protected Application requestApplicationAction(ApplicationRequest applicationRequest) throws OpenshiftException { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java 2011-09-14 14:25:05 UTC (rev 34730) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -13,7 +13,6 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest; import org.jboss.ide.eclipse.as.openshift.core.internal.utils.UrlBuilder; /** Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java (from rev 34672, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.core.internal.request; + +/** + * @author André Dietisheim + */ +public interface IOpenshiftRequest { + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.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/internal/request/marshalling/AbstractJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -1,6 +1,8 @@ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling; +import org.jboss.ide.eclipse.as.openshift.core.internal.request.IOpenshiftRequest; + public abstract class AbstractOpenshiftMarshaller<REQUEST extends IOpenshiftRequest> implements IOpenshiftMarshaller<REQUEST> { @Override Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.Cartridge; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/DomainRequestJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -8,9 +8,10 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.internal.request.IOpenshiftRequest; /** * @author André Dietisheim Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java 2011-09-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftRequest.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; - -/** - * @author André Dietisheim - */ -public interface IOpenshiftRequest { - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/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-13 12:09:46 UTC (rev 34672) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling; import org.jboss.ide.eclipse.as.openshift.core.internal.request.UserInfoRequest;