Remove references to Arc and WarcRecord libraries (covered by Archive… (

#146)

* Remove references to Arc and WarcRecord libraries (covered by ArchiveRecord).

* Change references to GenericArchiveRecords to ArchiveRecords (meaning both Warc and Arc formats).

* Remove related tests.

* Change references to Generics in RecordLoader and tests.

* Remove GDF; Fix typos; Remove resolved references to deprecations.

* Fix double space and typos.

* More typos.

* Capitalization fixes.

* Fix comment out.

* Restore ExtractEntities to master.

src/main/java/io/archivesunleashed/io/GenericArchiveRecordWritable.java → src/main/java/io/archivesunleashed/io/ArchiveRecordWritable.java

@@ -15,11 +15,6 @@
  * limitations under the License.
  */
 
- /**
-   *  @deprecated as of 0.12.0 and will be replaced
-   *  with ArchiveRecordWritable in a future release.
-   */
-
 package io.archivesunleashed.io;
 
 import io.archivesunleashed.data.ArcRecordUtils;
@@ -33,9 +28,9 @@
 import org.archive.io.warc.WARCRecord;
 
 /**
- * Implements Hadoop Writable for Generic Archive Records.
+ * Implements Hadoop Writable for Archive Records.
  */
-public class GenericArchiveRecordWritable implements Writable {
+public class ArchiveRecordWritable implements Writable {
 
   /**
    * Archive Formats that can be used.
@@ -61,52 +56,52 @@ public enum ArchiveFormat {
   }
 
   /**
-   * Set default Generic Record format to UNKNOWN.
+   * Set default Record format to UNKNOWN.
    */
   private ArchiveFormat format = ArchiveFormat.UNKNOWN;
 
   /**
-   * Initialize Generic Archive Record to null.
+   * Initialize Archive Record to null.
    */
   private ArchiveRecord record = null;
 
   /**
    * Utility function.
    */
-  public GenericArchiveRecordWritable() {
+  public ArchiveRecordWritable() {
   }
 
   /**
-   * Initialize Generic Archive Record.
+   * Initialize Archive Record.
    *
-   * @param r Generic Archive Record
+   * @param r Archive Record
    */
-  public GenericArchiveRecordWritable(final ArchiveRecord r) {
+  public ArchiveRecordWritable(final ArchiveRecord r) {
     this.record = r;
     detectFormat();
   }
 
   /**
-   * Set Generic Archive Record.
+   * Set Archive Record.
    *
-   * @param r Generic Archive Record
+   * @param r Archive Record
    */
   public final void setRecord(final ArchiveRecord r) {
     this.record = r;
     detectFormat();
   }
 
   /**
-   * Get Generic Archive Record.
+   * Get Archive Record.
    *
-   * @return record Generic Archive Record
+   * @return record Archive Record
    */
   public final ArchiveRecord getRecord() {
     return record;
   }
 
   /**
-   * Detect format of Generic Archive Record.
+   * Detect format of Archive Record.
    */
   public final void detectFormat() {
     if (record instanceof ARCRecord) {
@@ -119,18 +114,18 @@ public final void detectFormat() {
   }
 
   /**
-   * Get format of Generic Archive Record.
+   * Get format of Archive Record.
    *
-   * @return format of Generic Archive Record
+   * @return format of Archive Record
    */
   public final ArchiveFormat getFormat() {
     return format;
   }
 
   /**
-   * Set format of Generic Archive Record.
+   * Set format of Archive Record.
    *
-   * @param f format of Generic Archive Record
+   * @param f format of Archive Record
    */
   public final void setFormat(final ArchiveFormat f) {
     this.format = f;