Revert "Obsolete what was deprecated in v1.2"

This reverts commit c449e11.
Esri · Jul 20, 2017 · c95afc0 · c95afc0
1 parent 655c9c9
commit c95afc0
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 29 deletions.
diff --git a/hive/src/main/java/com/esri/hadoop/hive/serde/JsonSerde.java b/hive/src/main/java/com/esri/hadoop/hive/serde/JsonSerde.java
@@ -1,4 +1,4 @@
-// Obsoleted
-// package com.esri.hadoop.hive.serde;
-// @Deprecated in v1.2
-// public class JsonSerde extends EsriJsonSerDe {}
+package com.esri.hadoop.hive.serde;
+
+@Deprecated
+public class JsonSerde extends EsriJsonSerDe {}
diff --git a/hive/src/test/java/com/esri/hadoop/hive/serde/TestEsriJsonSerDe.java b/hive/src/test/java/com/esri/hadoop/hive/serde/TestEsriJsonSerDe.java
@@ -421,8 +421,8 @@ public void TestColumnTypes() throws Exception {
 		fieldData = getField("text", row, rowOI);
 		Assert.assertEquals("other", ((Text)fieldData).toString());
 	}
-    /* *
-	@Deprecated -> Obsolete
+
+	@Deprecated
 	@Test
 	public void LegacyName() throws Exception {
         ArrayList<Object> stuff = new ArrayList<Object>();
@@ -451,7 +451,7 @@ public void LegacyName() throws Exception {
 		fieldData = getField("shape", row, rowOI);
 		ckPoint(new Point(7.0, 2.0), (BytesWritable)fieldData);
 	}
-    * */
+
 
 	private SerDe mkSerDe(Properties proptab) throws Exception {
 		Configuration config = new Configuration();

diff --git a/json/src/main/java/com/esri/json/hadoop/EnclosedJsonInputFormat.java b/json/src/main/java/com/esri/json/hadoop/EnclosedJsonInputFormat.java
@@ -1,3 +1,7 @@
-// package com.esri.json.hadoop;
-// Obsolete - @Deprecated in v1.2 - superseded by EnclosedEsriJsonInputFormat
-// public class EnclosedJsonInputFormat extends EnclosedEsriJsonInputFormat {}
+package com.esri.json.hadoop;
+
+/**
+ * @deprecated superseded by EnclosedEsriJsonInputFormat
+ */
+@Deprecated
+public class EnclosedJsonInputFormat extends EnclosedEsriJsonInputFormat {}
diff --git a/json/src/main/java/com/esri/json/hadoop/EnclosedJsonRecordReader.java b/json/src/main/java/com/esri/json/hadoop/EnclosedJsonRecordReader.java
@@ -1,9 +1,12 @@
-/* *
 package com.esri.json.hadoop;
+
 import java.io.IOException;
 import org.apache.hadoop.conf.Configuration;
- * Obsolete - renamed to and superseded by EnclosedEsriJsonRecordReader
-@Deprecated in v1.2
+
+/**
+ * @deprecated renamed to and superseded by EnclosedEsriJsonRecordReader
+ */
+@Deprecated
 public class EnclosedJsonRecordReader extends EnclosedEsriJsonRecordReader {
 	public EnclosedJsonRecordReader() throws IOException {  // explicit just to declare exception
         super();
@@ -13,4 +16,3 @@ public EnclosedJsonRecordReader(org.apache.hadoop.mapred.InputSplit split,
 		super(split, conf);
 	}
 }
-* */
diff --git a/json/src/main/java/com/esri/json/hadoop/UnenclosedJsonInputFormat.java b/json/src/main/java/com/esri/json/hadoop/UnenclosedJsonInputFormat.java
@@ -1,3 +1,7 @@
-// package com.esri.json.hadoop;
-// Obsolete - @Deprecated in v1.2 - superseded by UnenclosedEsriJsonInputFormat
-// public class UnenclosedJsonInputFormat extends UnenclosedEsriJsonInputFormat {}
+package com.esri.json.hadoop;
+
+/**
+ * @deprecated superseded by UnenclosedEsriJsonInputFormat
+ */
+@Deprecated
+public class UnenclosedJsonInputFormat extends UnenclosedEsriJsonInputFormat {}
diff --git a/json/src/main/java/com/esri/json/hadoop/UnenclosedJsonRecordReader.java b/json/src/main/java/com/esri/json/hadoop/UnenclosedJsonRecordReader.java
@@ -1,9 +1,12 @@
-/* *
 package com.esri.json.hadoop;
+
 import java.io.IOException;
 import org.apache.hadoop.conf.Configuration;
- * Obsolete renamed to and superseded by UnenclosedEsriJsonRecordReader
-@Deprecated in v1.2
+
+/**
+ * @deprecated renamed to and superseded by UnenclosedEsriJsonRecordReader
+ */
+@Deprecated
 public class UnenclosedJsonRecordReader extends UnenclosedEsriJsonRecordReader {
 	public UnenclosedJsonRecordReader() throws IOException {  // explicit just to declare exception
         super();
@@ -13,4 +16,3 @@ public UnenclosedJsonRecordReader(org.apache.hadoop.mapred.InputSplit split,
 		super(split, conf);
 	}
 }
- * */
diff --git a/json/src/test/java/com/esri/json/hadoop/TestEnclosedEsriJsonRecordReader.java b/json/src/test/java/com/esri/json/hadoop/TestEnclosedEsriJsonRecordReader.java
@@ -89,7 +89,7 @@ public void TestMrv1() throws Exception {
 		assertFalse (reader.next(key, value));
 		reader.close();
 	}
-    /* *  Obsolete
+
 	@Test
 	public void TestLegacy() throws Exception {
 		Path path = new Path(this.getClass().getResource("sample-study-area.json").getFile());
@@ -104,5 +104,5 @@ public void TestLegacy() throws Exception {
 		assertFalse (reader.next(key, value));
 		reader.close();
 	}
-    * */
+
 }
diff --git a/json/src/test/java/com/esri/json/hadoop/TestUnenclosedEsriJsonRecordMrv1.java b/json/src/test/java/com/esri/json/hadoop/TestUnenclosedEsriJsonRecordMrv1.java
@@ -227,9 +227,10 @@ public void TestGeomFirst() throws IOException {
 	}
 
 
-	/* *
+	/**
 	 * @deprecated superseded by UnenclosedEsriJsonRecordReader
-	@Deprecated in v1.2 -> Obsolete
+	 */
+	@Deprecated
 	@Test
 	public void TestLegacyName() throws Exception {
 		Assert.assertArrayEquals(new int[] { 0, 1 }, getRecordIndexesInReader(getLegacyReader("unenclosed-json-simple.json", 0, 63)));
@@ -250,5 +251,5 @@ private UnenclosedEsriJsonRecordReader getLegacyReader(String resource, int star
 
 		return new UnenclosedJsonRecordReader(split, conf);
 	}
-    * */
+
 }
diff --git a/json/src/test/java/com/esri/json/hadoop/TestUnenclosedEsriJsonRecordReader.java b/json/src/test/java/com/esri/json/hadoop/TestUnenclosedEsriJsonRecordReader.java
@@ -277,9 +277,10 @@ public void TestGeomFirst() throws Exception {
 	}
 
 
-	/* *
+	/**
 	 * @deprecated superseded by UnenclosedEsriJsonRecordReader
-	@Deprecated in v1.2 -> Obsolete
+	 */
+	@Deprecated
 	@Test
 	public void TestLegacyName() throws Exception {
 		UnenclosedEsriJsonRecordReader uejrr =  new UnenclosedJsonRecordReader();
@@ -293,5 +294,5 @@ public void TestLegacyName() throws Exception {
 		Assert.assertArrayEquals(new int[] { 0 }, getRecordIndexesInFile(uejrr, "unenclosed-json-simple.json", 0, 23));
 		Assert.assertArrayEquals(new int[] { 1 }, getRecordIndexesInFile(uejrr, "unenclosed-json-simple.json", 23, 41));
 	}
-    * */
+
 }