Deprecate Cascading Integration

relates #1222
elastic · Dec 12, 2018 · 473392f · 473392f
1 parent 6852624
commit 473392f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/cascading/src/main/java/org/elasticsearch/hadoop/cascading/EsHadoopTap.java b/cascading/src/main/java/org/elasticsearch/hadoop/cascading/EsHadoopTap.java
@@ -37,8 +37,11 @@
 
 /**
  * Hadoop-based Cascading Tap.
+ *
+ * @deprecated 6.6.0 - Cascading Integration will be removed in a future release
  */
 @SuppressWarnings("rawtypes")
+@Deprecated
 class EsHadoopTap extends Tap<JobConf, RecordReader, OutputCollector> {
 
     private static final long serialVersionUID = 7910041489511719399L;

diff --git a/cascading/src/main/java/org/elasticsearch/hadoop/cascading/EsLocalTap.java b/cascading/src/main/java/org/elasticsearch/hadoop/cascading/EsLocalTap.java
@@ -53,7 +53,10 @@
 
 /**
  * Local Cascading Tap.
+ *
+ * @deprecated 6.6.0 - Cascading Integration will be removed in a future release
  */
+@Deprecated
 class EsLocalTap extends Tap<Properties, ScrollQuery, Object> {
 
     private static final long serialVersionUID = 8644631529427137615L;

diff --git a/cascading/src/main/java/org/elasticsearch/hadoop/cascading/EsTap.java b/cascading/src/main/java/org/elasticsearch/hadoop/cascading/EsTap.java
@@ -24,6 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.elasticsearch.hadoop.util.Version;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import cascading.flow.Flow;
@@ -39,8 +40,11 @@
  * Cascading Tap backed by ElasticSearch. Can be used as a source and/or sink, for both local and Hadoop (local or not) flows.
  * If no fields are specified or are associated with the incoming tuple, the Tap will create name each field "field[num]" - this allows the document to be parsed by ES but will most likely conflict with the
  * existing mapping for the given index.
+ *
+ * @deprecated 6.6.0 - Cascading Integration will be removed in a future release
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
+@Deprecated
 public class EsTap extends Tap<Object, Object, Object> {
 
     private static final long serialVersionUID = 2062780701366901965L;
@@ -203,7 +207,9 @@ private void initInnerTapIfNotSet(Object target, String hadoopTypeName) {
         // use SLF4J just like Cascading
         if (!logVersion) {
             logVersion = true;
-            LoggerFactory.getLogger(EsTap.class).info(String.format("Elasticsearch Hadoop %s initialized", Version.version()));
+            Logger esTapLogger = LoggerFactory.getLogger(EsTap.class);
+            esTapLogger.info(String.format("Elasticsearch Hadoop %s initialized", Version.version()));
+            esTapLogger.warn("ES-Hadoop Cascading Integration is Deprecated as of 6.6.0 and will be removed in a later release.");
         }
     }
 }
diff --git a/cascading/src/main/java/org/elasticsearch/hadoop/cascading/package-info.java b/cascading/src/main/java/org/elasticsearch/hadoop/cascading/package-info.java
@@ -20,5 +20,7 @@
  * Package providing integration between Elasticsearch and <a href="http://www.cascading.org/">Cascading</a> library.
  * <p/>
  * Supports both Hadoop (1.x or 2.x) and local platforms through the same {@link cascading.tap.Tap}.
+ *
+ * @deprecated 6.6.0 - Cascading Integration will be removed in a future release
  */
 package org.elasticsearch.hadoop.cascading;