Author: adietish Date: 2011-09-08 03:47:01 -0400 (Thu, 08 Sep 2011) New Revision: 34577 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/NotFoundException.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UnauthorizedException.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java Modified: 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/core/OpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java Log: [JBIDE-9510] implemented invalid credentials Modified: 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 2011-09-08 00:36:21 UTC (rev 34576) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -18,20 +18,7 @@ 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) { + public InvalidCredentialsOpenshiftException(String url, Throwable cause, String message, String... arguments) { super(url, cause, message); - this.username = username; - this.password = password; } - - protected String getUsername() { - return username; - } - - protected String getPassword() { - return password; - } } Modified: 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/core/OpenshiftEndpointException.java 2011-09-08 00:36:21 UTC (rev 34576) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -17,6 +17,7 @@ public class OpenshiftEndpointException extends OpenshiftException { private static final long serialVersionUID = 1L; + private String url; public OpenshiftEndpointException(String url, Throwable cause, String message, Object... arguments) { 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-08 00:36:21 UTC (rev 34576) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftService.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -19,6 +19,7 @@ import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.internal.core.HttpClientException; +import org.jboss.ide.eclipse.as.openshift.internal.core.UnauthorizedException; import org.jboss.ide.eclipse.as.openshift.internal.core.UrlConnectionHttpClient; import org.jboss.ide.eclipse.as.openshift.internal.core.UserInfo; import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationAction; @@ -107,9 +108,13 @@ cartridge).unmarshall(); return openshiftResponse.getData(); } catch (MalformedURLException e) { - throw new OpenshiftEndpointException( - url, e, "Could not {0} application \"{1}\" at \"{2}\"", + throw new OpenshiftException( + e, "Could not {0} application \"{1}\" at \"{2}\": Invalid url \"{2}\"", applicationRequest.getAction().toHumanReadable(), name, 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); } catch (HttpClientException e) { throw new OpenshiftEndpointException( url, e, "Could not {0} application \"{1}\" at \"{2}\"", Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java 2011-09-08 00:36:21 UTC (rev 34576) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -1,17 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.internal.core; - -public class HttpClientNotFoundException extends HttpClientException { - - public HttpClientNotFoundException(String message, Throwable cause) { - super(message, cause); - } - - public HttpClientNotFoundException(String message) { - super(message); - } - - private HttpClientNotFoundException(Throwable cause) { - super(cause); - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java 2011-09-08 00:36:21 UTC (rev 34576) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -1,16 +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.internal.core; +/** + * @author André Dietisheim + */ public class InternalServerErrorException extends HttpClientException { - InternalServerErrorException(String message, Throwable cause) { + private static final long serialVersionUID = 1L; + + public InternalServerErrorException(String message, Throwable cause) { super(message, cause); } - InternalServerErrorException(String message) { + public InternalServerErrorException(String message) { super(message); } - InternalServerErrorException(Throwable cause) { + public InternalServerErrorException(Throwable cause) { super(cause); } Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/NotFoundException.java (from rev 34533, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/NotFoundException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/NotFoundException.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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 NotFoundException extends HttpClientException { + + private static final long serialVersionUID = 1L; + + public NotFoundException(String message, Throwable cause) { + super(message, cause); + } + + private NotFoundException(Throwable cause) { + super(cause); + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/NotFoundException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UnauthorizedException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UnauthorizedException.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UnauthorizedException.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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 UnauthorizedException extends HttpClientException { + + private static final long serialVersionUID = 1L; + + public UnauthorizedException(String message, Throwable cause) { + super(message, cause); + } + + public UnauthorizedException(Throwable cause) { + super(cause); + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UnauthorizedException.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/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-08 00:36:21 UTC (rev 34576) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java 2011-09-08 07:47:01 UTC (rev 34577) @@ -28,11 +28,8 @@ StreamUtils.writeTo(data.getBytes(), connection.getOutputStream()); return StreamUtils.readToString(connection.getInputStream()); } catch (FileNotFoundException e) { - /* - * thrown by #connect when server resonds with 404 - */ - throw new HttpClientNotFoundException( - MessageFormat.format("Could not find resource {0}", url.toString())); + throw new NotFoundException( + MessageFormat.format("Could not find resource {0}", url.toString()), e); } catch (IOException e) { throw getException(e, connection); } finally { @@ -44,11 +41,14 @@ private HttpClientException getException(IOException ioe, HttpURLConnection connection) { try { + int responseCode = connection.getResponseCode(); String errorMessage = StreamUtils.readToString(connection.getErrorStream()); - int responseCode = connection.getResponseCode(); - if (responseCode == 500) { + switch (responseCode) { + case 500: return new InternalServerErrorException(errorMessage, ioe); - } else { + case 401: + return new UnauthorizedException(errorMessage, ioe); + default: return new HttpClientException(errorMessage, ioe); } } catch (IOException e) {