diff --git ant/checkstyle.xml ant/checkstyle.xml
new file mode 100644
index 0000000..0ba0626
--- /dev/null
+++ ant/checkstyle.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git ant/deploy.xml ant/deploy.xml
index 7e2934c..84c3648 100644
--- ant/deploy.xml
+++ ant/deploy.xml
@@ -21,9 +21,11 @@
xmlns:artifact="artifact:org.apache.maven.artifact.ant">
+
+ classpath="${path.to.basedir}/build/maven-ant-tasks-${maven-ant-tasks.version}.jar"/>
diff --git apache_header_java.txt apache_header_java.txt
new file mode 100644
index 0000000..5d5f1e3
--- /dev/null
+++ apache_header_java.txt
@@ -0,0 +1,17 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
diff --git build.xml build.xml
index 37af4a7..76b8cb4 100644
--- build.xml
+++ build.xml
@@ -186,7 +186,7 @@
Build both clientjar and server-extensions
================================================================================
-->
-
+
@@ -530,6 +530,7 @@
+
diff --git coding_style.xml coding_style.xml
new file mode 100644
index 0000000..2ba8723
--- /dev/null
+++ coding_style.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java
index 4b0e189..734b758 100644
--- hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java
+++ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatLoader.java hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatLoader.java
index 579811a..0b94b20 100644
--- hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatLoader.java
+++ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatLoader.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -40,14 +40,13 @@ import org.apache.hcatalog.mapreduce.HCatInputFormat;
import org.apache.hcatalog.mapreduce.InputJobInfo;
import org.apache.pig.Expression;
import org.apache.pig.Expression.BinaryExpression;
-import org.apache.pig.LoadFunc;
import org.apache.pig.PigException;
import org.apache.pig.ResourceSchema;
import org.apache.pig.ResourceStatistics;
import org.apache.pig.impl.util.UDFContext;
/**
- * Pig {@link LoadFunc} to read data from HCat
+ * Pig {@link org.apache.pig.LoadFunc} to read data from HCat
*/
public class HCatLoader extends HCatBaseLoader {
diff --git hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java
index 7696587..9f5b4a2 100644
--- hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java
+++ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java
@@ -28,7 +28,6 @@ import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.security.Credentials;
import org.apache.hcatalog.common.HCatConstants;
import org.apache.hcatalog.common.HCatContext;
diff --git hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java
index 3550488..aaf12c2 100644
--- hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java
+++ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/LoadFuncBasedInputFormat.java hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/LoadFuncBasedInputFormat.java
index c6ecae3..940e2c0 100644
--- hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/LoadFuncBasedInputFormat.java
+++ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/LoadFuncBasedInputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -33,12 +33,12 @@ import org.apache.pig.LoadFunc;
import org.apache.pig.LoadMetadata;
import org.apache.pig.ResourceSchema;
import org.apache.pig.ResourceSchema.ResourceFieldSchema;
-import org.apache.pig.builtin.PigStorage;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
+
/**
- * based on {@link PigStorage}
+ * based on {@link org.apache.pig.builtin.PigStorage}
*/
public class LoadFuncBasedInputFormat extends InputFormat {
diff --git hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/StoreFuncBasedOutputFormat.java hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/StoreFuncBasedOutputFormat.java
index 67a4ccd..b43c2d2 100644
--- hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/StoreFuncBasedOutputFormat.java
+++ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/StoreFuncBasedOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,7 +19,6 @@
package org.apache.hcatalog.pig.drivers;
import java.io.IOException;
-import java.lang.reflect.Method;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapreduce.Job;
@@ -34,11 +33,9 @@ import org.apache.hcatalog.common.HCatUtil;
import org.apache.hcatalog.mapreduce.OutputJobInfo;
import org.apache.hcatalog.pig.PigHCatUtil;
import org.apache.pig.ResourceSchema;
-import org.apache.pig.StoreFunc;
import org.apache.pig.StoreFuncInterface;
import org.apache.pig.StoreMetadata;
import org.apache.pig.data.Tuple;
-import org.apache.pig.impl.logicalLayer.schema.Schema;
public class StoreFuncBasedOutputFormat extends
OutputFormat {
diff --git hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MockLoader.java hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MockLoader.java
index a082d8e..d95b1de 100644
--- hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MockLoader.java
+++ hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MockLoader.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MyPigStorage.java hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MyPigStorage.java
index ba409df..74e69c4 100644
--- hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MyPigStorage.java
+++ hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MyPigStorage.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java
index 6ad08eb..0ce1088 100644
--- hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java
+++ hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.hcatalog.pig;
import com.google.common.collect.Lists;
diff --git ivy.xml ivy.xml
index 0230b5c..71a21df 100644
--- ivy.xml
+++ ivy.xml
@@ -73,5 +73,7 @@
+
+
diff --git ivy/libraries.properties ivy/libraries.properties
index 4d199f3..a7597ba 100644
--- ivy/libraries.properties
+++ ivy/libraries.properties
@@ -28,6 +28,7 @@ commons-io.version=2.4
commons-lang.version=2.4
commons-logging.version=1.1.1
commons-pool.version=1.5.4
+checkstyle.version=5.5
datanucleus-connectionpool.version=2.0.3
datanucleus-core.version=2.0.3
datanucleus-enhancer.version=2.0.3
@@ -38,6 +39,7 @@ guava.version=11.0.2
hadoop20.version=1.0.3
hadoop23.version=0.23.1
hbase.version=0.92.0
+hcatalog.version=0.5.0-SNAPSHOT
high-scale-lib.version=1.1.1
hive.version=0.10.0-SNAPSHOT
ivy.version=2.2.0
diff --git pom.xml pom.xml
new file mode 100644
index 0000000..29bdefe
--- /dev/null
+++ pom.xml
@@ -0,0 +1,56 @@
+
+
+
+ org.apache
+ apache
+ 11
+
+
+
+
+
+ org.codehaus.mojo
+ properties-maven-plugin
+ 1.0-alpha-2
+
+
+ initialize
+
+ read-project-properties
+
+
+
+ ivy/libraries.properties
+
+
+
+
+
+
+
+
+
+ 4.0.0
+ org.apache.hcatalog
+ hcatalog
+ ${hcatalog.version}
+ pom
+
+
+
+
+
+ datanucleus
+ datanucleus maven repository
+ http://www.datanucleus.org/downloads/maven2
+ default
+
+ true
+ warn
+
+
+
+
+
diff --git shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java
index f1c7ded..000689b 100644
--- shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java
+++ shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.hcatalog.shims;
import java.io.IOException;
diff --git shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java
index e7bf16a..57276a8 100644
--- shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java
+++ shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -26,12 +26,10 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.JobID;
import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.TaskID;
import org.apache.hadoop.mapreduce.TaskType;
import org.apache.hadoop.mapreduce.task.JobContextImpl;
-import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
import org.apache.hadoop.util.Progressable;
import org.apache.pig.ResourceSchema;
diff --git src/java/org/apache/hadoop/mapred/HCatMapRedUtil.java src/java/org/apache/hadoop/mapred/HCatMapRedUtil.java
index ae2a298..e090c57 100644
--- src/java/org/apache/hadoop/mapred/HCatMapRedUtil.java
+++ src/java/org/apache/hadoop/mapred/HCatMapRedUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/cli/HCatCli.java src/java/org/apache/hcatalog/cli/HCatCli.java
index 4572195..6bef627 100644
--- src/java/org/apache/hcatalog/cli/HCatCli.java
+++ src/java/org/apache/hcatalog/cli/HCatCli.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/cli/HCatDriver.java src/java/org/apache/hcatalog/cli/HCatDriver.java
index 69d8e99..3c6ba1d 100644
--- src/java/org/apache/hcatalog/cli/HCatDriver.java
+++ src/java/org/apache/hcatalog/cli/HCatDriver.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java
index 603fc72..71e8f39 100644
--- src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java
+++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
index f28431e..169e776 100644
--- src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
+++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
index 7d7adf3..2bd7490 100644
--- src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
+++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/common/ErrorType.java src/java/org/apache/hcatalog/common/ErrorType.java
index e43638c..9aeb91e 100644
--- src/java/org/apache/hcatalog/common/ErrorType.java
+++ src/java/org/apache/hcatalog/common/ErrorType.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/common/HCatConstants.java src/java/org/apache/hcatalog/common/HCatConstants.java
index b7cde4b..e826620 100644
--- src/java/org/apache/hcatalog/common/HCatConstants.java
+++ src/java/org/apache/hcatalog/common/HCatConstants.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/common/HCatContext.java src/java/org/apache/hcatalog/common/HCatContext.java
index 5ad9a32..ac357ae 100644
--- src/java/org/apache/hcatalog/common/HCatContext.java
+++ src/java/org/apache/hcatalog/common/HCatContext.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/common/HCatException.java src/java/org/apache/hcatalog/common/HCatException.java
index 0a35ed3..deb2e1f 100644
--- src/java/org/apache/hcatalog/common/HCatException.java
+++ src/java/org/apache/hcatalog/common/HCatException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/common/HCatUtil.java src/java/org/apache/hcatalog/common/HCatUtil.java
index 6043618..e10747d 100644
--- src/java/org/apache/hcatalog/common/HCatUtil.java
+++ src/java/org/apache/hcatalog/common/HCatUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/common/HiveClientCache.java src/java/org/apache/hcatalog/common/HiveClientCache.java
index 56697ad..e45ab3c 100644
--- src/java/org/apache/hcatalog/common/HiveClientCache.java
+++ src/java/org/apache/hcatalog/common/HiveClientCache.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/DataType.java src/java/org/apache/hcatalog/data/DataType.java
index c4642d8..a0a0739 100644
--- src/java/org/apache/hcatalog/data/DataType.java
+++ src/java/org/apache/hcatalog/data/DataType.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/DefaultHCatRecord.java src/java/org/apache/hcatalog/data/DefaultHCatRecord.java
index 5606c54..25af53d 100644
--- src/java/org/apache/hcatalog/data/DefaultHCatRecord.java
+++ src/java/org/apache/hcatalog/data/DefaultHCatRecord.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.hcatalog.common.HCatException;
-import org.apache.hcatalog.common.HCatUtil;
import org.apache.hcatalog.data.schema.HCatSchema;
public class DefaultHCatRecord extends HCatRecord {
diff --git src/java/org/apache/hcatalog/data/HCatRecord.java src/java/org/apache/hcatalog/data/HCatRecord.java
index 9404a7d..5735b05 100644
--- src/java/org/apache/hcatalog/data/HCatRecord.java
+++ src/java/org/apache/hcatalog/data/HCatRecord.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import org.apache.hcatalog.common.HCatException;
-import org.apache.hcatalog.common.HCatUtil;
import org.apache.hcatalog.data.schema.HCatSchema;
/**
diff --git src/java/org/apache/hcatalog/data/HCatRecordObjectInspector.java src/java/org/apache/hcatalog/data/HCatRecordObjectInspector.java
index afe1c26..060a66f 100644
--- src/java/org/apache/hcatalog/data/HCatRecordObjectInspector.java
+++ src/java/org/apache/hcatalog/data/HCatRecordObjectInspector.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/HCatRecordObjectInspectorFactory.java src/java/org/apache/hcatalog/data/HCatRecordObjectInspectorFactory.java
index 39caf77..384d52f 100644
--- src/java/org/apache/hcatalog/data/HCatRecordObjectInspectorFactory.java
+++ src/java/org/apache/hcatalog/data/HCatRecordObjectInspectorFactory.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/HCatRecordSerDe.java src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
index 6aaf283..e827b27 100644
--- src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
+++ src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/HCatRecordable.java src/java/org/apache/hcatalog/data/HCatRecordable.java
index 68d8d8b..2d2c4fc 100644
--- src/java/org/apache/hcatalog/data/HCatRecordable.java
+++ src/java/org/apache/hcatalog/data/HCatRecordable.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -20,7 +20,6 @@ package org.apache.hcatalog.data;
import java.util.List;
import org.apache.hadoop.io.Writable;
-import org.apache.hcatalog.common.HCatException;
/**
* Interface that determines whether we can implement a HCatRecord on top of it
@@ -31,7 +30,6 @@ public interface HCatRecordable extends Writable {
* Gets the field at the specified index.
* @param fieldNum the field number
* @return the object at the specified index
- * @throws HCatException
*/
Object get(int fieldNum);
diff --git src/java/org/apache/hcatalog/data/JsonSerDe.java src/java/org/apache/hcatalog/data/JsonSerDe.java
index f162b06..29adc71 100644
--- src/java/org/apache/hcatalog/data/JsonSerDe.java
+++ src/java/org/apache/hcatalog/data/JsonSerDe.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/LazyHCatRecord.java src/java/org/apache/hcatalog/data/LazyHCatRecord.java
index 18c1292..51e9857 100644
--- src/java/org/apache/hcatalog/data/LazyHCatRecord.java
+++ src/java/org/apache/hcatalog/data/LazyHCatRecord.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/Pair.java src/java/org/apache/hcatalog/data/Pair.java
index c4e0d1c..dea9d27 100644
--- src/java/org/apache/hcatalog/data/Pair.java
+++ src/java/org/apache/hcatalog/data/Pair.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/ReaderWriter.java src/java/org/apache/hcatalog/data/ReaderWriter.java
index 83856e7..4210133 100644
--- src/java/org/apache/hcatalog/data/ReaderWriter.java
+++ src/java/org/apache/hcatalog/data/ReaderWriter.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/schema/HCatFieldSchema.java src/java/org/apache/hcatalog/data/schema/HCatFieldSchema.java
index c8ad37c..39d26a7 100644
--- src/java/org/apache/hcatalog/data/schema/HCatFieldSchema.java
+++ src/java/org/apache/hcatalog/data/schema/HCatFieldSchema.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/schema/HCatSchema.java src/java/org/apache/hcatalog/data/schema/HCatSchema.java
index 370a5e5..b93a1b6 100644
--- src/java/org/apache/hcatalog/data/schema/HCatSchema.java
+++ src/java/org/apache/hcatalog/data/schema/HCatSchema.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/schema/HCatSchemaUtils.java src/java/org/apache/hcatalog/data/schema/HCatSchemaUtils.java
index 9906873..ca7afa0 100644
--- src/java/org/apache/hcatalog/data/schema/HCatSchemaUtils.java
+++ src/java/org/apache/hcatalog/data/schema/HCatSchemaUtils.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/data/transfer/ReadEntity.java src/java/org/apache/hcatalog/data/transfer/ReadEntity.java
index 45e01d9..0cf5225 100644
--- src/java/org/apache/hcatalog/data/transfer/ReadEntity.java
+++ src/java/org/apache/hcatalog/data/transfer/ReadEntity.java
@@ -85,4 +85,4 @@ public class ReadEntity extends EntityBase.Entity {
return new ReadEntity(this);
}
}
-}
\ No newline at end of file
+}
diff --git src/java/org/apache/hcatalog/data/transfer/impl/HCatInputFormatReader.java src/java/org/apache/hcatalog/data/transfer/impl/HCatInputFormatReader.java
index 3580612..663a6a6 100644
--- src/java/org/apache/hcatalog/data/transfer/impl/HCatInputFormatReader.java
+++ src/java/org/apache/hcatalog/data/transfer/impl/HCatInputFormatReader.java
@@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.RecordReader;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
diff --git src/java/org/apache/hcatalog/data/transfer/impl/HCatOutputFormatWriter.java src/java/org/apache/hcatalog/data/transfer/impl/HCatOutputFormatWriter.java
index c30ca36..e3489fa 100644
--- src/java/org/apache/hcatalog/data/transfer/impl/HCatOutputFormatWriter.java
+++ src/java/org/apache/hcatalog/data/transfer/impl/HCatOutputFormatWriter.java
@@ -25,14 +25,11 @@ import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.JobStatus.State;
import org.apache.hadoop.mapreduce.OutputCommitter;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
-import org.apache.hadoop.mapreduce.TaskID;
-import org.apache.hadoop.mapreduce.TaskType;
import org.apache.hcatalog.common.ErrorType;
import org.apache.hcatalog.common.HCatException;
import org.apache.hcatalog.data.HCatRecord;
diff --git src/java/org/apache/hcatalog/data/transfer/state/StateProvider.java src/java/org/apache/hcatalog/data/transfer/state/StateProvider.java
index 4b09a59..2ab6251 100644
--- src/java/org/apache/hcatalog/data/transfer/state/StateProvider.java
+++ src/java/org/apache/hcatalog/data/transfer/state/StateProvider.java
@@ -21,7 +21,7 @@ package org.apache.hcatalog.data.transfer.state;
/**
* If external system wants to communicate any state to slaves, they can do so
* via this interface. One example of this in case of Map-Reduce is ids assigned
- * by {@link JobTracker} to {@link TaskTracker}
+ * by JobTracker to TaskTracker.
*/
public interface StateProvider {
diff --git src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
index 1c661c6..41a81b3 100644
--- src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
+++ src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/listener/NotificationListener.java src/java/org/apache/hcatalog/listener/NotificationListener.java
index 63775f7..8529c5a 100644
--- src/java/org/apache/hcatalog/listener/NotificationListener.java
+++ src/java/org/apache/hcatalog/listener/NotificationListener.java
@@ -370,4 +370,4 @@ public class NotificationListener extends MetaStoreEventListener {
public void onAlterTable(AlterTableEvent ate) throws MetaException {
// no-op
}
-}
\ No newline at end of file
+}
diff --git src/java/org/apache/hcatalog/mapreduce/DefaultOutputCommitterContainer.java src/java/org/apache/hcatalog/mapreduce/DefaultOutputCommitterContainer.java
index 3854348..cc0ae9e 100644
--- src/java/org/apache/hcatalog/mapreduce/DefaultOutputCommitterContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/DefaultOutputCommitterContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/DefaultOutputFormatContainer.java src/java/org/apache/hcatalog/mapreduce/DefaultOutputFormatContainer.java
index 0845bec..e05fd01 100644
--- src/java/org/apache/hcatalog/mapreduce/DefaultOutputFormatContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/DefaultOutputFormatContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/DefaultRecordWriterContainer.java src/java/org/apache/hcatalog/mapreduce/DefaultRecordWriterContainer.java
index b32af0a..884791d 100644
--- src/java/org/apache/hcatalog/mapreduce/DefaultRecordWriterContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/DefaultRecordWriterContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java
index e9f3fa3..1c99440 100644
--- src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -52,11 +52,7 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
diff --git src/java/org/apache/hcatalog/mapreduce/FileOutputFormatContainer.java src/java/org/apache/hcatalog/mapreduce/FileOutputFormatContainer.java
index 1e8d999..edb1f27 100644
--- src/java/org/apache/hcatalog/mapreduce/FileOutputFormatContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/FileOutputFormatContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
index 0ab447d..9e21316 100644
--- src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/FosterStorageHandler.java src/java/org/apache/hcatalog/mapreduce/FosterStorageHandler.java
index db4480e..27a6ed6 100644
--- src/java/org/apache/hcatalog/mapreduce/FosterStorageHandler.java
+++ src/java/org/apache/hcatalog/mapreduce/FosterStorageHandler.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java src/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java
index 0f97d33..b484a02 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java
index e76690f..1ea8a62 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -23,8 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.OutputFormat;
diff --git src/java/org/apache/hcatalog/mapreduce/HCatInputFormat.java src/java/org/apache/hcatalog/mapreduce/HCatInputFormat.java
index b8ca706..f1d8276 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatInputFormat.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatInputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
index 688ffb7..153aa12 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/HCatRecordReader.java src/java/org/apache/hcatalog/mapreduce/HCatRecordReader.java
index e761f80..73c4186 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatRecordReader.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatRecordReader.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/HCatSplit.java src/java/org/apache/hcatalog/mapreduce/HCatSplit.java
index 4e68f65..c510b9c 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatSplit.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatSplit.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java src/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
index d764c35..d1ebf63 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/HCatTableInfo.java src/java/org/apache/hcatalog/mapreduce/HCatTableInfo.java
index 16423fa..468d573 100644
--- src/java/org/apache/hcatalog/mapreduce/HCatTableInfo.java
+++ src/java/org/apache/hcatalog/mapreduce/HCatTableInfo.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/InitializeInput.java src/java/org/apache/hcatalog/mapreduce/InitializeInput.java
index 1baef53..9732896 100644
--- src/java/org/apache/hcatalog/mapreduce/InitializeInput.java
+++ src/java/org/apache/hcatalog/mapreduce/InitializeInput.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java
index c483953..f39e6eb 100644
--- src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java
+++ src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/InternalUtil.java src/java/org/apache/hcatalog/mapreduce/InternalUtil.java
index f88c6db..10a0ee9 100644
--- src/java/org/apache/hcatalog/mapreduce/InternalUtil.java
+++ src/java/org/apache/hcatalog/mapreduce/InternalUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java
index 41d458f..134c052 100644
--- src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java
+++ src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -33,7 +33,6 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
diff --git src/java/org/apache/hcatalog/mapreduce/OutputCommitterContainer.java src/java/org/apache/hcatalog/mapreduce/OutputCommitterContainer.java
index 0dc4400..9d6408e 100644
--- src/java/org/apache/hcatalog/mapreduce/OutputCommitterContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/OutputCommitterContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/OutputFormatContainer.java src/java/org/apache/hcatalog/mapreduce/OutputFormatContainer.java
index 516bf76..db60253 100644
--- src/java/org/apache/hcatalog/mapreduce/OutputFormatContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/OutputFormatContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java
index bd3ffa3..0d77e25 100644
--- src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java
+++ src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/PartInfo.java src/java/org/apache/hcatalog/mapreduce/PartInfo.java
index 235233f..7fe0a9d 100644
--- src/java/org/apache/hcatalog/mapreduce/PartInfo.java
+++ src/java/org/apache/hcatalog/mapreduce/PartInfo.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,11 +21,7 @@ import java.io.Serializable;
import java.util.Map;
import java.util.Properties;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.ql.plan.TableDesc;
-
import org.apache.hcatalog.data.schema.HCatSchema;
-import org.apache.hcatalog.mapreduce.HCatStorageHandler;
/** The Class used to serialize the partition information read from the metadata server that maps to a partition. */
public class PartInfo implements Serializable {
diff --git src/java/org/apache/hcatalog/mapreduce/ProgressReporter.java src/java/org/apache/hcatalog/mapreduce/ProgressReporter.java
index febda6a..0ef359c 100644
--- src/java/org/apache/hcatalog/mapreduce/ProgressReporter.java
+++ src/java/org/apache/hcatalog/mapreduce/ProgressReporter.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/RecordWriterContainer.java src/java/org/apache/hcatalog/mapreduce/RecordWriterContainer.java
index 84d0a94..1b40838 100644
--- src/java/org/apache/hcatalog/mapreduce/RecordWriterContainer.java
+++ src/java/org/apache/hcatalog/mapreduce/RecordWriterContainer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/Security.java src/java/org/apache/hcatalog/mapreduce/Security.java
index b2b15dd..2ff7e2f 100644
--- src/java/org/apache/hcatalog/mapreduce/Security.java
+++ src/java/org/apache/hcatalog/mapreduce/Security.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/mapreduce/StorerInfo.java src/java/org/apache/hcatalog/mapreduce/StorerInfo.java
index ec85e66..e404b61 100644
--- src/java/org/apache/hcatalog/mapreduce/StorerInfo.java
+++ src/java/org/apache/hcatalog/mapreduce/StorerInfo.java
@@ -1,19 +1,21 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you 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
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* 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.
+ * 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 org.apache.hcatalog.mapreduce;
import java.io.Serializable;
diff --git src/java/org/apache/hcatalog/oozie/JavaAction.java src/java/org/apache/hcatalog/oozie/JavaAction.java
index cb65272..ef20ce5 100644
--- src/java/org/apache/hcatalog/oozie/JavaAction.java
+++ src/java/org/apache/hcatalog/oozie/JavaAction.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/rcfile/RCFileMapReduceInputFormat.java src/java/org/apache/hcatalog/rcfile/RCFileMapReduceInputFormat.java
index 1d32d4a..6ca0cd8 100644
--- src/java/org/apache/hcatalog/rcfile/RCFileMapReduceInputFormat.java
+++ src/java/org/apache/hcatalog/rcfile/RCFileMapReduceInputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
index 53a9957..792d7a2 100644
--- src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
+++ src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/rcfile/RCFileMapReduceRecordReader.java src/java/org/apache/hcatalog/rcfile/RCFileMapReduceRecordReader.java
index 22e171d..7a30eaa 100644
--- src/java/org/apache/hcatalog/rcfile/RCFileMapReduceRecordReader.java
+++ src/java/org/apache/hcatalog/rcfile/RCFileMapReduceRecordReader.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/java/org/apache/hcatalog/shims/HCatHadoopShims.java src/java/org/apache/hcatalog/shims/HCatHadoopShims.java
index e285035..2be4509 100644
--- src/java/org/apache/hcatalog/shims/HCatHadoopShims.java
+++ src/java/org/apache/hcatalog/shims/HCatHadoopShims.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -27,7 +27,6 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.JobID;
import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.TaskID;
import org.apache.hadoop.util.Progressable;
diff --git src/java/org/apache/hcatalog/storagehandler/DummyHCatAuthProvider.java src/java/org/apache/hcatalog/storagehandler/DummyHCatAuthProvider.java
index fbadb77..33bdee0 100644
--- src/java/org/apache/hcatalog/storagehandler/DummyHCatAuthProvider.java
+++ src/java/org/apache/hcatalog/storagehandler/DummyHCatAuthProvider.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/e2e/hcatalog/tools/generate/java/org/apache/hadoop/hive/tools/generate/RCFileGenerator.java src/test/e2e/hcatalog/tools/generate/java/org/apache/hadoop/hive/tools/generate/RCFileGenerator.java
index a269d44..1ac5382 100644
--- src/test/e2e/hcatalog/tools/generate/java/org/apache/hadoop/hive/tools/generate/RCFileGenerator.java
+++ src/test/e2e/hcatalog/tools/generate/java/org/apache/hadoop/hive/tools/generate/RCFileGenerator.java
@@ -20,14 +20,11 @@ package org.apache.hadoop.hive.tools.generate;
import java.util.Properties;
import java.util.Random;
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.PrintWriter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.compress.DefaultCodec;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataReaderSlave.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataReaderSlave.java
index 48257cb..b3cf98c 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataReaderSlave.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataReaderSlave.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterMaster.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterMaster.java
index 3dcc1ec..909b23f 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterMaster.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterMaster.java
@@ -31,8 +31,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Map.Entry;
-import javax.imageio.stream.FileImageInputStream;
-
import org.apache.hcatalog.common.HCatException;
import org.apache.hcatalog.data.transfer.DataTransferFactory;
import org.apache.hcatalog.data.transfer.HCatWriter;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterSlave.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterSlave.java
index 735501c..fe72b84 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterSlave.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterSlave.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/GroupByAge.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/GroupByAge.java
index 7abaab3..0675099 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/GroupByAge.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/GroupByAge.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java
index c420233..d72bf6f 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
@@ -32,7 +31,6 @@ import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.Reducer;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
import org.apache.hadoop.util.GenericOptionsParser;
import org.apache.hadoop.util.Tool;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTestDriver.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTestDriver.java
index f32a364..5c80644 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTestDriver.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTestDriver.java
@@ -18,7 +18,6 @@
package org.apache.hcatalog.utils;
-import org.apache.hcatalog.utils.TypeDataCheck;
import org.apache.hadoop.util.ProgramDriver;
/**
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTypeCheck.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTypeCheck.java
index 0a279f0..1ce838d 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTypeCheck.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTypeCheck.java
@@ -18,7 +18,6 @@
package org.apache.hcatalog.utils;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadJson.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadJson.java
index cc1da1b..a3d7df3 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadJson.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadJson.java
@@ -19,14 +19,11 @@
package org.apache.hcatalog.utils;
import java.io.IOException;
-import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
@@ -40,7 +37,6 @@ import org.apache.hcatalog.data.DefaultHCatRecord;
import org.apache.hcatalog.data.HCatRecord;
import org.apache.hcatalog.mapreduce.HCatInputFormat;
import org.apache.hcatalog.mapreduce.InputJobInfo;
-import org.apache.pig.data.DataBag;
/**
* This is a map reduce test for testing hcat which goes against the "numbers"
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadRC.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadRC.java
index 884fa42..5bafc04 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadRC.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadRC.java
@@ -23,9 +23,7 @@ import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
@@ -39,7 +37,6 @@ import org.apache.hcatalog.data.DefaultHCatRecord;
import org.apache.hcatalog.data.HCatRecord;
import org.apache.hcatalog.mapreduce.HCatInputFormat;
import org.apache.hcatalog.mapreduce.InputJobInfo;
-import org.apache.pig.data.DataBag;
/**
* This is a map reduce test for testing hcat which goes against the "numbers"
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadText.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadText.java
index 7797ce1..9f15c01 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadText.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadText.java
@@ -23,9 +23,7 @@ import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/StoreDemo.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/StoreDemo.java
index 4c97057..d35ceac 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/StoreDemo.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/StoreDemo.java
@@ -21,7 +21,6 @@ package org.apache.hcatalog.utils;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.Random;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/TypeDataCheck.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/TypeDataCheck.java
index 16f29fb..44ede23 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/TypeDataCheck.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/TypeDataCheck.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
import org.apache.hadoop.util.GenericOptionsParser;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
-import org.apache.hcatalog.utils.Util;
import org.apache.hcatalog.common.HCatConstants;
import org.apache.hcatalog.data.HCatRecord;
import org.apache.hcatalog.data.schema.HCatSchema;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteJson.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteJson.java
index 55fff1d..994feec 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteJson.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteJson.java
@@ -19,11 +19,9 @@
package org.apache.hcatalog.utils;
import java.io.IOException;
-import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteRC.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteRC.java
index 83eacfc..c3e84d5 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteRC.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteRC.java
@@ -19,11 +19,9 @@
package org.apache.hcatalog.utils;
import java.io.IOException;
-import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteText.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteText.java
index c7293f0..de47cf2 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteText.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteText.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
diff --git src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteTextPartitioned.java src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteTextPartitioned.java
index 9630ccf..a2e6167 100644
--- src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteTextPartitioned.java
+++ src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteTextPartitioned.java
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
diff --git src/test/org/apache/hcatalog/ExitException.java src/test/org/apache/hcatalog/ExitException.java
index 2062f2c..4b56efd 100644
--- src/test/org/apache/hcatalog/ExitException.java
+++ src/test/org/apache/hcatalog/ExitException.java
@@ -34,4 +34,4 @@ public class ExitException extends SecurityException {
super("Raising exception, instead of System.exit(). Return code was: "+status);
this.status = status;
}
-}
\ No newline at end of file
+}
diff --git src/test/org/apache/hcatalog/NoExitSecurityManager.java src/test/org/apache/hcatalog/NoExitSecurityManager.java
index 2cc6ff6..8e775a7 100644
--- src/test/org/apache/hcatalog/NoExitSecurityManager.java
+++ src/test/org/apache/hcatalog/NoExitSecurityManager.java
@@ -38,4 +38,4 @@ public class NoExitSecurityManager extends SecurityManager {
super.checkExit(status);
throw new ExitException(status);
}
-}
\ No newline at end of file
+}
diff --git src/test/org/apache/hcatalog/cli/DummyStorageHandler.java src/test/org/apache/hcatalog/cli/DummyStorageHandler.java
index cf0d28f..f1d8b13 100644
--- src/test/org/apache/hcatalog/cli/DummyStorageHandler.java
+++ src/test/org/apache/hcatalog/cli/DummyStorageHandler.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/cli/TestPermsGrp.java src/test/org/apache/hcatalog/cli/TestPermsGrp.java
index 5c094ac..c5abe4d 100644
--- src/test/org/apache/hcatalog/cli/TestPermsGrp.java
+++ src/test/org/apache/hcatalog/cli/TestPermsGrp.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -44,7 +44,7 @@ import org.apache.hadoop.hive.serde.Constants;
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hcatalog.ExitException;
import org.apache.hcatalog.NoExitSecurityManager;
-import org.apache.hcatalog.cli.HCatCli;
+
import org.apache.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer;
import org.apache.hcatalog.common.HCatConstants;
import org.apache.thrift.TException;
diff --git src/test/org/apache/hcatalog/cli/TestSemanticAnalysis.java src/test/org/apache/hcatalog/cli/TestSemanticAnalysis.java
index b19b357..a8924ab 100644
--- src/test/org/apache/hcatalog/cli/TestSemanticAnalysis.java
+++ src/test/org/apache/hcatalog/cli/TestSemanticAnalysis.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/cli/TestUseDatabase.java src/test/org/apache/hcatalog/cli/TestUseDatabase.java
index 1570b5f..403a13f 100644
--- src/test/org/apache/hcatalog/cli/TestUseDatabase.java
+++ src/test/org/apache/hcatalog/cli/TestUseDatabase.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/common/TestHCatUtil.java src/test/org/apache/hcatalog/common/TestHCatUtil.java
index 7e658a7..c528dc6 100644
--- src/test/org/apache/hcatalog/common/TestHCatUtil.java
+++ src/test/org/apache/hcatalog/common/TestHCatUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/common/TestHiveClientCache.java src/test/org/apache/hcatalog/common/TestHiveClientCache.java
index b6241ef..91c9e38 100644
--- src/test/org/apache/hcatalog/common/TestHiveClientCache.java
+++ src/test/org/apache/hcatalog/common/TestHiveClientCache.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -34,7 +34,12 @@ import org.apache.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer;
import org.apache.thrift.TException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.slf4j.Logger;
diff --git src/test/org/apache/hcatalog/data/HCatDataCheckUtil.java src/test/org/apache/hcatalog/data/HCatDataCheckUtil.java
index cfd3e5f..1973285 100644
--- src/test/org/apache/hcatalog/data/HCatDataCheckUtil.java
+++ src/test/org/apache/hcatalog/data/HCatDataCheckUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/data/TestDefaultHCatRecord.java src/test/org/apache/hcatalog/data/TestDefaultHCatRecord.java
index 250c5dc..4537219 100644
--- src/test/org/apache/hcatalog/data/TestDefaultHCatRecord.java
+++ src/test/org/apache/hcatalog/data/TestDefaultHCatRecord.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -33,9 +33,6 @@ import java.util.List;
import java.util.Map;
import org.apache.hcatalog.common.HCatException;
-import org.apache.hcatalog.common.HCatUtil;
-import org.apache.hcatalog.data.DefaultHCatRecord;
-import org.apache.hcatalog.data.HCatRecord;
import org.apache.hcatalog.data.schema.HCatSchema;
import org.apache.hcatalog.data.schema.HCatSchemaUtils;
diff --git src/test/org/apache/hcatalog/data/TestHCatRecordSerDe.java src/test/org/apache/hcatalog/data/TestHCatRecordSerDe.java
index 7d1e754..21ab32b 100644
--- src/test/org/apache/hcatalog/data/TestHCatRecordSerDe.java
+++ src/test/org/apache/hcatalog/data/TestHCatRecordSerDe.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/data/TestJsonSerDe.java src/test/org/apache/hcatalog/data/TestJsonSerDe.java
index d99a2d1..053657c 100644
--- src/test/org/apache/hcatalog/data/TestJsonSerDe.java
+++ src/test/org/apache/hcatalog/data/TestJsonSerDe.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/data/TestLazyHCatRecord.java src/test/org/apache/hcatalog/data/TestLazyHCatRecord.java
index 42c9795..7187788 100644
--- src/test/org/apache/hcatalog/data/TestLazyHCatRecord.java
+++ src/test/org/apache/hcatalog/data/TestLazyHCatRecord.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,34 +17,17 @@
*/
package org.apache.hcatalog.data;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
-import org.apache.hcatalog.common.HCatUtil;
-import org.apache.hcatalog.data.DefaultHCatRecord;
-import org.apache.hcatalog.data.HCatRecord;
-import org.apache.hcatalog.data.HCatRecordObjectInspectorFactory;
import org.apache.hcatalog.data.schema.HCatSchema;
import org.apache.hcatalog.data.schema.HCatSchemaUtils;
-import junit.framework.Assert;
import junit.framework.TestCase;
public class TestLazyHCatRecord extends TestCase{
diff --git src/test/org/apache/hcatalog/data/schema/TestHCatSchema.java src/test/org/apache/hcatalog/data/schema/TestHCatSchema.java
index 3a72e78..8ed2dab 100644
--- src/test/org/apache/hcatalog/data/schema/TestHCatSchema.java
+++ src/test/org/apache/hcatalog/data/schema/TestHCatSchema.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,8 +19,6 @@ package org.apache.hcatalog.data.schema;
import junit.framework.TestCase;
import org.apache.hcatalog.common.HCatException;
-import org.apache.hcatalog.data.schema.HCatFieldSchema;
-import org.apache.hcatalog.data.schema.HCatSchema;
import java.util.ArrayList;
import java.util.List;
diff --git src/test/org/apache/hcatalog/data/schema/TestHCatSchemaUtils.java src/test/org/apache/hcatalog/data/schema/TestHCatSchemaUtils.java
index 3bb2ffe..19272ec 100644
--- src/test/org/apache/hcatalog/data/schema/TestHCatSchemaUtils.java
+++ src/test/org/apache/hcatalog/data/schema/TestHCatSchemaUtils.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java
index f9c3a93..7c36a82 100644
--- src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java
+++ src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.hcatalog.mapreduce;
import org.apache.hadoop.fs.FileUtil;
diff --git src/test/org/apache/hcatalog/mapreduce/HCatMapReduceTest.java src/test/org/apache/hcatalog/mapreduce/HCatMapReduceTest.java
index 2509c20..ce59fa7 100644
--- src/test/org/apache/hcatalog/mapreduce/HCatMapReduceTest.java
+++ src/test/org/apache/hcatalog/mapreduce/HCatMapReduceTest.java
@@ -49,7 +49,6 @@ import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.mapreduce.Counters;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobStatus;
import org.apache.hadoop.mapreduce.Mapper;
diff --git src/test/org/apache/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java src/test/org/apache/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java
index 0c5b982..fd70188 100644
--- src/test/org/apache/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java
+++ src/test/org/apache/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -112,4 +112,4 @@ public class TestHCatHiveThriftCompatibility extends HCatBaseTest {
Assert.assertFalse(iterator.hasNext());
}
-}
\ No newline at end of file
+}
diff --git src/test/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java src/test/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
index 1f7ac6b..1d005ab 100644
--- src/test/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
+++ src/test/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/mapreduce/TestHCatOutputFormat.java src/test/org/apache/hcatalog/mapreduce/TestHCatOutputFormat.java
index f451082..91192f0 100644
--- src/test/org/apache/hcatalog/mapreduce/TestHCatOutputFormat.java
+++ src/test/org/apache/hcatalog/mapreduce/TestHCatOutputFormat.java
@@ -41,7 +41,6 @@ import org.apache.hadoop.hive.ql.io.RCFileOutputFormat;
import org.apache.hadoop.hive.serde.Constants;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.OutputCommitter;
-import org.apache.hadoop.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git src/test/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java src/test/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java
index f1ce078..155f7ad 100644
--- src/test/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java
+++ src/test/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/mapreduce/TestPassProperties.java src/test/org/apache/hcatalog/mapreduce/TestPassProperties.java
index b55ef09..c062105 100644
--- src/test/org/apache/hcatalog/mapreduce/TestPassProperties.java
+++ src/test/org/apache/hcatalog/mapreduce/TestPassProperties.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,13 +18,11 @@
package org.apache.hcatalog.mapreduce;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.cli.CliSessionState;
@@ -39,15 +37,12 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
import org.apache.hcatalog.HcatTestUtils;
-import org.apache.hcatalog.common.HCatConstants;
import org.apache.hcatalog.common.HCatException;
-import org.apache.hcatalog.common.HCatUtil;
import org.apache.hcatalog.data.DefaultHCatRecord;
import org.apache.hcatalog.data.schema.HCatFieldSchema;
import org.apache.hcatalog.data.schema.HCatSchema;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
-import org.apache.pig.data.Tuple;
import org.junit.Test;
public class TestPassProperties {
diff --git src/test/org/apache/hcatalog/mapreduce/TestSequenceFileReadWrite.java src/test/org/apache/hcatalog/mapreduce/TestSequenceFileReadWrite.java
index 435a5e9..38f4c66 100644
--- src/test/org/apache/hcatalog/mapreduce/TestSequenceFileReadWrite.java
+++ src/test/org/apache/hcatalog/mapreduce/TestSequenceFileReadWrite.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git src/test/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java src/test/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java
index 136fd4c..11ea1aa 100644
--- src/test/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java
+++ src/test/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java
@@ -1,24 +1,24 @@
- /**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.hcatalog.rcfile;
-
- import java.io.IOException;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.hcatalog.rcfile;
+
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Properties;
diff --git storage-handlers/hbase/build.xml storage-handlers/hbase/build.xml
index 7c06e0b..6e7d635 100644
--- storage-handlers/hbase/build.xml
+++ storage-handlers/hbase/build.xml
@@ -18,7 +18,9 @@
-->
-
+
@@ -97,21 +99,26 @@
-
-
-
+
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -279,5 +286,6 @@
+
diff --git storage-handlers/hbase/ivy.xml storage-handlers/hbase/ivy.xml
deleted file mode 100644
index 8d1e271..0000000
--- storage-handlers/hbase/ivy.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
- Apache HCatalog
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git storage-handlers/hbase/pom.xml storage-handlers/hbase/pom.xml
new file mode 100644
index 0000000..fab36da
--- /dev/null
+++ storage-handlers/hbase/pom.xml
@@ -0,0 +1,74 @@
+
+
+
+ org.apache.hcatalog
+ hcatalog
+ ${hcatalog.version}
+ ../../pom.xml
+
+
+ 4.0.0
+ org.apache.hcatalog
+ hbase-storage-handler
+ jar
+ ${hcatalog.version}
+ hbase-storage-handler
+ http://maven.apache.org
+
+
+
+ org.apache.hbase
+ hbase
+ ${hbase.version}
+ compile
+
+
+ org.apache.hcatalog
+ hcatalog-core
+ ${hcatalog.version}
+ compile
+
+
+ org.apache.zookeeper
+ zookeeper
+ ${zookeeper.version}
+ compile
+
+
+
+
+ commons-io
+ commons-io
+ ${commons-io.version}
+ test
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ test
+
+
+ org.apache.hbase
+ hbase
+ ${hbase.version}
+ tests
+ test
+
+
+ org.apache.zookeeper
+ zookeeper
+ ${zookeeper.version}
+ tests
+ test
+
+
+
diff --git storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevision.java storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevision.java
index a55dde7..34096ac 100644
--- storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevision.java
+++ storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevision.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -27,20 +27,12 @@
*/
package org.apache.hcatalog.hbase.snapshot.transaction.thrift;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class StoreFamilyRevision implements org.apache.thrift.TBase, java.io.Serializable, Cloneable {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoreFamilyRevision");
diff --git storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevisionList.java storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevisionList.java
index 4f1ee47..e3c1c89 100644
--- storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevisionList.java
+++ storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevisionList.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseAuthorizationProvider.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseAuthorizationProvider.java
index 456bf14..39e0025 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseAuthorizationProvider.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseAuthorizationProvider.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBaseOutputFormat.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBaseOutputFormat.java
index d480950..95a30ec 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBaseOutputFormat.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBaseOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBulkOutputFormat.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBulkOutputFormat.java
index 305d47a..b9aba35 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBulkOutputFormat.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBulkOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
index b6ae817..de784a6 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseDirectOutputFormat.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseDirectOutputFormat.java
index bca5232..0001dd2 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseDirectOutputFormat.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseDirectOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
index 763b6f4..b0441db 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputFormat.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputFormat.java
index f279ad4..49d2cd3 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputFormat.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
index 84513cf..b619d52 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseUtil.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseUtil.java
index b39cebd..36395b7 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseUtil.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HCatTableSnapshot.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HCatTableSnapshot.java
index b34dd7d..23daf18 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HCatTableSnapshot.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HCatTableSnapshot.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
index 4264d0c..2288795 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
index 5f40b42..9c415b2 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
@@ -1,6 +1,4 @@
/**
- * Copyright 2010 The Apache Software Foundation
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase;
import org.apache.hadoop.filecache.DistributedCache;
@@ -49,7 +48,7 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.hadoop.hbase.mapreduce.hadoopbackport.TotalOrderPartitioner.*;
+import static org.apache.hadoop.hbase.mapreduce.hadoopbackport.TotalOrderPartitioner.DEFAULT_PATH;
/**
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ResultConverter.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ResultConverter.java
index ff7e6b2..b93fbe3 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ResultConverter.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ResultConverter.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/FamilyRevision.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/FamilyRevision.java
index c89b755..f979d46 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/FamilyRevision.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/FamilyRevision.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
index 2c545c7..ba6dd6b 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/PathUtil.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/PathUtil.java
index b0803de..66f79a7 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/PathUtil.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/PathUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RMConstants.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RMConstants.java
index f57d7dc..303ded4 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RMConstants.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RMConstants.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.hcatalog.hbase.snapshot;
public class RMConstants {
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java
index be07e10..c57c62a 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,7 +21,6 @@ import org.apache.hadoop.conf.Configuration;
import java.io.IOException;
import java.util.List;
-import java.util.Properties;
/**
* This interface provides APIs for implementing revision management.
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpoint.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpoint.java
index 433f5f5..8f56b21 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpoint.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpoint.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,7 +19,6 @@ package org.apache.hcatalog.hbase.snapshot;
import java.io.IOException;
import java.util.List;
-import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpointClient.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpointClient.java
index 00db32b..b2c026e 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpointClient.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpointClient.java
@@ -1,8 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.hcatalog.hbase.snapshot;
import java.io.IOException;
import java.util.List;
-import java.util.Properties;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerFactory.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerFactory.java
index 02e7fc9..b7cf1bf 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerFactory.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerFactory.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,11 +18,9 @@
package org.apache.hcatalog.hbase.snapshot;
import java.io.IOException;
-import java.util.Properties;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
/**
* Utility to instantiate the revision manager (not a true factory actually).
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerProtocol.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerProtocol.java
index daa30e1..5d08d67 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerProtocol.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerProtocol.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/TableSnapshot.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/TableSnapshot.java
index 4596887..b6eeafc 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/TableSnapshot.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/TableSnapshot.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/Transaction.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/Transaction.java
index 7fc6119..70f6a2e 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/Transaction.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/Transaction.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
index 6a9891d..5885517 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
index 0e4066f..8837bb5 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -23,7 +23,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hcatalog.hbase.snapshot.transaction.thrift.*;
+import org.apache.hcatalog.hbase.snapshot.transaction.thrift.StoreFamilyRevision;
+import org.apache.hcatalog.hbase.snapshot.transaction.thrift.StoreFamilyRevisionList;
import org.apache.thrift.TBase;
import org.apache.thrift.TDeserializer;
import org.apache.thrift.TSerializer;
@@ -312,9 +313,9 @@ class ZKUtil {
/**
* This method updates the transaction data related to a znode.
*
- * @param String The path to the transaction data.
- * @param FamilyRevision The FamilyRevision to be updated.
- * @param UpdateMode The mode to update like append, update, remove.
+ * @param path The path to the transaction data.
+ * @param updateTx The FamilyRevision to be updated.
+ * @param mode The mode to update like append, update, remove.
* @throws IOException
*/
void updateData(String path, FamilyRevision updateTx, UpdateMode mode)
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/LockListener.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/LockListener.java
index 6494279..32a0187 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/LockListener.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/LockListener.java
@@ -1,13 +1,13 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase.snapshot.lock;
/**
@@ -36,4 +37,4 @@ public interface LockListener {
* released.
*/
public void lockReleased();
-}
\ No newline at end of file
+}
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java
index a08d3cf..3e27e39 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java
@@ -1,13 +1,13 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase.snapshot.lock;
import org.apache.zookeeper.CreateMode;
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
index 80d83e1..d356327 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
@@ -1,13 +1,13 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase.snapshot.lock;
import org.apache.zookeeper.KeeperException;
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
index eaa6f8a..c6a49de 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
@@ -1,13 +1,13 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase.snapshot.lock;
import org.slf4j.Logger;
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZooKeeperOperation.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZooKeeperOperation.java
index 7853920..3186094 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZooKeeperOperation.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZooKeeperOperation.java
@@ -1,13 +1,13 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase.snapshot.lock;
import org.apache.zookeeper.KeeperException;
diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/package-info.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/package-info.java
index b502a8f..3d58674 100644
--- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/package-info.java
+++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/package-info.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
index 1c19699..30bc6de 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,7 +18,6 @@
package org.apache.hcatalog.hbase;
-import com.sun.java.util.jar.pack.*;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
@@ -37,7 +36,6 @@ import org.apache.hadoop.mapred.MiniMRCluster;
import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
-import java.util.Map;
/**
* MiniCluster class composed of a number of Hadoop Minicluster implementations
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/SkeletonHBaseTest.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/SkeletonHBaseTest.java
index 1a8998d..fbadba3 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/SkeletonHBaseTest.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/SkeletonHBaseTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java
index 6e28892..a1faa0e 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseDirectOutputFormat.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseDirectOutputFormat.java
index aa2f01b..349e1db 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseDirectOutputFormat.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseDirectOutputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -69,7 +69,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseHCatStorageHandler.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseHCatStorageHandler.java
index e6da40b..dd0c3ed 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseHCatStorageHandler.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseHCatStorageHandler.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -237,4 +237,4 @@ public class TestHBaseHCatStorageHandler extends SkeletonHBaseTest {
}
-}
\ No newline at end of file
+}
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseInputFormat.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseInputFormat.java
index 83a3fef..9dfbc84 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseInputFormat.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseInputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestSnapshots.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestSnapshots.java
index b0deb86..cb6e40a 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestSnapshots.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestSnapshots.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hive.cli.CliSessionState;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -37,7 +36,6 @@ import org.apache.hcatalog.cli.HCatDriver;
import org.apache.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer;
import org.apache.hcatalog.common.HCatConstants;
import org.apache.hcatalog.common.HCatUtil;
-import org.apache.hcatalog.hbase.snapshot.RevisionManagerConfiguration;
import org.apache.hcatalog.hbase.snapshot.TableSnapshot;
import org.apache.hcatalog.mapreduce.InitializeInput;
import org.apache.hcatalog.mapreduce.InputJobInfo;
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/IDGenClient.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/IDGenClient.java
index 05d5cf2..c5a530a 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/IDGenClient.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/IDGenClient.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestIDGenerator.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestIDGenerator.java
index 7e8e6d4..3f9498c 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestIDGenerator.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestIDGenerator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManager.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManager.java
index 5b63c40..884ab30 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManager.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManager.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -26,7 +26,8 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hcatalog.hbase.SkeletonHBaseTest;
-import org.apache.hcatalog.hbase.snapshot.transaction.thrift.*;
+import org.apache.hcatalog.hbase.snapshot.transaction.thrift.StoreFamilyRevision;
+import org.apache.hcatalog.hbase.snapshot.transaction.thrift.StoreFamilyRevisionList;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.Stat;
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerConfiguration.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerConfiguration.java
index 1fd8a93..db14867 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerConfiguration.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerConfiguration.java
@@ -1,16 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.hcatalog.hbase.snapshot;
import org.apache.hadoop.conf.Configuration;
+import org.junit.Assert;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class TestRevisionManagerConfiguration {
@Test
public void testDefault() {
Configuration conf = RevisionManagerConfiguration.create();
- assertEquals("org.apache.hcatalog.hbase.snapshot.ZKBasedRevisionManager",
- conf.get(RevisionManagerFactory.REVISION_MGR_IMPL_CLASS));
+ Assert.assertEquals("org.apache.hcatalog.hbase.snapshot.ZKBasedRevisionManager",
+ conf.get(RevisionManagerFactory.REVISION_MGR_IMPL_CLASS));
}
}
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerEndpoint.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerEndpoint.java
index ae93211..13c2f45 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerEndpoint.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerEndpoint.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.lang.builder.ToStringBuilder;
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestThriftSerialization.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestThriftSerialization.java
index 7414a2a..c3fa1d8 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestThriftSerialization.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestThriftSerialization.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -23,7 +23,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.hcatalog.hbase.snapshot.transaction.thrift.*;
+import org.apache.hcatalog.hbase.snapshot.transaction.thrift.StoreFamilyRevision;
+import org.apache.hcatalog.hbase.snapshot.transaction.thrift.StoreFamilyRevisionList;
import org.junit.Test;
public class TestThriftSerialization {
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestZNodeSetUp.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestZNodeSetUp.java
index aecd2be..ea3b1db 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestZNodeSetUp.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestZNodeSetUp.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,7 +21,6 @@ package org.apache.hcatalog.hbase.snapshot;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.IOException;
import java.net.URI;
import java.util.Map;
@@ -36,7 +35,6 @@ import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hcatalog.cli.HCatDriver;
import org.apache.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer;
import org.apache.hcatalog.hbase.SkeletonHBaseTest;
-import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.Stat;
import org.junit.Test;
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/WriteLockTest.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/WriteLockTest.java
index e2a8fc9..4f1717b 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/WriteLockTest.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/WriteLockTest.java
@@ -1,13 +1,13 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase.snapshot.lock;
import org.apache.zookeeper.ZooKeeper;
diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/ZNodeNameTest.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/ZNodeNameTest.java
index 2693c5f..fb03bc7 100644
--- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/ZNodeNameTest.java
+++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/ZNodeNameTest.java
@@ -1,13 +1,13 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hcatalog.hbase.snapshot.lock;
import junit.framework.TestCase;
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/ConnectionFailureException.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/ConnectionFailureException.java
index fbe11c2..4b10a01 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/ConnectionFailureException.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/ConnectionFailureException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatAddPartitionDesc.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatAddPartitionDesc.java
index 90334c9..f705098 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatAddPartitionDesc.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatAddPartitionDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClient.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClient.java
index 91721f5..4d20e30 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClient.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClient.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,7 +17,6 @@
*/
package org.apache.hcatalog.api;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -72,7 +71,7 @@ public abstract class HCatClient {
* Get all existing databases that match the given
* pattern. The matching occurs as per Java regular expressions
*
- * @param databasePattern java re pattern
+ * @param pattern java re pattern
* @return list of database names
* @throws HCatException,ConnectionFailureException
*/
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClientHMSImpl.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClientHMSImpl.java
index 9b18933..5e97900 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClientHMSImpl.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClientHMSImpl.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateDBDesc.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateDBDesc.java
index da673a5..22f093c 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateDBDesc.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateDBDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateTableDesc.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateTableDesc.java
index 13d8509..b2bfcb4 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateTableDesc.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateTableDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatDatabase.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatDatabase.java
index 8640b69..146ce72 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatDatabase.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatDatabase.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatPartition.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatPartition.java
index 8b71029..38971e1 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatPartition.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatPartition.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatTable.java webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatTable.java
index 4e38ef6..36e93a6 100644
--- webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatTable.java
+++ webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatTable.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/java-client/src/test/java/org/apache/hcatalog/api/TestHCatClient.java webhcat/java-client/src/test/java/org/apache/hcatalog/api/TestHCatClient.java
index 9529819..1d846dd 100644
--- webhcat/java-client/src/test/java/org/apache/hcatalog/api/TestHCatClient.java
+++ webhcat/java-client/src/test/java/org/apache/hcatalog/api/TestHCatClient.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hadoop/mapred/TempletonJobTracker.java webhcat/svr/src/main/java/org/apache/hadoop/mapred/TempletonJobTracker.java
index f258b9e..b9a4649 100644
--- webhcat/svr/src/main/java/org/apache/hadoop/mapred/TempletonJobTracker.java
+++ webhcat/svr/src/main/java/org/apache/hadoop/mapred/TempletonJobTracker.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java
index 89cd371..71b791b 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BadParam.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BadParam.java
index 13826e5..b6afe67 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BadParam.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BadParam.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BusyException.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BusyException.java
index c24152b..0c7832e 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BusyException.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BusyException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CallbackFailedException.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CallbackFailedException.java
index 2357371..dea99be 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CallbackFailedException.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CallbackFailedException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CatchallExceptionMapper.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CatchallExceptionMapper.java
index f6caaed..411ff55 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CatchallExceptionMapper.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CatchallExceptionMapper.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ColumnDesc.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ColumnDesc.java
index bec6cb6..4d0bfc1 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ColumnDesc.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ColumnDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteBean.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteBean.java
index 76f2c28..58c1b7c 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteBean.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteBean.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteDelegator.java
index ed0e538..0aa73da 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -23,11 +23,6 @@ import java.net.MalformedURLException;
import java.util.Date;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.JobProfile;
-import org.apache.hadoop.mapred.JobStatus;
-import org.apache.hadoop.mapred.JobTracker;
-import org.apache.hadoop.mapred.TempletonJobTracker;
import org.apache.hcatalog.templeton.tool.JobState;
import org.apache.hcatalog.templeton.tool.TempletonUtils;
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DatabaseDesc.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DatabaseDesc.java
index 6b66f4a..4b3c122 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DatabaseDesc.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DatabaseDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DeleteDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DeleteDelegator.java
index 5e12605..c870e98 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DeleteDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DeleteDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,8 +19,6 @@ package org.apache.hcatalog.templeton;
import java.io.IOException;
import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.JobProfile;
-import org.apache.hadoop.mapred.JobStatus;
import org.apache.hadoop.mapred.JobTracker;
import org.apache.hadoop.mapred.TempletonJobTracker;
import org.apache.hadoop.security.UserGroupInformation;
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/EnqueueBean.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/EnqueueBean.java
index 49b4ca1..0d169ec 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/EnqueueBean.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/EnqueueBean.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecBean.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecBean.java
index ded9c4f..b5f2eaf 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecBean.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecBean.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecService.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecService.java
index bc9fee8..dc94bab 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecService.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecService.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecServiceImpl.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecServiceImpl.java
index d54b6a0..6cf48db 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecServiceImpl.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecServiceImpl.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/GroupPermissionsDesc.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/GroupPermissionsDesc.java
index b96ef25..eafaae2 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/GroupPermissionsDesc.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/GroupPermissionsDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,8 +17,6 @@
*/
package org.apache.hcatalog.templeton;
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* The base create permissions for ddl objects.
*/
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatDelegator.java
index d9117f6..5fa6da1 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatException.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatException.java
index 661b25a..ab73adb 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatException.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HiveDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HiveDelegator.java
index ee600e1..d135b8b 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HiveDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HiveDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JarDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JarDelegator.java
index ea4635f..889e990 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JarDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JarDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JsonBuilder.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JsonBuilder.java
index a624ecc..5c1fe3f 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JsonBuilder.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JsonBuilder.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java
index bdcb1c3..857856c 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import org.apache.commons.exec.ExecuteException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ListDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ListDelegator.java
index 60eb7fa..1d6546d 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ListDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ListDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -20,15 +20,11 @@ package org.apache.hcatalog.templeton;
import java.io.IOException;
import java.util.List;
import java.util.ArrayList;
-import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.JobProfile;
import org.apache.hadoop.mapred.JobStatus;
import org.apache.hadoop.mapred.JobTracker;
import org.apache.hadoop.mapred.TempletonJobTracker;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hcatalog.templeton.tool.JobState;
-import org.apache.hcatalog.templeton.tool.TempletonUtils;
-import org.apache.zookeeper.ZooKeeper;
/**
* List jobs owned by a user.
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Main.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Main.java
index e6e0df6..46eee66 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Main.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Main.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/MaxByteArrayOutputStream.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/MaxByteArrayOutputStream.java
index 6b4066d..dec2b5b 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/MaxByteArrayOutputStream.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/MaxByteArrayOutputStream.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/NotAuthorizedException.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/NotAuthorizedException.java
index fbc353e..73665bf 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/NotAuthorizedException.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/NotAuthorizedException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PartitionDesc.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PartitionDesc.java
index 99cee97..b16fbc1 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PartitionDesc.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PartitionDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PigDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PigDelegator.java
index 5168479..17d4481 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PigDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PigDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueException.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueException.java
index 5a9861d..947513f 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueException.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,8 +17,6 @@
*/
package org.apache.hcatalog.templeton;
-import java.util.HashMap;
-
/**
* Unable to queue the job
*/
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueStatusBean.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueStatusBean.java
index c774aa2..e1e3f96 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueStatusBean.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueStatusBean.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SecureProxySupport.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SecureProxySupport.java
index 6b5fde1..98c85b3 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SecureProxySupport.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SecureProxySupport.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Server.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Server.java
index 4465827..f1c68aa 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Server.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Server.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleExceptionMapper.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleExceptionMapper.java
index 62d0fe3..ee40fd0 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleExceptionMapper.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleExceptionMapper.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleWebException.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleWebException.java
index 733bd97..6961d16 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleWebException.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleWebException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Map;
import java.util.HashMap;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response;
import org.codehaus.jackson.map.ObjectMapper;
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StatusDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StatusDelegator.java
index 603ce49..a7e22f2 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StatusDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StatusDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StreamingDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StreamingDelegator.java
index 8bc3b0b..28e549c 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StreamingDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StreamingDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableDesc.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableDesc.java
index 8a4deca..28cf046 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableDesc.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableLikeDesc.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableLikeDesc.java
index bd36098..689107b 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableLikeDesc.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableLikeDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TablePropertyDesc.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TablePropertyDesc.java
index 9bc3f75..4e9e0ff 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TablePropertyDesc.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TablePropertyDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TempletonDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TempletonDelegator.java
index 843d574..df33209 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TempletonDelegator.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TempletonDelegator.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/UgiFactory.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/UgiFactory.java
index 662beeb..886163c 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/UgiFactory.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/UgiFactory.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/WadlConfig.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/WadlConfig.java
index 86cbb2f..3dc2ab1 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/WadlConfig.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/WadlConfig.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSCleanup.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSCleanup.java
index 5f2510c..0b24327 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSCleanup.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSCleanup.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSStorage.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSStorage.java
index 1975f3a..4c21b58 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSStorage.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSStorage.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobState.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobState.java
index e82d424..4296e36 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobState.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobState.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobStateTracker.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobStateTracker.java
index a734df2..2055e10 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobStateTracker.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobStateTracker.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NotFoundException.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NotFoundException.java
index 9c7cd31..fc478fb 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NotFoundException.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NotFoundException.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullRecordReader.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullRecordReader.java
index 75f22f0..135c4fe 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullRecordReader.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullRecordReader.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullSplit.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullSplit.java
index d8d87b8..abd58a7 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullSplit.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullSplit.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/SingleInputFormat.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/SingleInputFormat.java
index 6db776a..a190a70 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/SingleInputFormat.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/SingleInputFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
index 8bdb1f1..d7c4c8b 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -23,10 +23,8 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -53,7 +51,6 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
-import org.apache.hcatalog.templeton.SecureProxySupport;
import org.apache.hadoop.mapreduce.security.token.delegation.DelegationTokenIdentifier;
/**
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonStorage.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonStorage.java
index 02553ea..f4d2e0d 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonStorage.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonStorage.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonUtils.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonUtils.java
index 62930b2..8213af7 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonUtils.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonUtils.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -20,7 +20,6 @@ package org.apache.hcatalog.templeton.tool;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Reader;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -34,7 +33,6 @@ import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.JobID;
import org.apache.hadoop.util.StringUtils;
/**
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TrivialExecService.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TrivialExecService.java
index e40da4a..20a8f2b 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TrivialExecService.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TrivialExecService.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperCleanup.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperCleanup.java
index 9cb3bd1..03407c4 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperCleanup.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperCleanup.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperStorage.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperStorage.java
index 70cbcde..2183808 100644
--- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperStorage.java
+++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperStorage.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestDesc.java webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestDesc.java
index d13307a..1758d54 100644
--- webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestDesc.java
+++ webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestDesc.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import junit.framework.TestCase;
-import org.apache.hcatalog.templeton.ColumnDesc;
-import org.apache.hcatalog.templeton.TableDesc;
import org.codehaus.jackson.map.ObjectMapper;
/**
diff --git webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestServer.java webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestServer.java
index 85f35f0..df93d4d 100644
--- webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestServer.java
+++ webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestServer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,7 +19,6 @@ package org.apache.hcatalog.templeton;
import junit.framework.TestCase;
-import org.apache.hcatalog.templeton.Main;
import org.apache.hcatalog.templeton.mock.MockServer;
import java.util.List;
diff --git webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockExecService.java webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockExecService.java
index b622b4c..23e4047 100644
--- webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockExecService.java
+++ webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockExecService.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockServer.java webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockServer.java
index 21ef031..c5a8633 100644
--- webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockServer.java
+++ webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockServer.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockUriInfo.java webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockUriInfo.java
index 0909ffe..c491e51 100644
--- webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockUriInfo.java
+++ webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockUriInfo.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java
index d034a21..984a445 100644
--- webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java
+++ webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,15 +17,12 @@
*/
package org.apache.hcatalog.templeton.tool;
-import static org.junit.Assert.*;
+import org.junit.Assert;
import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.StringUtils;
-import org.apache.hcatalog.templeton.tool.TempletonUtils;
import org.junit.Test;
public class TestTempletonUtils {
@@ -36,17 +33,17 @@ public class TestTempletonUtils {
@Test
public void testIssetString() {
- assertFalse(TempletonUtils.isset((String)null));
- assertFalse(TempletonUtils.isset(""));
- assertTrue(TempletonUtils.isset("hello"));
+ Assert.assertFalse(TempletonUtils.isset((String)null));
+ Assert.assertFalse(TempletonUtils.isset(""));
+ Assert.assertTrue(TempletonUtils.isset("hello"));
}
@Test
public void testIssetTArray() {
- assertFalse(TempletonUtils.isset((Long[]) null));
- assertFalse(TempletonUtils.isset(new String[0]));
+ Assert.assertFalse(TempletonUtils.isset((Long[]) null));
+ Assert.assertFalse(TempletonUtils.isset(new String[0]));
String[] parts = new String("hello.world").split("\\.");
- assertTrue(TempletonUtils.isset(parts));
+ Assert.assertTrue(TempletonUtils.isset(parts));
}
@Test
@@ -58,24 +55,24 @@ public class TestTempletonUtils {
@Test
public void testExtractPercentComplete() {
- assertNull(TempletonUtils.extractPercentComplete("fred"));
+ Assert.assertNull(TempletonUtils.extractPercentComplete("fred"));
for (String line : CONTROLLER_LINES)
- assertNull(TempletonUtils.extractPercentComplete(line));
+ Assert.assertNull(TempletonUtils.extractPercentComplete(line));
String fifty = "2011-12-15 18:12:36,333 [main] INFO org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MapReduceLauncher - 50% complete";
- assertEquals("50% complete", TempletonUtils.extractPercentComplete(fifty));
+ Assert.assertEquals("50% complete", TempletonUtils.extractPercentComplete(fifty));
}
@Test
public void testEncodeArray() {
- assertEquals(null, TempletonUtils.encodeArray((String []) null));
+ Assert.assertEquals(null, TempletonUtils.encodeArray((String []) null));
String[] tmp = new String[0];
- assertTrue(TempletonUtils.encodeArray(new String[0]).length() == 0);
+ Assert.assertTrue(TempletonUtils.encodeArray(new String[0]).length() == 0);
tmp = new String[3];
tmp[0] = "fred";
tmp[1] = null;
tmp[2] = "peter,lisa,, barney";
- assertEquals("fred,,peter" +
+ Assert.assertEquals("fred,,peter" +
StringUtils.ESCAPE_CHAR + ",lisa" + StringUtils.ESCAPE_CHAR + "," +
StringUtils.ESCAPE_CHAR + ", barney",
TempletonUtils.encodeArray(tmp));
@@ -83,7 +80,7 @@ public class TestTempletonUtils {
@Test
public void testDecodeArray() {
- assertTrue(TempletonUtils.encodeArray((String[]) null) == null);
+ Assert.assertTrue(TempletonUtils.encodeArray((String[]) null) == null);
String[] tmp = new String[3];
tmp[0] = "fred";
tmp[1] = null;
@@ -91,10 +88,10 @@ public class TestTempletonUtils {
String[] tmp2 = TempletonUtils.decodeArray(TempletonUtils.encodeArray(tmp));
try {
for (int i=0; i< tmp.length; i++) {
- assertEquals((String) tmp[i], (String)tmp2[i]);
+ Assert.assertEquals((String) tmp[i], (String)tmp2[i]);
}
} catch (Exception e) {
- fail("Arrays were not equal" + e.getMessage());
+ Assert.fail("Arrays were not equal" + e.getMessage());
}
}
@@ -105,7 +102,7 @@ public class TestTempletonUtils {
TempletonUtils.hadoopFsPath("/tmp", null, null);
TempletonUtils.hadoopFsPath("/tmp", new Configuration(), null);
} catch (FileNotFoundException e) {
- fail("Couldn't find /tmp");
+ Assert.fail("Couldn't find /tmp");
} catch (Exception e) {
// This is our problem -- it means the configuration was wrong.
e.printStackTrace();
@@ -113,7 +110,7 @@ public class TestTempletonUtils {
try {
TempletonUtils.hadoopFsPath("/scoobydoo/teddybear",
new Configuration(), null);
- fail("Should not have found /scoobydoo/teddybear");
+ Assert.fail("Should not have found /scoobydoo/teddybear");
} catch (FileNotFoundException e) {
// Should go here.
} catch (Exception e) {
@@ -125,14 +122,14 @@ public class TestTempletonUtils {
@Test
public void testHadoopFsFilename() {
try {
- assertEquals(null, TempletonUtils.hadoopFsFilename(null, null, null));
- assertEquals(null, TempletonUtils.hadoopFsFilename("/tmp", null, null));
- assertEquals("file:/tmp",
+ Assert.assertEquals(null, TempletonUtils.hadoopFsFilename(null, null, null));
+ Assert.assertEquals(null, TempletonUtils.hadoopFsFilename("/tmp", null, null));
+ Assert.assertEquals("file:/tmp",
TempletonUtils.hadoopFsFilename("/tmp",
new Configuration(),
null));
} catch (FileNotFoundException e) {
- fail("Couldn't find name for /tmp");
+ Assert.fail("Couldn't find name for /tmp");
} catch (Exception e) {
// Something else is wrong
e.printStackTrace();
@@ -140,7 +137,7 @@ public class TestTempletonUtils {
try {
TempletonUtils.hadoopFsFilename("/scoobydoo/teddybear",
new Configuration(), null);
- fail("Should not have found /scoobydoo/teddybear");
+ Assert.fail("Should not have found /scoobydoo/teddybear");
} catch (FileNotFoundException e) {
// Should go here.
} catch (Exception e) {
@@ -152,16 +149,16 @@ public class TestTempletonUtils {
@Test
public void testHadoopFsListAsArray() {
try {
- assertTrue(TempletonUtils.hadoopFsListAsArray(null, null, null) == null);
- assertTrue(TempletonUtils.hadoopFsListAsArray("/tmp, /usr",
+ Assert.assertTrue(TempletonUtils.hadoopFsListAsArray(null, null, null) == null);
+ Assert.assertTrue(TempletonUtils.hadoopFsListAsArray("/tmp, /usr",
null, null) == null);
String[] tmp2
= TempletonUtils.hadoopFsListAsArray("/tmp,/usr",
new Configuration(), null);
- assertEquals("file:/tmp", tmp2[0]);
- assertEquals("file:/usr", tmp2[1]);
+ Assert.assertEquals("file:/tmp", tmp2[0]);
+ Assert.assertEquals("file:/usr", tmp2[1]);
} catch (FileNotFoundException e) {
- fail("Couldn't find name for /tmp");
+ Assert.fail("Couldn't find name for /tmp");
} catch (Exception e) {
// Something else is wrong
e.printStackTrace();
@@ -170,7 +167,7 @@ public class TestTempletonUtils {
TempletonUtils.hadoopFsListAsArray("/scoobydoo/teddybear,joe",
new Configuration(),
null);
- fail("Should not have found /scoobydoo/teddybear");
+ Assert.fail("Should not have found /scoobydoo/teddybear");
} catch (FileNotFoundException e) {
// Should go here.
} catch (Exception e) {
@@ -182,13 +179,13 @@ public class TestTempletonUtils {
@Test
public void testHadoopFsListAsString() {
try {
- assertTrue(TempletonUtils.hadoopFsListAsString(null, null, null) == null);
- assertTrue(TempletonUtils.hadoopFsListAsString("/tmp,/usr",
+ Assert.assertTrue(TempletonUtils.hadoopFsListAsString(null, null, null) == null);
+ Assert.assertTrue(TempletonUtils.hadoopFsListAsString("/tmp,/usr",
null, null) == null);
- assertEquals("file:/tmp,file:/usr", TempletonUtils.hadoopFsListAsString
+ Assert.assertEquals("file:/tmp,file:/usr", TempletonUtils.hadoopFsListAsString
("/tmp,/usr", new Configuration(), null));
} catch (FileNotFoundException e) {
- fail("Couldn't find name for /tmp");
+ Assert.fail("Couldn't find name for /tmp");
} catch (Exception e) {
// Something else is wrong
e.printStackTrace();
@@ -197,7 +194,7 @@ public class TestTempletonUtils {
TempletonUtils.hadoopFsListAsString("/scoobydoo/teddybear,joe",
new Configuration(),
null);
- fail("Should not have found /scoobydoo/teddybear");
+ Assert.fail("Should not have found /scoobydoo/teddybear");
} catch (FileNotFoundException e) {
// Should go here.
} catch (Exception e) {
diff --git webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTrivialExecService.java webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTrivialExecService.java
index 9d0af61..84cb784 100644
--- webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTrivialExecService.java
+++ webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTrivialExecService.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,12 +17,12 @@
*/
package org.apache.hcatalog.templeton.tool;
-import static org.junit.Assert.*;
-
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
+
+import org.junit.Assert;
import org.junit.Test;
public class TestTrivialExecService {
@@ -42,16 +42,16 @@ public class TestTrivialExecService {
process.getInputStream()));
err = new BufferedReader(new InputStreamReader(
process.getErrorStream()));
- assertEquals("success", out.readLine());
+ Assert.assertEquals("success", out.readLine());
out.close();
String line;
while ((line = err.readLine()) != null) {
- fail(line);
+ Assert.fail(line);
}
process.waitFor();
} catch (Exception e) {
e.printStackTrace();
- fail("Process caused exception.");
+ Assert.fail("Process caused exception.");
} finally {
try {
out.close();