Repository: opennlp Updated Branches: refs/heads/master 643408187 -> 5ff03d241
OPENNLP-931: Deprecate old and unused model reader and writers Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/5ff03d24 Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/5ff03d24 Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/5ff03d24 Branch: refs/heads/master Commit: 5ff03d2416c10fd1ad6313a993adacaed232ba1f Parents: 6434081 Author: Jörn Kottmann <[email protected]> Authored: Sun Jan 15 21:13:57 2017 +0100 Committer: Jörn Kottmann <[email protected]> Committed: Sun Jan 15 21:13:57 2017 +0100 ---------------------------------------------------------------------- .../java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java | 4 ++++ .../java/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 ++ .../java/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(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java ---------------------------------------------------------------------- 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 f4354bb..0f58f7e 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 java.io.ObjectInputStream; 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; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java ---------------------------------------------------------------------- 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 7d0116f..364acc5 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 java.io.ObjectOutputStream; 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; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java ---------------------------------------------------------------------- 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 0cd572d..4f7a283 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 java.io.ObjectInputStream; 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) { http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java ---------------------------------------------------------------------- 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 d90b802..c88450e 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 java.io.ObjectOutputStream; 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; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java ---------------------------------------------------------------------- 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 a277b62..13c2934 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 @@ import opennlp.tools.ml.model.Context; * 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; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java ---------------------------------------------------------------------- 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 663e5f8..417028b 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 @@ import opennlp.tools.ml.model.PlainTextFileDataReader; /** * 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 { /** http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java ---------------------------------------------------------------------- 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 bde68e1..14dade2 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 @@ import opennlp.tools.ml.model.AbstractModel; /** * 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; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java ---------------------------------------------------------------------- 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 de27f4f..84a4307 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 @@ import java.io.IOException; * 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 { /** http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java ---------------------------------------------------------------------- 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 fc1b9f1..a56778c 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 @@ import java.io.IOException; * <li>.txt --> the file is plain text</li> * <li>.bin --> the file is binary</li> * </ul> + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class SuffixSensitiveGISModelReader extends GISModelReader { protected GISModelReader suffixAppropriateReader; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java ---------------------------------------------------------------------- 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 de85144..2e5af68 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 @@ import opennlp.tools.ml.model.AbstractModel; * <li>.txt --> the file is plain text</li> * <li>.bin --> the file is binary</li> * </ul> + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class SuffixSensitiveGISModelWriter extends GISModelWriter { private final GISModelWriter suffixAppropriateWriter; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java ---------------------------------------------------------------------- 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 a9f3788..0699c0c 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 java.io.IOException; 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 { /** http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java ---------------------------------------------------------------------- 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 4f65f55..ab9e583 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 @@ import opennlp.tools.ml.model.AbstractModel; /** * 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; http://git-wip-us.apache.org/repos/asf/opennlp/blob/5ff03d24/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java ---------------------------------------------------------------------- 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 c1e2804..6e5e471 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 @@ import opennlp.tools.ml.model.AbstractModelWriter; * <li>.txt --> the file is plain text * <li>.bin --> the file is binary * </ul> + * + * @deprecated will be removed after 1.7.1 release. Don't use it. */ +@Deprecated public class SuffixSensitivePerceptronModelWriter extends PerceptronModelWriter { private final AbstractModelWriter suffixAppropriateWriter;
