[orc] 01/02: ORC-551. Fix broken javadoc.

[om...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

omalley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git

commit 51ef7a96267757798cbc7d700df14bb17479ffe6
Author: Owen O'Malley <om...@apache.org>
AuthorDate: Tue Sep 3 18:54:34 2019 -0700

    ORC-551. Fix broken javadoc.
    
    Signed-off-by: Owen O'Malley <om...@apache.org>
---
 java/core/src/java/org/apache/orc/OrcFile.java          | 2 +-
 java/core/src/java/org/apache/orc/impl/ParserUtils.java | 4 ++--
 java/shims/src/java/org/apache/orc/impl/LocalKey.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/core/src/java/org/apache/orc/OrcFile.java b/java/core/src/java/org/apache/orc/OrcFile.java
index 9b517c7..803b609 100644
--- a/java/core/src/java/org/apache/orc/OrcFile.java
+++ b/java/core/src/java/org/apache/orc/OrcFile.java
@@ -772,7 +772,7 @@ public class OrcFile {
 
     /**
      * For users that need to override the current version of a key, this
-     * method allows them to define the version & algorithm for a given key.
+     * method allows them to define the version and algorithm for a given key.
      *
      * This will mostly be used for ORC file merging where the writer has to
      * use the same version of the key that the original files used.
diff --git a/java/core/src/java/org/apache/orc/impl/ParserUtils.java b/java/core/src/java/org/apache/orc/impl/ParserUtils.java
index a6d227b..c6a31ad 100644
--- a/java/core/src/java/org/apache/orc/impl/ParserUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/ParserUtils.java
@@ -354,7 +354,7 @@ public class ParserUtils {
    *
    * @param source the string to parse
    * @param schema the top level schema
-   * @throw IllegalArgumentException if there are conflicting keys for a field
+   * @throws IllegalArgumentException if there are conflicting keys for a field
    */
   public static void parseKeys(StringPosition source, TypeDescription schema) {
     if (source.hasCharactersLeft()) {
@@ -387,7 +387,7 @@ public class ParserUtils {
    *
    * @param source the string to parse
    * @param schema the top level schema
-   * @throw IllegalArgumentException if there are conflicting masks for a field
+   * @throws IllegalArgumentException if there are conflicting masks for a field
    */
   public static void parseMasks(StringPosition source, TypeDescription schema) {
     if (source.hasCharactersLeft()) {
diff --git a/java/shims/src/java/org/apache/orc/impl/LocalKey.java b/java/shims/src/java/org/apache/orc/impl/LocalKey.java
index 32148eb..0944f42 100644
--- a/java/shims/src/java/org/apache/orc/impl/LocalKey.java
+++ b/java/shims/src/java/org/apache/orc/impl/LocalKey.java
@@ -24,7 +24,7 @@ import javax.crypto.spec.SecretKeySpec;
 import java.security.Key;
 
 /**
- * Local keys are random keys that are generated for each file & column.
+ * Local keys are random keys that are generated for each file and column.
  * The file's metadata includes the encryptedKey and the reader needs to
  * use the KeyProvider to get the decryptedKey.
  */