[jbosstools-commits] JBoss Tools SVN: r34627 - in trunk/as/plugins: org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core and 1 other directory.

Author: adietish Date: 2011-09-12 06:48:36 -0400 (Mon, 12 Sep 2011) New Revision: 34627 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeDomainRequest.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeCreateDomainRequest.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractDomainRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java Log: [JBIDE-9510] implementing alter domain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractDomainRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractDomainRequest.java 2011-09-12 10:36:39 UTC (rev 34626) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractDomainRequest.java 2011-09-12 10:48:36 UTC (rev 34627) @@ -21,7 +21,7 @@ private String name; private SSHKey sshKey; - public AbstractDomainRequest(String name, SSHKey sshKey, ApplicationAction action, String username) { + public AbstractDomainRequest(String name, SSHKey sshKey, String username) { this(name, sshKey, username, false); } Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeCreateDomainRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeCreateDomainRequest.java 2011-09-12 10:36:39 UTC (rev 34626) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeCreateDomainRequest.java 2011-09-12 10:48:36 UTC (rev 34627) @@ -1,32 +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.internal.core.request; - -import org.jboss.ide.eclipse.as.openshift.core.SSHKey; - - -/** - * @author André Dietisheim - */ -public class ChangeCreateDomainRequest extends AbstractDomainRequest { - - public ChangeCreateDomainRequest(String name, String namespace, SSHKey sshKey, ApplicationAction action, String username) { - this(name, namespace, sshKey, username, false); - } - - public ChangeCreateDomainRequest(String name, String namespace, SSHKey sshKey, String username, boolean debug) { - super(name, sshKey, username, debug); - } - - public boolean isAlter() { - return true; - } -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeDomainRequest.java (from rev 34598, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeCreateDomainRequest.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeDomainRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeDomainRequest.java 2011-09-12 10:48:36 UTC (rev 34627) @@ -0,0 +1,32 @@ +/******************************************************************************* + * 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.internal.core.request; + +import org.jboss.ide.eclipse.as.openshift.core.SSHKey; + + +/** + * @author André Dietisheim + */ +public class ChangeDomainRequest extends AbstractDomainRequest { + + public ChangeDomainRequest(String name, SSHKey sshKey, String username) { + this(name, sshKey, username, false); + } + + public ChangeDomainRequest(String name, SSHKey sshKey, String username, boolean debug) { + super(name, sshKey, username, debug); + } + + public boolean isAlter() { + return true; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ChangeDomainRequest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java 2011-09-12 10:36:39 UTC (rev 34626) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java 2011-09-12 10:48:36 UTC (rev 34627) @@ -13,11 +13,13 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; 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.internal.marshalling.DomainRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ChangeDomainRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.CreateDomainRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; import org.jboss.ide.eclipse.as.openshift.internal.test.core.fakes.TestSSHKey; @@ -32,25 +34,11 @@ private static final String PASSWORD = "1q2w3e"; @Test - public void canMarshallDomainCreateResponse() throws IOException, OpenshiftException { + public void canMarshallDomainCreateRequest() throws IOException, OpenshiftException { SSHKey sshKey = TestSSHKey.create(); - String expectedRequestString = - "password=" - + PASSWORD - + "&json_data=%7B" - + "%22rhlogin%22+%3A+" - + "%22" - + URLEncoder.encode(USERNAME, "UTF-8") - + "%22" - + "%2C+%22debug%22+%3A+%22true%22" - + "%2C+%22namespace%22+%3A+%22toolsjboss%40gmail.com%22" - + "%2C+%22alter%22+%3A+%22false%22" - + "%2C+%22ssh%22+%3A+%22" - + URLEncoder.encode(sshKey.getPublicKeyContent(), "UTF-8") - + "%22" - + "%7D"; - - CreateDomainRequest request = new CreateDomainRequest(USERNAME, sshKey, USERNAME, true); + String expectedRequestString = createDomainRequestString(PASSWORD, USERNAME, true, "myDomain", false, sshKey.getPublicKeyContent()); + + CreateDomainRequest request = new CreateDomainRequest("myDomain", sshKey, USERNAME, true); String requestString = new OpenshiftJsonRequestFactory( PASSWORD, @@ -58,4 +46,37 @@ .create(); assertEquals(expectedRequestString, requestString); } + + @Test + public void canMarshallDomainAlterRequest() throws IOException, OpenshiftException { + SSHKey sshKey = TestSSHKey.create(); + String expectedRequestString = createDomainRequestString(PASSWORD, USERNAME, true, "myDomain", true, sshKey.getPublicKeyContent()); + + ChangeDomainRequest request = new ChangeDomainRequest("myDomain", sshKey, USERNAME, true); + String requestString = + new OpenshiftJsonRequestFactory( + PASSWORD, + new DomainRequestJsonMarshaller().marshall(request)) + .create(); + assertEquals(expectedRequestString, requestString); + } + + private String createDomainRequestString(String password, String username, boolean debug, String namespace, boolean alter, String sshPublicKey) throws UnsupportedEncodingException { + String request = + "password=" + + password + + "&json_data=%7B" + + "%22rhlogin%22+%3A+" + + "%22" + + URLEncoder.encode(username, "UTF-8") + + "%22" + + "%2C+%22debug%22+%3A+%22" + String.valueOf(debug)+ "%22" + + "%2C+%22namespace%22+%3A+%22" + URLEncoder.encode(namespace, "UTF-8")+ "%22" + + "%2C+%22alter%22+%3A+%22" + String.valueOf(alter)+ "%22" + + "%2C+%22ssh%22+%3A+%22" + + URLEncoder.encode(sshPublicKey, "UTF-8") + + "%22" + + "%7D"; + return request; + } }