Author: adietish Date: 2011-09-13 05:54:39 -0400 (Tue, 13 Sep 2011) New Revision: 34663 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Status.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java Log: [JBIDE-9510] started implementing IOpenshiftService#getStatus(Application). Will not get any further since server responds with <code>null</code> data object Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-13 09:01:04 UTC (rev 34662) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-13 09:54:39 UTC (rev 34663) @@ -46,5 +46,8 @@ public void stop() throws OpenshiftException { service.stopApplication(name, cartridge); } - + + public Status getStatus() throws OpenshiftException { + return service.getStatus(this); + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-13 09:01:04 UTC (rev 34662) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-13 09:54:39 UTC (rev 34663) @@ -31,6 +31,8 @@ public Application stopApplication(String name, Cartridge cartridge) throws OpenshiftException; + public Status getStatus(Application application) throws OpenshiftException; + public Domain changeDomain(String domainName, SSHKey sshKey) throws OpenshiftException; public Domain createDomain(String name, SSHKey keyPair) throws OpenshiftException; @@ -38,5 +40,4 @@ public SSHKey createKey(String passPhrase, String privateKeyPath, String publicKeyPath) throws OpenshiftException; public SSHKey loadKey(String privateKeyPath, String publicKeyPath) throws OpenshiftException; - } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Status.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Status.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Status.java 2011-09-13 09:54:39 UTC (rev 34663) @@ -0,0 +1,21 @@ +/******************************************************************************* + * 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; + +/** + * @author André Dietisheim + */ +public class Status implements IOpenshiftObject { + + public Status() { + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Status.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/internal/core/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java 2011-09-13 09:01:04 UTC (rev 34662) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java 2011-09-13 09:54:39 UTC (rev 34663) @@ -23,6 +23,7 @@ import org.jboss.ide.eclipse.as.openshift.core.OpenshiftEndpointException; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.SSHKey; +import org.jboss.ide.eclipse.as.openshift.core.Status; import org.jboss.ide.eclipse.as.openshift.core.UserInfo; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.DomainRequestJsonMarshaller; @@ -122,7 +123,7 @@ public Domain changeDomain(String newName, SSHKey sshKey) throws OpenshiftException { return requestDomainAction(new ChangeDomainRequest(newName, sshKey, username, true)); } - + protected Domain requestDomainAction(AbstractDomainRequest request) throws OpenshiftException { String url = request.getUrlString(BASE_URL); try { @@ -145,36 +146,52 @@ @Override public Application createApplication(String name, Cartridge cartridge) throws OpenshiftException { - return requestApplicationAction(name, cartridge, - new ApplicationRequest(name, cartridge, ApplicationAction.CONFIGURE, username, true)); + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.CONFIGURE, username, + true)); } @Override public Application destroyApplication(String name, Cartridge cartridge) throws OpenshiftException { - return requestApplicationAction(name, cartridge, - new ApplicationRequest(name, cartridge, ApplicationAction.DECONFIGURE, username, true)); + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.DECONFIGURE, + username, true)); } @Override public Application startApplication(String name, Cartridge cartridge) throws OpenshiftException { - return requestApplicationAction(name, cartridge, - new ApplicationRequest(name, cartridge, ApplicationAction.START, username, true)); + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.START, username, true)); } @Override public Application restartApplication(String name, Cartridge cartridge) throws OpenshiftException { - return requestApplicationAction(name, cartridge, - new ApplicationRequest(name, cartridge, ApplicationAction.RESTART, username, true)); + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.RESTART, username, + true)); } - + @Override public Application stopApplication(String name, Cartridge cartridge) throws OpenshiftException { - return requestApplicationAction(name, cartridge, - new ApplicationRequest(name, cartridge, ApplicationAction.STOP, username, true)); + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.STOP, username, true)); } - protected Application requestApplicationAction(String name, Cartridge cartridge, - ApplicationRequest applicationRequest) throws OpenshiftException { + /** + * This seems not implemented yet on the server. The service simply returns + * a <code>null</code> data object. example response: + * <p> + * {"messages":"","debug":"","data":null,"api":"1.1.1","api_c":[ + * "placeholder" + * ],"result":"Success","broker":"1.1.1","broker_c":["namespace" + * ,"rhlogin","ssh" + * ,"app_uuid","debug","alter","cartridge","cart_type","action" + * ,"app_name","api"],"exit_code":0} + */ + @Override + public Status getStatus(Application application) throws OpenshiftException { + throw new UnsupportedOperationException(); + // requestApplicationAction( + // new ApplicationRequest(application.getName(), + // application.getCartridge(), ApplicationAction.STOP, username, true)); + } + + protected Application requestApplicationAction(ApplicationRequest applicationRequest) throws OpenshiftException { String url = applicationRequest.getUrlString(BASE_URL); try { String applicationRequestString = @@ -184,21 +201,23 @@ response = JsonSanitizer.sanitize(response); OpenshiftResponse<Application> openshiftResponse = - new ApplicationResponseUnmarshaller(name, cartridge, this).unmarshall(response); + new ApplicationResponseUnmarshaller(applicationRequest.getName(), + applicationRequest.getCartridge(), this).unmarshall(response); return openshiftResponse.getData(); } catch (MalformedURLException e) { throw new OpenshiftException( e, "Could not {0} application \"{1}\" at \"{2}\": Invalid url \"{2}\"", - applicationRequest.getAction().toHumanReadable(), name, url); + applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); } catch (UnauthorizedException e) { throw new InvalidCredentialsOpenshiftException( url, e, "Could not {0} application \"{1}\" at \"{2}\": Invalid credentials user \"{3}\", password \"{4}\"", - applicationRequest.getAction().toHumanReadable(), name, url, username, password); + applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url, username, + password); } catch (HttpClientException e) { throw new OpenshiftEndpointException( url, e, "Could not {0} application \"{1}\" at \"{2}\"", - applicationRequest.getAction().toHumanReadable(), name, url); + applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java 2011-09-13 09:01:04 UTC (rev 34662) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java 2011-09-13 09:54:39 UTC (rev 34663) @@ -18,8 +18,10 @@ import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService; import org.jboss.ide.eclipse.as.openshift.core.InvalidCredentialsOpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.Status; import org.jboss.ide.eclipse.as.openshift.internal.core.OpenshiftService; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** @@ -27,8 +29,8 @@ */ public class ApplicationIntegrationTest { - private OpenshiftService openshiftService; - private OpenshiftService invalidCredentialsOpenshiftService; + private IOpenshiftService openshiftService; + private IOpenshiftService invalidCredentialsOpenshiftService; private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; private static final String PASSWORD = "1q2w3e"; @@ -39,11 +41,13 @@ this.invalidCredentialsOpenshiftService = new OpenshiftService(USERNAME, "bogus"); } + @Ignore @Test(expected = InvalidCredentialsOpenshiftException.class) public void createApplicationWithInvalidCredentialsThrowsException() throws Exception { invalidCredentialsOpenshiftService.createApplication(createRandomApplicationName(), Cartridge.JBOSSAS_7); } + @Ignore @Test public void canCreateApplication() throws Exception { String applicationName = createRandomApplicationName(); @@ -58,6 +62,7 @@ } } + @Ignore @Test public void canDestroyApplication() throws Exception { String applicationName = createRandomApplicationName(); @@ -65,6 +70,7 @@ openshiftService.destroyApplication(applicationName, Cartridge.JBOSSAS_7); } + @Ignore @Test(expected = OpenshiftException.class) public void createDuplicateApplicationThrowsException() throws Exception { String applicationName = createRandomApplicationName(); @@ -76,6 +82,7 @@ } } + @Ignore @Test public void canStopApplication() throws Exception { String applicationName = createRandomApplicationName(); @@ -87,6 +94,7 @@ } } + @Ignore @Test public void canStartStoppedApplication() throws Exception { String applicationName = createRandomApplicationName(); @@ -99,6 +107,7 @@ } } + @Ignore @Test public void canStartStartedApplication() throws Exception { String applicationName = createRandomApplicationName(); @@ -116,6 +125,7 @@ } } + @Ignore @Test public void canStopStoppedApplication() throws Exception { String applicationName = createRandomApplicationName(); @@ -134,6 +144,7 @@ } } + @Ignore @Test public void canRestartApplication() throws Exception { String applicationName = createRandomApplicationName(); @@ -151,6 +162,18 @@ } } + @Test + public void canGetStatus() throws Exception { + String applicationName = createRandomApplicationName(); + try { + Application application = openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + Status status = openshiftService.getStatus(application); + assertNotNull(status); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + private String createRandomApplicationName() { return String.valueOf(System.currentTimeMillis()); }