Author: adietish Date: 2011-09-26 03:30:16 -0400 (Mon, 26 Sep 2011) New Revision: 35034 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/core/IUser.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java Log: [JBIDE-9762] Application#getGitUri is now implemented 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-24 05:42:22 UTC (rev 35033) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-26 07:30:16 UTC (rev 35034) @@ -45,10 +45,6 @@ this.creationTime = creationTime; this.user = user; this.service = service; - - // add ourselves to the user! - user.add(this); - } public String getName() { 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-24 05:42:22 UTC (rev 35033) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-26 07:30:16 UTC (rev 35034) @@ -23,7 +23,7 @@ public Application createApplication(String name, Cartridge cartridge, User user) throws OpenshiftException; - public Application destroyApplication(String name, Cartridge cartridge, User user) throws OpenshiftException; + public void destroyApplication(String name, Cartridge cartridge, User user) throws OpenshiftException; public Application startApplication(String name, Cartridge cartridge, User user) throws OpenshiftException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-24 05:42:22 UTC (rev 35033) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-26 07:30:16 UTC (rev 35034) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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; import java.util.Collection; @@ -2,2 +12,5 @@ +/** + * @author André Dietisheim + */ public interface IUser { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java 2011-09-24 05:42:22 UTC (rev 35033) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java 2011-09-26 07:30:16 UTC (rev 35034) @@ -108,6 +108,10 @@ applications.add(application); } + public void remove(Application application) { + applications.remove(application); + } + /** * Loads the lazy values from the server if needed. Updates itself all * referenced objects (applications, domain). 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-24 05:42:22 UTC (rev 35033) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-26 07:30:16 UTC (rev 35034) @@ -12,7 +12,6 @@ import java.net.MalformedURLException; import java.net.URL; -import java.util.Collection; import java.util.List; import org.jboss.ide.eclipse.as.openshift.core.Application; @@ -130,14 +129,17 @@ @Override public Application createApplication(String name, Cartridge cartridge, User user) throws OpenshiftException { - return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.CONFIGURE, + Application application = requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.CONFIGURE, user.getRhlogin(), true), user); + user.add(application); + return application; } @Override - public Application destroyApplication(String name, Cartridge cartridge, User user) throws OpenshiftException { - return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.DECONFIGURE, + public void destroyApplication(String name, Cartridge cartridge, User user) throws OpenshiftException { + Application application = requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.DECONFIGURE, user.getRhlogin(), true), user); + user.remove(application); } @Override Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-24 05:42:22 UTC (rev 35033) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-26 07:30:16 UTC (rev 35034) @@ -48,9 +48,10 @@ public class ApplicationTest { public static final Pattern GIT_URI_REGEXP = Pattern.compile("ssh://(.+)@(.+)-([^\\.]+)\\.(.+)/~/git/(.+).git/"); - - private User user = new User(ApplicationResponseFake.RHLOGIN, ApplicationResponseFake.PASSWORD, new NoopOpenshiftServiceFake()); + private User user = new User(ApplicationResponseFake.RHLOGIN, ApplicationResponseFake.PASSWORD, + new NoopOpenshiftServiceFake()); + @Test public void canMarshallApplicationCreateRequest() throws Exception { String expectedRequestString = @@ -69,8 +70,10 @@ String createApplicationRequest = new ApplicationRequestJsonMarshaller().marshall( new ApplicationRequest( - "test-application", Cartridge.JBOSSAS_7, ApplicationAction.CONFIGURE, ApplicationResponseFake.RHLOGIN, true)); - String effectiveRequest = new OpenshiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, createApplicationRequest).createString(); + "test-application", Cartridge.JBOSSAS_7, ApplicationAction.CONFIGURE, + ApplicationResponseFake.RHLOGIN, true)); + String effectiveRequest = new OpenshiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, + createApplicationRequest).createString(); assertEquals(expectedRequestString, effectiveRequest); } @@ -92,8 +95,10 @@ String createApplicationRequest = new ApplicationRequestJsonMarshaller().marshall( new ApplicationRequest( - "test-application", Cartridge.JBOSSAS_7, ApplicationAction.DECONFIGURE, ApplicationResponseFake.RHLOGIN, true)); - String effectiveRequest = new OpenshiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, createApplicationRequest).createString(); + "test-application", Cartridge.JBOSSAS_7, ApplicationAction.DECONFIGURE, + ApplicationResponseFake.RHLOGIN, true)); + String effectiveRequest = new OpenshiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, + createApplicationRequest).createString(); assertEquals(expectedRequestString, effectiveRequest); } @@ -124,7 +129,7 @@ ApplicationResponseFake.APPLICATION_CARTRIDGE, ApplicationResponseFake.APPLICATION_CREATIONTIME); return new UserInfo( - ApplicationResponseFake.RHLOGIN, + ApplicationResponseFake.RHLOGIN, ApplicationResponseFake.UUID, ApplicationResponseFake.SSHPUBLICKEY, ApplicationResponseFake.RHC_DOMAIN, @@ -133,20 +138,27 @@ } }; User user = new User(ApplicationResponseFake.RHLOGIN, ApplicationResponseFake.PASSWORD, userInfoService); + Application application = new Application( + ApplicationResponseFake.APPLICATION_NAME + , ApplicationResponseFake.APPLICATION_UUID + , ApplicationResponseFake.APPLICATION_CARTRIDGE + , ApplicationResponseFake.APPLICATION_EMBEDDED + , ApplicationResponseFake.APPLICATION_CREATIONTIME + , user + , userInfoService); + // we need to add it manually since we dont use the service + user.add(application); - String response = JsonSanitizer.sanitize(ApplicationResponseFake.appResponse); - OpenshiftResponse<Application> openshiftResponse = - new ApplicationResponseUnmarshaller( - ApplicationResponseFake.APPLICATION_NAME, ApplicationResponseFake.APPLICATION_CARTRIDGE, - user, userInfoService) - .unmarshall(response); - Application application = openshiftResponse.getOpenshiftObject(); assertNotNull(application); String gitUri = application.getGitUri(); assertNotNull(gitUri); Domain domain = user.getDomain(); assertNotNull(domain); - assertGitUri(gitUri, application.getUUID(), application.getName(), domain.getNamespace(), domain.getRhcDomain()); + assertGitUri(gitUri + , ApplicationResponseFake.APPLICATION_UUID + , ApplicationResponseFake.APPLICATION_NAME + , ApplicationResponseFake.NAMESPACE + , ApplicationResponseFake.RHC_DOMAIN); } private void assertGitUri(String gitUri, String uuid, String name, String namespace, String rhcDomain) { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-24 05:42:22 UTC (rev 35033) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-26 07:30:16 UTC (rev 35034) @@ -42,7 +42,7 @@ } @Override - public Application destroyApplication(String name, Cartridge cartridge, User user) throws OpenshiftException { + public void destroyApplication(String name, Cartridge cartridge, User user) throws OpenshiftException { throw new UnsupportedOperationException(); }