From 5ff03d2416c10fd1ad6313a993adacaed232ba1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Kottmann?= Date: Sun, 15 Jan 2017 21:13:57 +0100 Subject: [PATCH] OPENNLP-931: Deprecate old and unused model reader and writers --- .../opennlp/tools/ml/maxent/io/ObjectGISModelReader.java | 4 ++++ .../opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java | 4 ++++ .../java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java | 4 ++++ .../java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java | 4 ++++ .../opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java | 3 +++ .../opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java | 3 +++ .../opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java | 2 ++ .../opennlp/tools/ml/maxent/io/PooledGISModelReader.java | 2 ++ .../tools/ml/maxent/io/SuffixSensitiveGISModelReader.java | 3 +++ .../tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java | 3 +++ .../tools/ml/perceptron/PlainTextPerceptronModelReader.java | 5 +++++ .../tools/ml/perceptron/PlainTextPerceptronModelWriter.java | 3 +++ .../ml/perceptron/SuffixSensitivePerceptronModelWriter.java | 3 +++ 13 files changed, 43 insertions(+) diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java index f4354bb54..0f58f7ebd 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java @@ -23,6 +23,10 @@ import opennlp.tools.ml.model.ObjectDataReader; +/** + * @deprecated will be removed after 1.7.1 release. Don't use it. + */ +@Deprecated public class ObjectGISModelReader extends GISModelReader { protected ObjectInputStream input; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java index 7d0116fcd..364acc5b3 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java @@ -24,6 +24,10 @@ import opennlp.tools.ml.model.AbstractModel; +/** + * @deprecated will be removed after 1.7.1 release. Don't use it. + */ +@Deprecated public class ObjectGISModelWriter extends GISModelWriter { protected ObjectOutputStream output; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java index 0cd572d81..4f7a283a9 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java @@ -23,6 +23,10 @@ import opennlp.tools.ml.model.ObjectDataReader; +/** + * @deprecated will be removed after 1.7.1 release. Don't use it. + */ +@Deprecated public class ObjectQNModelReader extends QNModelReader { public ObjectQNModelReader(ObjectInputStream ois) { diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java index d90b80296..c88450e2d 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java @@ -23,6 +23,10 @@ import opennlp.tools.ml.model.AbstractModel; +/** + * @deprecated will be removed after 1.7.1 release. Don't use it. + */ +@Deprecated public class ObjectQNModelWriter extends QNModelWriter { protected ObjectOutputStream output; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java index a277b621a..13c29340c 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java @@ -32,7 +32,10 @@ * extends the PlainTextGISModelReader to read in the info and then overrides * the getParameters method so that it can appropriately read the binary file * which stores the parameters. + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class OldFormatGISModelReader extends PlainTextGISModelReader { private DataInputStream paramsInput; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java index 663e5f806..417028b55 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java @@ -27,7 +27,10 @@ /** * A reader for GIS models stored in plain text format. + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class PlainTextGISModelReader extends GISModelReader { /** diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java index bde68e167..14dade27a 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java @@ -30,7 +30,9 @@ /** * Model writer that saves models in plain text format. + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class PlainTextGISModelWriter extends GISModelWriter { private BufferedWriter output; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java index de27f4f19..84a43073f 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java @@ -27,7 +27,9 @@ * attempts to pool all context strings. This is useful when loading models which * share many context strings. * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class PooledGISModelReader extends SuffixSensitiveGISModelReader { /** diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java index fc1b9f165..a56778c2b 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java @@ -32,7 +32,10 @@ *
  • .txt --> the file is plain text
    • *
  • .bin --> the file is binary
    • * + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class SuffixSensitiveGISModelReader extends GISModelReader { protected GISModelReader suffixAppropriateReader; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java index de8514473..2e5af6880 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java @@ -40,7 +40,10 @@ *
  • .txt --> the file is plain text
    • *
  • .bin --> the file is binary
    • * + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class SuffixSensitiveGISModelWriter extends GISModelWriter { private final GISModelWriter suffixAppropriateWriter; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java index a9f37880a..0699c0ce2 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java @@ -25,6 +25,11 @@ import opennlp.tools.ml.model.PlainTextFileDataReader; +/* + * + * @deprecated will be removed after 1.7.1 release. Don't use it. + */ +@Deprecated public class PlainTextPerceptronModelReader extends PerceptronModelReader { /** diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java index 4f65f550e..ab9e583ab 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java @@ -30,7 +30,10 @@ /** * Model writer that saves models in plain text format. + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class PlainTextPerceptronModelWriter extends PerceptronModelWriter { private BufferedWriter output; diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java index c1e2804c9..6e5e4715c 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java @@ -41,7 +41,10 @@ *
  • .txt --> the file is plain text *
  • .bin --> the file is binary * + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class SuffixSensitivePerceptronModelWriter extends PerceptronModelWriter { private final AbstractModelWriter suffixAppropriateWriter;