Merge pull request #323 from simon04/influxdb-exceptions

Replace RuntimeException with InfluxDBException

Author: majst01

src/main/java/org/influxdb/InfluxDBException.java

@@ -0,0 +1,21 @@
+package org.influxdb;
+
+/**
+ * A wrapper for various exceptions caused while interacting with InfluxDB.
+ *
+ * @author Simon Legner
+ */
+public class InfluxDBException extends RuntimeException {
+
+  public InfluxDBException(final String message) {
+    super(message);
+  }
+
+  public InfluxDBException(final String message, final Throwable cause) {
+    super(message, cause);
+  }
+
+  public InfluxDBException(final Throwable cause) {
+    super(cause);
+  }
+}

src/main/java/org/influxdb/InfluxDBIOException.java

@@ -0,0 +1,15 @@
+package org.influxdb;
+
+import java.io.IOException;
+
+/**
+ * A wrapper for {@link IOException} caused while interacting with InfluxDB.
+ *
+ * @author Simon Legner
+ */
+public class InfluxDBIOException extends InfluxDBException {
+
+  public InfluxDBIOException(final IOException cause) {
+    super(cause);
+  }
+}

src/main/java/org/influxdb/dto/Query.java

@@ -105,7 +105,7 @@ public static String encode(final String command) {
     try {
       return URLEncoder.encode(command, StandardCharsets.UTF_8.name());
     } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
+      throw new IllegalStateException("Every JRE must support UTF-8", e);
     }
   }
 }

src/main/java/org/influxdb/impl/InfluxDBImpl.java

@@ -10,6 +10,8 @@
 import com.squareup.moshi.Moshi;
 
 import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBException;
+import org.influxdb.InfluxDBIOException;
 import org.influxdb.dto.BatchPoints;
 import org.influxdb.dto.Point;
 import org.influxdb.dto.Pong;
@@ -105,7 +107,7 @@ private InetAddress parseHostAddress(final String url) {
       try {
           return InetAddress.getByName(httpUrl.host());
       } catch (UnknownHostException e) {
-          throw new RuntimeException(e);
+          throw new InfluxDBIOException(e);
       }
   }
 
@@ -227,7 +229,7 @@ public Pong ping() {
       pong.setResponseTime(watch.elapsed(TimeUnit.MILLISECONDS));
       return pong;
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      throw new InfluxDBIOException(e);
     }
   }
 
@@ -310,7 +312,7 @@ public void write(final int udpPort, final String records) {
     try {
         datagramSocket.send(new DatagramPacket(bytes, bytes.length, hostAddress, udpPort));
     } catch (IOException e) {
-        throw new RuntimeException(e);
+        throw new InfluxDBIOException(e);
     }
   }
 
@@ -321,7 +323,7 @@ private void initialDatagramSocket() {
                 try {
                     datagramSocket = new DatagramSocket();
                 } catch (SocketException e) {
-                    throw new RuntimeException(e);
+                    throw new InfluxDBIOException(e);
                 }
             }
         }
@@ -360,7 +362,7 @@ public QueryResult query(final Query query) {
     public void query(final Query query, final int chunkSize, final Consumer<QueryResult> consumer) {
 
         if (version().startsWith("0.") || version().startsWith("1.0")) {
-            throw new RuntimeException("chunking not supported");
+            throw new UnsupportedOperationException("chunking not supported");
         }
 
         Call<ResponseBody> call = this.influxDBService.query(this.username, this.password,
@@ -380,20 +382,20 @@ public void onResponse(final Call<ResponseBody> call, final Response<ResponseBod
                         }
                     }
                     try (ResponseBody errorBody = response.errorBody()) {
-                        throw new RuntimeException(errorBody.string());
+                        throw new InfluxDBException(errorBody.string());
                     }
                 } catch (EOFException e) {
                     QueryResult queryResult = new QueryResult();
                     queryResult.setError("DONE");
                     consumer.accept(queryResult);
                 } catch (IOException e) {
-                    throw new RuntimeException(e);
+                    throw new InfluxDBIOException(e);
                 }
             }
 
             @Override
             public void onFailure(final Call<ResponseBody> call, final Throwable t) {
-                throw new RuntimeException(t);
+                throw new InfluxDBException(t);
             }
         });
   }
@@ -469,10 +471,10 @@ private <T> T execute(final Call<T> call) {
         return response.body();
       }
       try (ResponseBody errorBody = response.errorBody()) {
-        throw new RuntimeException(errorBody.string());
+        throw new InfluxDBException(errorBody.string());
       }
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      throw new InfluxDBIOException(e);
     }
   }