Author: adietish Date: 2011-09-07 13:42:48 -0400 (Wed, 07 Sep 2011) New Revision: 34571 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/CreateDomainRequest.java 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/OpenshiftException.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.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.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/OpenshiftJsonRequestFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftServiceIntegrationTest.java Log: [JBIDE-9510] implementing usecase of invalid credentials 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-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -24,4 +24,6 @@ public Application createApplication(String name, Cartridge cartridge) throws OpenshiftException; public Application destroyApplication(String name, Cartridge cartridge) throws OpenshiftException; + + public Application createDomain(String name) throws OpenshiftException; } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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 InvalidCredentialsOpenshiftException extends OpenshiftEndpointException { + + private static final long serialVersionUID = 1L; + + private String username; + private String password; + + public InvalidCredentialsOpenshiftException(String url, Throwable cause, String username, String password, String message, String... arguments) { + super(url, cause, message); + this.username = username; + this.password = password; + } + + protected String getUsername() { + return username; + } + + protected String getPassword() { + return password; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.java (from rev 34538, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -0,0 +1,31 @@ +/******************************************************************************* + * 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 OpenshiftEndpointException extends OpenshiftException { + + private static final long serialVersionUID = 1L; + private String url; + + public OpenshiftEndpointException(String url, Throwable cause, String message, Object... arguments) { + super(cause, message, arguments); + this.url = url; + } + + protected String getUrl() { + return url; + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.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/OpenshiftException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java 2011-09-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.core; +import java.text.MessageFormat; + /** * @author André Dietisheim */ @@ -17,16 +19,7 @@ private static final long serialVersionUID = 1L; - public OpenshiftException(String message, Throwable cause) { - super(message, cause); + public OpenshiftException(Throwable cause, String message, Object... arguments) { + super(MessageFormat.format(message, arguments), cause); } - - public OpenshiftException(String message) { - super(message); - } - - public OpenshiftException(Throwable cause) { - super(cause); - } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftService.java 2011-09-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftService.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -14,7 +14,6 @@ import java.net.URL; import java.util.List; -import org.eclipse.osgi.util.NLS; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ListCartridgesRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; @@ -47,43 +46,44 @@ public UserInfo getUserInfo() throws OpenshiftException { UserInfoRequest userInfoRequest = new UserInfoRequest(username, true); + String url = userInfoRequest.getUrlString(BASE_URL); try { String userInfoRequestString = new UserInfoRequestJsonMarshaller().marshall(userInfoRequest); String request = new OpenshiftJsonRequestFactory(password, userInfoRequestString).create(); - String userInfoResponse = createHttpClient(userInfoRequest.getUrl(BASE_URL)).post(request); + String userInfoResponse = createHttpClient(url).post(request); throw new UnsupportedOperationException(); } catch (MalformedURLException e) { - throw new OpenshiftException( - NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username, - userInfoRequest.getUrlString(BASE_URL)), e); + throw new OpenshiftEndpointException( + url, e, "Could not get user info for user \"{0}\" at \"{1}\"", username, url, e); } catch (HttpClientException e) { - throw new OpenshiftException( - NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username, - userInfoRequest.getUrlString(BASE_URL)), e); + throw new OpenshiftEndpointException( + url, e, "Could not get user info for user \"{0}\" at \"{1}\"", username, url, e); } } @Override public List<Cartridge> getCartridges() throws OpenshiftException { ListCartridgesRequest listCartridgesRequest = new ListCartridgesRequest(username, true); + String url = listCartridgesRequest.getUrlString(BASE_URL); try { String listCartridgesRequestString = new ListCartridgesRequestJsonMarshaller().marshall(listCartridgesRequest); String request = new OpenshiftJsonRequestFactory(password, listCartridgesRequestString).create(); - String listCatridgesReponse = createHttpClient(listCartridgesRequest.getUrl(BASE_URL)).post(request); + String listCatridgesReponse = createHttpClient(url).post(request); throw new UnsupportedOperationException(); } catch (MalformedURLException e) { - throw new OpenshiftException( - NLS.bind("Could not list available cartridges at \"{0}\"", - listCartridgesRequest.getUrlString(BASE_URL)), e); + throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); } catch (HttpClientException e) { - throw new OpenshiftException( - NLS.bind("Could not list available cartridges at \"{0}\"", - listCartridgesRequest.getUrlString(BASE_URL)), e); + throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); } } @Override + public Application createDomain(String name) throws OpenshiftException { + throw new UnsupportedOperationException(); + } + + @Override public Application createApplication(String name, Cartridge cartridge) throws OpenshiftException { return requestApplicationAction(name, cartridge, new ApplicationRequest(name, cartridge, ApplicationAction.CONFIGURE, username, true)); @@ -97,30 +97,28 @@ protected Application requestApplicationAction(String name, Cartridge cartridge, ApplicationRequest applicationRequest) throws OpenshiftException { + String url = applicationRequest.getUrlString(BASE_URL); try { String applicationRequestString = new ApplicationRequestJsonMarshaller().marshall(applicationRequest); String request = new OpenshiftJsonRequestFactory(password, applicationRequestString).create(); - String response = createHttpClient(applicationRequest.getUrl(BASE_URL)).post(request); + String response = createHttpClient(url).post(request); OpenshiftResponse<Application> openshiftResponse = new ApplicationResponseUnmarshaller(response, name, cartridge).unmarshall(); return openshiftResponse.getData(); } catch (MalformedURLException e) { - throw new OpenshiftException( - NLS.bind( - "Could not {0} application \"{1}\" at \"{2}\"", new String[] { - applicationRequest.getAction().toHumanReadable(), name, - applicationRequest.getUrlString(BASE_URL) }), e); + throw new OpenshiftEndpointException( + url, e, "Could not {0} application \"{1}\" at \"{2}\"", + applicationRequest.getAction().toHumanReadable(), name, url); } catch (HttpClientException e) { - throw new OpenshiftException( - NLS.bind("Could not {0} application \"{1}\" at \"{2}\"", new String[] { - applicationRequest.getAction().toHumanReadable(), name, - applicationRequest.getUrlString(BASE_URL) }), e); + throw new OpenshiftEndpointException( + url, e, "Could not {0} application \"{1}\" at \"{2}\"", + applicationRequest.getAction().toHumanReadable(), name, url); } } - private IHttpClient createHttpClient(URL url) { - return new UrlConnectionHttpClient(url); + private IHttpClient createHttpClient(String url) throws MalformedURLException { + return new UrlConnectionHttpClient(new URL(url)); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java 2011-09-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -1,7 +1,22 @@ +/******************************************************************************* + * 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; +/** + * @author André Dietisheim + */ public class HttpClientException extends Exception { + private static final long serialVersionUID = 1L; + public HttpClientException(String message, Throwable cause) { super(message, cause); } 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-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -44,11 +44,12 @@ private HttpClientException getException(IOException ioe, HttpURLConnection connection) { try { + String errorMessage = StreamUtils.readToString(connection.getErrorStream()); int responseCode = connection.getResponseCode(); if (responseCode == 500) { - return new InternalServerErrorException(ioe); + return new InternalServerErrorException(errorMessage, ioe); } else { - return new HttpClientException(ioe); + return new HttpClientException(errorMessage, ioe); } } catch (IOException e) { return new HttpClientException(e); Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/CreateDomainRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/CreateDomainRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/CreateDomainRequest.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -0,0 +1,50 @@ +/******************************************************************************* + * 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; + + +/** + * @author André Dietisheim + */ +public class CreateDomainRequest extends AbstractOpenshiftRequest { + + private String name; + private String sshKey; + private String namespace; + + public CreateDomainRequest(String name, String namespace, String sshKey, ApplicationAction action, String username) { + this(name, namespace, sshKey, username, false); + } + + public CreateDomainRequest(String name, String namespace, String sshKey, String username, boolean debug) { + super(username, debug); + this.name = name; + this.namespace = namespace; + this.sshKey = sshKey; + } + + public String getName() { + return name; + } + + protected String getSshKey() { + return sshKey; + } + + protected String getNamespace() { + return namespace; + } + + @Override + public String getResourcePath() { + return "domain"; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/CreateDomainRequest.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/request/OpenshiftJsonRequestFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/OpenshiftJsonRequestFactory.java 2011-09-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/OpenshiftJsonRequestFactory.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -13,6 +13,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftEndpointException; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; /** @@ -45,7 +46,7 @@ appendPayload(builder); return builder.toString(); } catch (UnsupportedEncodingException e) { - throw new OpenshiftException("Could not create request", e); + throw new OpenshiftException(e, "Could not create request"); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-09-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.internal.core.response; -import org.eclipse.osgi.util.NLS; import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; @@ -37,9 +36,9 @@ OPENSHIFTOBJECT openshiftObject = createOpenshiftObject(node.get(IOpenshiftJsonConstants.PROPERTY_DATA)); return new OpenshiftResponse<OPENSHIFTOBJECT>(debug, messages, result, openshiftObject, exitCode); } catch (IllegalArgumentException e) { - throw new OpenshiftException(NLS.bind("Could not parse response \"{0}\"", response), e); + throw new OpenshiftException(e, "Could not parse response \"{0}\"", response); } catch (Exception e) { - throw new OpenshiftException(NLS.bind("Could not unmarshall response \"{0}\"", response), e); + throw new OpenshiftException(e, "Could not unmarshall response \"{0}\"", response); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftServiceIntegrationTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftServiceIntegrationTest.java 2011-09-07 14:03:16 UTC (rev 34570) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftServiceIntegrationTest.java 2011-09-07 17:42:48 UTC (rev 34571) @@ -6,6 +6,7 @@ import java.util.List; import org.jboss.ide.eclipse.as.openshift.core.Application; +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.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.internal.core.Cartridge; @@ -15,13 +16,15 @@ public class OpenshiftServiceIntegrationTest { private OpenshiftService openshiftService; + private OpenshiftService invalidCredentialsOpenshiftService; private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; - private static final String PASSWORD = "1q3e5t7u"; + private static final String PASSWORD = "1q2w3e"; @Before public void setUp() { this.openshiftService = new OpenshiftService(USERNAME, PASSWORD); + this.invalidCredentialsOpenshiftService = new OpenshiftService(USERNAME, "bogus"); } @Test(expected=OpenshiftException.class) @@ -36,10 +39,18 @@ assertTrue(cartridges.size() > 0); } + @Test(expected=InvalidCredentialsOpenshiftException.class) + public void createApplicationWithInvalidCredentialsThrowsException() throws Exception { + invalidCredentialsOpenshiftService.createApplication(createRandomApplicationName(), Cartridge.JBOSSAS_7); + } + @Test public void canCreateApplication() throws Exception { Application application = openshiftService.createApplication("test-application", Cartridge.JBOSSAS_7); assertNotNull(application); } + private String createRandomApplicationName() { + return String.valueOf(System.currentTimeMillis()); + } }