Author: adietish Date: 2011-01-11 06:51:14 -0500 (Tue, 11 Jan 2011) New Revision: 28092 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java Log: [JBIDE-7695] delayed URL creation to request time. Gained capability to store invalid urls and report them at request time. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 11:51:14 UTC (rev 28092) @@ -1,5 +1,30 @@ 2011-01-11 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + * src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java: + * src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java: + (urlString): + (url): + (getUrl): + (toString): + (getUrlString): + * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java + (request): + [JBIDE-7695] delayed URL creation to request time. Gained capability to store invalid urls and report them at request time. * src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java: * src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java: * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -74,36 +74,27 @@ private static final String DOCUMENT_ELEMENT_DRIVER = "driver"; private static final String DOCUMENT_ELEMENT_API = "api"; - public static enum DeltaCloudServerType { - UNKNOWN, MOCK, EC2 - } - - private URL baseUrl; + private String baseUrl; private String username; private String password; private DocumentBuilderFactory documentBuilderFactory; + public static enum DeltaCloudServerType { + UNKNOWN, MOCK, EC2 + } + public DeltaCloudClientImpl(String url) throws MalformedURLException, DeltaCloudClientException { this(url, null, null); } public DeltaCloudClientImpl(String url, String username, String password) throws DeltaCloudClientException { - this.baseUrl = createUrl(url); + this.baseUrl = url; this.username = username; this.password = password; this.documentBuilderFactory = DocumentBuilderFactory.newInstance(); } - private URL createUrl(String url) throws DeltaCloudClientException { - try { - return new URL(url); - } catch (MalformedURLException e) { - throw new DeltaCloudClientException(MessageFormat.format( - "Could not create url for {0}", url), e); - } - } - protected InputStream request(DeltaCloudRequest deltaCloudRequest) throws DeltaCloudClientException { DefaultHttpClient httpClient = new DefaultHttpClient(); @@ -119,12 +110,12 @@ return httpResponse.getEntity().getContent(); } catch (DeltaCloudClientException e) { throw e; + } catch (MalformedURLException e) { + throw new DeltaCloudClientException(MessageFormat.format("Could not connect to \"{0}\". The url is invalid.", deltaCloudRequest.toString()), e); } catch (IOException e) { throw new DeltaCloudClientException(e); } catch (Exception e) { throw new DeltaCloudClientException(e); - } finally { - // httpClient.getConnectionManager().shutdown(); } } @@ -455,15 +446,11 @@ public boolean performInstanceAction(InstanceAction action) throws DeltaCloudClientException { if (action != null) { try { - InputStream inputStream = request(new PerformInstanceActionRequest( - new URL(action.getUrl()), action.getMethod())); + InputStream inputStream = request( + new PerformInstanceActionRequest(action.getUrl(), action.getMethod())); if (!InstanceAction.DESTROY.equals(action.getName())) { new InstanceUnmarshaller().unmarshall(inputStream, action.getOwner()); } - } catch (MalformedURLException e) { - throw new DeltaCloudClientException( - MessageFormat.format("Could not perform action {0} on instance {1}", action.getName(), action - .getOwner().getName()), e); } catch (DeltaCloudClientException e) { throw e; } catch (Exception e) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -21,28 +21,40 @@ */ public abstract class AbstractDeltaCloudRequest implements DeltaCloudRequest { + private String urlString; private URL url; private HttpMethod httpMethod; private UrlBuilder urlBuilder; - protected AbstractDeltaCloudRequest(URL baseURL, HttpMethod httpMethod) { + protected AbstractDeltaCloudRequest(String baseURL, HttpMethod httpMethod) { this.httpMethod = httpMethod; this.urlBuilder = createUrlBuilder(baseURL); } protected abstract String doCreateUrl(UrlBuilder urlBuilder); - protected UrlBuilder createUrlBuilder(URL baseURL) { - return new UrlBuilder(baseURL).path(API_PATH_SEGMENT); + protected UrlBuilder createUrlBuilder(String baseUrl) { + return new UrlBuilder(baseUrl).path(API_PATH_SEGMENT); } public URL getUrl() throws MalformedURLException { if (url == null) { - this.url = new URL(doCreateUrl(urlBuilder)); + this.url = new URL(getUrlString()); } return url; } + protected String getUrlString() { + if (urlString == null) { + this.urlString = doCreateUrl(urlBuilder); + } + return urlString; + } + + public String toString() { + return getUrlString(); + } + public HttpMethod getHttpMethod() { return httpMethod; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * Lists images, instances, realms or profiles on the deltacloud server. * @@ -30,7 +27,7 @@ private String objectType; - public AbstractListObjectsRequest(URL baseUrl, String objectType) { + public AbstractListObjectsRequest(String baseUrl, String objectType) { super(baseUrl, HttpMethod.GET); this.objectType = objectType; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; @@ -30,11 +28,11 @@ private String memory; private String storage; - public CreateInstanceRequest(URL baseUrl, String imageId) { + public CreateInstanceRequest(String baseUrl, String imageId) { this(baseUrl, null, imageId, null, null, null, null, null); } - public CreateInstanceRequest(URL baseUrl, String name, String imageId, String profileId, String realmId, + public CreateInstanceRequest(String baseUrl, String name, String imageId, String profileId, String realmId, String keyId, String memory, String storage) { super(baseUrl, HttpMethod.POST); this.name = name; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; @@ -24,7 +22,7 @@ private String keyName; - public CreateKeyRequest(URL baseUrl, String keyName) { + public CreateKeyRequest(String baseUrl, String keyName) { super(baseUrl, HttpMethod.POST); this.keyName = keyName; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * Deletes a key on the deltacloud server * @@ -25,7 +22,7 @@ private String keyName; - public DeleteKeyRequest(URL baseUrl, String keyName) { + public DeleteKeyRequest(String baseUrl, String keyName) { super(baseUrl, HttpMethod.DELETE); this.keyName = keyName; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * A request for a hardware profile on a deltacloud server. * @@ -31,7 +28,7 @@ * @param baseUrl the base url * @param imageId */ - public ListHardwareProfileRequest(URL baseUrl, String profileId) { + public ListHardwareProfileRequest(String baseUrl, String profileId) { super(baseUrl, HttpMethod.GET); this.profileId = profileId; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - - /** * Lists profiles on the deltacloud server. * @@ -20,7 +17,7 @@ */ public class ListHardwareProfilesRequest extends AbstractListObjectsRequest { - public ListHardwareProfilesRequest(URL baseUrl) { + public ListHardwareProfilesRequest(String baseUrl) { super(baseUrl, "hardware_profiles"); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; @@ -25,7 +23,7 @@ private String imageId; - public ListImageRequest(URL baseUrl, String imageId) { + public ListImageRequest(String baseUrl, String imageId) { super(baseUrl, HttpMethod.GET); this.imageId = imageId; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - - /** * Lists images on the deltacloud server. * @@ -20,7 +17,7 @@ */ public class ListImagesRequest extends AbstractListObjectsRequest { - public ListImagesRequest(URL baseUrl) { + public ListImagesRequest(String baseUrl) { super(baseUrl, "images"); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * Lists an instance on the deltacloud server * @@ -25,7 +22,7 @@ private String instanceId; - public ListInstanceRequest(URL baseUrl, String instanceId) { + public ListInstanceRequest(String baseUrl, String instanceId) { super(baseUrl, HttpMethod.GET); this.instanceId = instanceId; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - - /** * Lists instances on the deltacloud server. * @@ -20,7 +17,7 @@ */ public class ListInstancesRequest extends AbstractListObjectsRequest { - public ListInstancesRequest(URL baseUrl) { + public ListInstancesRequest(String baseUrl) { super(baseUrl, "instances"); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * List a key with a given name that is available on the deltacloud server * @@ -25,7 +22,7 @@ private String name; - public ListKeyRequest(URL baseUrl, String name) { + public ListKeyRequest(String baseUrl, String name) { super(baseUrl, HttpMethod.GET); this.name = name; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * Lists keys available on the deltacloud server * @@ -23,7 +20,7 @@ */ public class ListKeysRequest extends AbstractDeltaCloudRequest { - public ListKeysRequest(URL baseUrl) { + public ListKeysRequest(String baseUrl) { super(baseUrl, HttpMethod.GET); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * Lists a realm on the deltacloud server * @@ -25,7 +22,7 @@ private String realmId; - public ListRealmRequest(URL baseUrl, String realmId) { + public ListRealmRequest(String baseUrl, String realmId) { super(baseUrl, HttpMethod.GET); this.realmId = realmId; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - - /** * Lists realms on the deltacloud server. * @@ -20,7 +17,7 @@ */ public class ListRealmsRequest extends AbstractListObjectsRequest { - public ListRealmsRequest(URL baseUrl) { + public ListRealmsRequest(String baseUrl) { super(baseUrl, "realms"); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * Performs an action on a instance on the deltacloud server * @@ -23,7 +20,7 @@ */ public class PerformInstanceActionRequest extends AbstractDeltaCloudRequest { - public PerformInstanceActionRequest(URL url, HttpMethod httpMethod) { + public PerformInstanceActionRequest(String url, HttpMethod httpMethod) { super(url, httpMethod); } @@ -33,7 +30,7 @@ } @Override - protected UrlBuilder createUrlBuilder(URL baseURL) { + protected UrlBuilder createUrlBuilder(String baseURL) { return new UrlBuilder(baseURL); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client.request; -import java.net.URL; - import org.jboss.tools.deltacloud.core.client.HttpMethod; import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder; - /** * A request for the type of deltacloud server. * @@ -23,7 +20,7 @@ */ public class TypeRequest extends AbstractDeltaCloudRequest { - public TypeRequest(URL baseUrl) { + public TypeRequest(String baseUrl) { super(baseUrl, HttpMethod.GET); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2011-01-11 10:32:07 UTC (rev 28091) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2011-01-11 11:51:14 UTC (rev 28092) @@ -34,6 +34,10 @@ public UrlBuilder() { } + public UrlBuilder(String baseUrl) { + urlStringBuilder.append(baseUrl); + } + public UrlBuilder(URL baseUrl) { urlStringBuilder.append(baseUrl.toString()); } @@ -123,10 +127,6 @@ } public String toString() { - try { - return toUrl().toString(); - } catch (MalformedURLException e) { - throw new RuntimeException(e.getMessage(), e); - } + return urlStringBuilder.toString(); } }