accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch master updated: Fix javadocs from recent issues
Date Fri, 10 Nov 2017 04:28:30 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 0a8c931  Fix javadocs from recent issues
0a8c931 is described below

commit 0a8c931d7e6e835f6b480cd2b3aa5a13ee877965
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Thu Nov 9 23:21:19 2017 -0500

    Fix javadocs from recent issues
    
    Addresses trivial javadoc bugs related to code changes in
    ACCUMULO-4733, ACCUMULO-4708, and ACCUMULO-4170
---
 .../java/org/apache/accumulo/core/client/ClientConfiguration.java | 1 -
 .../org/apache/accumulo/core/security/crypto/CryptoModule.java    | 2 +-
 .../accumulo/core/security/crypto/CryptoModuleParameters.java     | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 17e0c67..8bd6149 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -197,7 +197,6 @@ public class ClientConfiguration extends CompositeConfiguration {
    * <p>
    * A client configuration will then be read from each location using <em>PropertiesConfiguration</em>
to construct a configuration. That means the latest item
    * will be the one in the configuration.
-   * <p>
    *
    * @see PropertiesConfiguration
    * @see File#pathSeparator
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
index c1962f7..dc9a87e 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
@@ -28,7 +28,7 @@ import javax.crypto.CipherOutputStream;
  * Classes that obey this interface may be used to provide encrypting and decrypting streams
to the rest of Accumulo. Classes that obey this interface may be
  * configured as the crypto module by setting the property crypto.module.class in the accumulo-site.xml
file.
  *
- * When implementing CryptoModule, it is recommended that any {@link CipherOutputStreams}
uses {@link RFileCipherOutputStream} instead.
+ * When implementing CryptoModule, it is recommended that any {@link CipherOutputStream}
uses {@link RFileCipherOutputStream} instead.
  *
  */
 public interface CryptoModule {
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
index 04d8107..10535e8 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
@@ -206,7 +206,7 @@ public class CryptoModuleParameters {
   /**
    * Gets the security provider name.
    *
-   * @see CryptoParameters#setSecurityProvider(String)
+   * @see #setSecurityProvider(String)
    * @return the security provider name
    */
   public String getSecurityProvider() {
@@ -380,9 +380,9 @@ public class CryptoModuleParameters {
    *
    * So, why is this important? Say you started out with the default secret key encryption
strategy. So, now you have a secret key in HDFS that encrypts all the
    * other secret keys. <i>Then</i> you deploy a key management solution. You
want to move that secret key up to the key management server. Great! No problem.
-   * Except, all your encrypted files now contain a setting that says
-   * "hey I was encrypted by the default strategy, so find decrypt my key using that, not
the key management server". This setting signals the
-   * {@link CryptoModule} that it should ignore the setting in the file and prefer the one
from the configuration.
+   * Except, all your encrypted files now contain a setting that says "hey I was encrypted
by the default strategy, so find decrypt my key using that, not the
+   * key management server". This setting signals the {@link CryptoModule} that it should
ignore the setting in the file and prefer the one from the
+   * configuration.
    *
    * @param overrideStreamsSecretKeyEncryptionStrategy
    *          the flag that indicates if the underlying stream's key encryption strategy
should be overridden by the currently configured key encryption

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

Mime
View raw message