From 291476efd15974dfc85f045866b9d6f59584e44f Mon Sep 17 00:00:00 2001 From: eawilliams Date: Mon, 8 Aug 2016 13:09:25 -0400 Subject: [PATCH] fixed minimizeJar cluster issue, formatting source --- pom.xml | 115 +++++++++--------- .../pirk/schema/data/DataSchemaLoader.java | 31 +++-- .../pirk/schema/query/QuerySchemaLoader.java | 23 ++-- 3 files changed, 84 insertions(+), 85 deletions(-) diff --git a/pom.xml b/pom.xml index 7d4c0bf0..91c67f3f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,20 +1,15 @@ - + @@ -199,9 +194,9 @@ commons-net - org.apache.hive - hive-service - + org.apache.hive + hive-service + org.slf4j slf4j-log4j12 @@ -406,13 +401,19 @@ true + implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"> + + org.tachyonproject:* + + org/tachyonproject/** + + *:* @@ -425,13 +426,13 @@ - - org.eclipse.m2e @@ -456,27 +457,27 @@ - + - - - org.apache.rat - - - apache-rat-plugin - - - [0.11,) - - - check - - - - - + + + org.apache.rat + + + apache-rat-plugin + + + [0.11,) + + + check + + + + + @@ -526,12 +527,13 @@ - + integration-tests - + org.apache.maven.plugins maven-failsafe-plugin @@ -548,12 +550,12 @@ - + contrib-check @@ -585,12 +587,11 @@ - + disable-doclint 1.8 diff --git a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java index ecb54c0b..bc938275 100644 --- a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java +++ b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java @@ -48,7 +48,8 @@ *

* Schemas should be specified as follows: * - * 

{@code
+ * 
+ * {@code
  * 
  *     name of the schema 
  *    
@@ -88,12 +89,10 @@ public class DataSchemaLoader
     }
   }
 
-
-
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link DataSchemaRegistry} with a list of
-   * available data schema names.
+   * Initializes the static {@link DataSchemaRegistry} with a list of available data schema names.
+   * 
    * @throws Exception
    */
   public static void initialize() throws Exception
@@ -103,14 +102,12 @@ public static void initialize() throws Exception
 
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link DataSchemaRegistry} with a list of
-   * available data schema names.
+   * Initializes the static {@link DataSchemaRegistry} with a list of available data schema names.
+   * 
    * @param hdfs
-   *          If true, specifies that the data schema is an hdfs file; if
-   *          false, that it is a regular file.
+   *          If true, specifies that the data schema is an hdfs file; if false, that it is a regular file.
    * @param fs
-   *          Used only when {@code hdfs} is true; the {@link FileSystem}
-   *          handle for the hdfs in which the data schema exists
+   *          Used only when {@code hdfs} is true; the {@link FileSystem} handle for the hdfs in which the data schema exists
    * @throws Exception
    */
   public static void initialize(boolean hdfs, FileSystem fs) throws Exception
@@ -173,9 +170,9 @@ public DataSchemaLoader()
    *          The source of the XML data schema description.
    * @return The data schema.
    * @throws IOException
-   *          A problem occurred reading from the given stream.
+   *           A problem occurred reading from the given stream.
    * @throws PIRException
-   *          The schema description is invalid.
+   *           The schema description is invalid.
    */
   public DataSchema loadSchema(InputStream stream) throws IOException, PIRException
   {
@@ -210,10 +207,10 @@ public DataSchema loadSchema(InputStream stream) throws IOException, PIRExceptio
 
   /**
    * Parses and normalizes the XML document available on the given stream.
+   * 
    * @param stream
    *          The input stream.
-   * @return
-   *          A {@link Document} representing the XML document.
+   * @return A {@link Document} representing the XML document.
    * @throws IOException
    * @throws PIRException
    */
@@ -236,6 +233,7 @@ private Document parseXMLDocument(InputStream stream) throws IOException, PIRExc
 
   /**
    * Extracts a data schema element node's contents
+   * 
    * @param eElement
    *          A data schema element node.
    * @param schema
@@ -312,8 +310,7 @@ void validateIsPrimitiveType(String typeName) throws PIRException
    *
    * @param partitionerTypeName
    *          The name of the {@link DataPartitioner} subclass to instantiate.
-   * @return
-   *          An instance of the named {@link DataPartitioner} subclass.
+   * @return An instance of the named {@link DataPartitioner} subclass.
    * @throws PIRException
    */
   DataPartitioner instantiatePartitioner(String partitionerTypeName) throws PIRException
diff --git a/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java b/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java
index dab0ecb4..78e5bc71 100644
--- a/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java
+++ b/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java
@@ -52,7 +52,8 @@
  * 

  * Schemas should be specified as follows:
  *
- * 
{@code
+ * 
+ * {@code
  * 
  *     name of the schema 
  *     name of the data schema over which this query is run 
@@ -93,8 +94,8 @@ public class QuerySchemaLoader
 
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link QuerySchemaRegistry} with a list of
-   * query schema names.
+   * Initializes the static {@link QuerySchemaRegistry} with a list of query schema names.
+   * 
    * @throws Exception
    */
   public static void initialize() throws Exception
@@ -104,14 +105,12 @@ public static void initialize() throws Exception
 
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link QuerySchemaRegistry} with a list of
-   * available query schema names.
+   * Initializes the static {@link QuerySchemaRegistry} with a list of available query schema names.
+   * 
    * @param hdfs
-   *    If true, specifies that the query schema is an hdfs file; if false,
-   *    that it is a regular file.
+   *          If true, specifies that the query schema is an hdfs file; if false, that it is a regular file.
    * @param fs
-   *    Used only when {@code hdfs} is true; the {@link FileSystem} handle
-   *    for the hdfs in which the query schema exists
+   *          Used only when {@code hdfs} is true; the {@link FileSystem} handle for the hdfs in which the query schema exists
    * @throws Exception
    */
   public static void initialize(boolean hdfs, FileSystem fs) throws Exception
@@ -175,9 +174,9 @@ public QuerySchemaLoader()
    *          The source of the XML query schema description.
    * @return The query schema.
    * @throws IOException
-   *          A problem occurred reading from the given stream.
+   *           A problem occurred reading from the given stream.
    * @throws PIRException
-   *          The schema description is invalid.
+   *           The schema description is invalid.
    */
   public QuerySchema loadSchema(InputStream stream) throws IOException, PIRException
   {
@@ -267,6 +266,7 @@ public QuerySchema loadSchema(InputStream stream) throws IOException, PIRExcepti
 
   /**
    * Parses and normalizes the XML document available on the given stream.
+   * 
    * @param stream
    *          The input stream.
    * @return A Document representing the XML document.
@@ -355,6 +355,7 @@ private String extractValue(Document doc, String tagName) throws PIRException
    * Instantiate the specified filter.
    *
    * Exceptions derive from call to the {@code getFilter} method of {@link FilterFactory}
+   * 
    * @param filterTypeName
    *          The name of the filter class we are instantiating
    * @param filteredElementNames