Merge pull request #60 from indigo-dc/new_exception

New exception

Author: micafer

src/main/java/es/upv/i3m/grycap/im/InfrastructureManager.java

@@ -99,6 +99,26 @@ private ImClient getImClient() {
     return imClient;
   }
 
+  /**
+   * Set the client connection timeout in milliseconds.
+   *
+   * @param connectTimeout
+   *          : int with the client connection timeout
+   */
+  public void setConnectTimeout(final int connectTimeout) {
+    imClient.setConnectTimeout(connectTimeout);
+  }
+
+  /**
+   * Set the client read timeout in milliseconds.
+   *
+   * @param readTimeout
+   *          : int with the client read timeout
+   */
+  public void setReadTimeout(final int readTimeout) {
+    imClient.setReadTimeout(readTimeout);
+  }
+
   /**
    * Create and configure an infrastructure with the requirements specified in
    * the document of the body contents.<br>

src/main/java/es/upv/i3m/grycap/im/exceptions/ImClientServerErrorException.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright (C) GRyCAP - I3M - UPV 
+ *
+ * <p>Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package es.upv.i3m.grycap.im.exceptions;
+
+import es.upv.i3m.grycap.im.pojo.ResponseError;
+
+public class ImClientServerErrorException extends ImClientException {
+
+  private static final long serialVersionUID = 6007438931649254821L;
+  private final ResponseError responseError;
+
+  public ImClientServerErrorException(ResponseError responseError) {
+    this.responseError = responseError;
+  }
+
+  public ResponseError getResponseError() {
+    return responseError;
+  }
+
+}

src/main/java/es/upv/i3m/grycap/im/rest/client/ImClient.java

@@ -22,6 +22,7 @@
 import es.upv.i3m.grycap.file.Utf8File;
 import es.upv.i3m.grycap.im.exceptions.ImClientErrorException;
 import es.upv.i3m.grycap.im.exceptions.ImClientException;
+import es.upv.i3m.grycap.im.exceptions.ImClientServerErrorException;
 import es.upv.i3m.grycap.im.lang.ImMessages;
 import es.upv.i3m.grycap.im.pojo.ResponseError;
 import es.upv.i3m.grycap.im.rest.client.parameters.RestParameter;
@@ -30,6 +31,7 @@
 
 import java.nio.file.Path;
 
+import javax.ws.rs.ServerErrorException;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Entity;
@@ -87,26 +89,22 @@ public ImClient(final String targetUrl, final String authorizationHeader)
   }
 
   /**
-   * Creates a new client using the 'imServiceUrl' as endpoint.<br>
-   * Loads the authorization credentials from the 'authorizationHeader'
-   * parameter. It also enables to set the read and connection timeouts.
+   * Set the client connection timeout in milliseconds.
    *
-   * @param targetUrl
-   *          : url of the IM rest service
-   * @param authorizationHeader
-   *          : string with the authorization content
    * @param connectTimeout
    *          : int with the client connection timeout
+   */
+  public void setConnectTimeout(final int connectTimeout) {
+    this.client.property("jersey.config.client.connectTimeout", connectTimeout);
+  }
+
+  /**
+   * Set the client read timeout in milliseconds.
+   *
    * @param readTimeout
    *          : int with the client read timeout
    */
-  public ImClient(final String targetUrl, final String authorizationHeader,
-      final int connectTimeout, final int readTimeout)
-      throws ImClientException {
-    this.targetUrl = targetUrl;
-    this.authorizationHeader = authorizationHeader;
-    this.client = createRestClient();
-    this.client.property("jersey.config.client.connectTimeout", connectTimeout);
+  public void setReadTimeout(final int readTimeout) {
     this.client.property("jersey.config.client.readTimeout", readTimeout);
   }
 
@@ -148,6 +146,8 @@ public <T> T get(final String path, final Class<T> type,
       logCallInfo(HttpMethods.GET, path);
       return configureClient(path, parameters).get(type);
 
+    } catch (ServerErrorException exception) {
+      throw new ImClientServerErrorException(createReponseError(exception));
     } catch (WebApplicationException exception) {
       throw new ImClientErrorException(createReponseError(exception));
     }
@@ -163,6 +163,8 @@ public <T> T delete(final String path, final Class<T> type,
       Builder clientConfigured = configureClient(path, parameters);
       return clientConfigured.delete(type);
 
+    } catch (ServerErrorException exception) {
+      throw new ImClientServerErrorException(createReponseError(exception));
     } catch (WebApplicationException exception) {
       throw new ImClientErrorException(createReponseError(exception));
     }
@@ -199,6 +201,8 @@ public <T> T post(final String path, final String bodyContent,
           Entity.entity(normalizedBodyContent, contentType);
       Builder clientConfigured = configureClient(path, parameters);
       return clientConfigured.post(content, type);
+    } catch (ServerErrorException exception) {
+      throw new ImClientServerErrorException(createReponseError(exception));
     } catch (WebApplicationException exception) {
       throw new ImClientErrorException(createReponseError(exception));
     }
@@ -229,6 +233,8 @@ public <T> T put(final String path, final String bodyContent,
           Entity.entity(normalizedBodyContent, contentType);
       Builder clientConfigured = configureClient(path, parameters);
       return clientConfigured.put(content, type);
+    } catch (ServerErrorException exception) {
+      throw new ImClientServerErrorException(createReponseError(exception));
     } catch (WebApplicationException exception) {
       throw new ImClientErrorException(createReponseError(exception));
     }

src/test/java/es/upv/i3m/grycap/im/InfrastructureManagerTest.java

@@ -99,6 +99,8 @@ public static void setRestClient() {
     try {
       im = new InfrastructureManager(IM_DUMMY_PROVIDER_URL,
           Paths.get(AUTH_FILE_PATH));
+      im.setConnectTimeout(100000);
+      im.setReadTimeout(100000);
     } catch (ImClientException exception) {
       ImJavaApiLogger.severe(InfrastructureManagerTest.class,
           exception.getMessage());
@@ -141,6 +143,10 @@ public void testCreateAndDestroyAsyncInfrastructure() throws ImClientException {
     String uri = newInfrastructureUri.getUri();
     Assert.assertEquals(false, uri.isEmpty());
     String infId = newInfrastructureUri.getInfrastructureId();
+    try {
+      Thread.sleep(3000);
+    } catch (Exception e) {
+    }
     getIm().destroyInfrastructure(infId);
   }
 

src/test/java/es/upv/i3m/grycap/im/rest/client/ImClientTest.java

@@ -17,6 +17,7 @@
 package es.upv.i3m.grycap.im.rest.client;
 
 import es.upv.i3m.grycap.ImTestWatcher;
+import es.upv.i3m.grycap.im.exceptions.ImClientServerErrorException;
 import es.upv.i3m.grycap.im.exceptions.ImClientErrorException;
 import es.upv.i3m.grycap.im.exceptions.ImClientException;
 import es.upv.i3m.grycap.im.pojo.ResponseError;
@@ -34,6 +35,7 @@ public class ImClientTest extends ImTestWatcher {
   private static final String AUTH_FILE_PATH = "./src/test/resources/auth.dat";
   private static final Integer EXPECTED_ERROR_CODE = 404;
   private static final String EXPECTED_ERROR_MESSAGE = "Not found: '/'";
+  private static final String IM_FAKE_PROVIDER_URL = "http://localhost:1234";
 
   private ImClient getImClient() {
     return imClient;