Merge pull request apache#53 from sahilTakiar/master

Fixing build and find bugs warnings
mayoor · Mar 16, 2015 · beab089 · beab089
2 parents 790bb7b + 84cc397
commit beab089
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -141,7 +141,7 @@ subprojects {
     }
   }
 
-  if (isDefaultEnvironment && !project.name.equals('gobblin-compaction')) {
+  if (isDefaultEnvironment) {
     task sourcesJar(type: Jar, dependsOn: classes) {
       from sourceSets.main.allSource
       classifier = 'sources'

diff --git a/gobblin-compaction/build.gradle b/gobblin-compaction/build.gradle
@@ -51,4 +51,6 @@ task createCompactionTar(type: Tar) {
 
 createCompactionTar.dependsOn ':gobblin-compaction:jar'
 
-artifacts { archives createCompactionTar }
+artifacts {
+  archives createCompactionTar
+}
diff --git a/gobblin-compaction/src/main/java/gobblin/hive/util/HiveJdbcConnector.java b/gobblin-compaction/src/main/java/gobblin/hive/util/HiveJdbcConnector.java
@@ -14,7 +14,9 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.sql.PreparedStatement;
@@ -88,7 +90,7 @@ public static HiveJdbcConnector newConnectorWithProps(Properties compactRunProps
 
     // Set the Hive Server type
     if (compactRunProps.containsKey(HIVESERVER_VERSION)) {
-      hiveJdbcConnector.withHiveServerVersion(Integer.valueOf(compactRunProps.getProperty(HIVESERVER_VERSION, DEFAULT_HIVESERVER_VERSION)));
+      hiveJdbcConnector.withHiveServerVersion(Integer.parseInt(compactRunProps.getProperty(HIVESERVER_VERSION, DEFAULT_HIVESERVER_VERSION)));
     }
 
     // Add the Hive Site Dir to the classpath
@@ -189,8 +191,16 @@ private void addHiveSiteDirToClasspath(String hiveSiteDir) {
       Method method = urlClass.getDeclaredMethod("addURL", new Class[] { URL.class });
       method.setAccessible(true);
       method.invoke(urlClassLoader, new Object[] { u });
-    } catch (Exception e) {
-      throw new RuntimeException("Unable to add hive.site.dir to CLASSPATH");
+    } catch (NoSuchMethodException e) {
+      throw new RuntimeException("Unable to add hive.site.dir to CLASSPATH", e);
+    } catch (IllegalArgumentException e) {
+      throw new RuntimeException("Unable to add hive.site.dir to CLASSPATH", e);
+    } catch (IllegalAccessException e) {
+      throw new RuntimeException("Unable to add hive.site.dir to CLASSPATH", e);
+    } catch (InvocationTargetException e) {
+      throw new RuntimeException("Unable to add hive.site.dir to CLASSPATH", e);
+    } catch (MalformedURLException e) {
+      throw new RuntimeException("Unable to add hive.site.dir to CLASSPATH", e);
     }
   }