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 f275273 Remove warnings and fix broken javadocs
f275273 is described below
commit f27527347af78016d7bf5d60c010c6006687a0ec
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Nov 1 19:46:04 2018 -0400
Remove warnings and fix broken javadocs
Also bump the formatter-maven-plugin to the recently released and
current latest 2.8.1
---
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 10 +++++++---
.../org/apache/accumulo/core/singletons/SingletonManager.java | 2 --
pom.xml | 2 +-
.../apache/accumulo/server/security/SystemCredentialsTest.java | 6 ++++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 65a3a96..acef2c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -1111,9 +1111,13 @@ public enum Property {
private <T extends Annotation> T getAnnotation(Class<T> annotationType) {
Logger log = LoggerFactory.getLogger(getClass());
try {
- for (Annotation a : getClass().getField(name()).getAnnotations())
- if (annotationType.isInstance(a))
- return (T) a;
+ for (Annotation a : getClass().getField(name()).getAnnotations()) {
+ if (annotationType.isInstance(a)) {
+ @SuppressWarnings("unchecked")
+ T uncheckedA = (T) a;
+ return uncheckedA;
+ }
+ }
} catch (SecurityException | NoSuchFieldException e) {
log.error("{}", e.getMessage(), e);
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/singletons/SingletonManager.java
b/core/src/main/java/org/apache/accumulo/core/singletons/SingletonManager.java
index ecdad27..1e59beb 100644
---
a/core/src/main/java/org/apache/accumulo/core/singletons/SingletonManager.java
+++
b/core/src/main/java/org/apache/accumulo/core/singletons/SingletonManager.java
@@ -41,9 +41,7 @@ import com.google.common.base.Preconditions;
* AccumuloClient is not closable, then its hard to remove the static state.
This class enables
* making AccumuloClient closable at inception so that static state can be
removed later.
*
- * @see org.apache.accumulo.core.util.CleanUp
*/
-
public class SingletonManager {
private static final Logger log =
LoggerFactory.getLogger(SingletonManager.class);
diff --git a/pom.xml b/pom.xml
index 1800eb4..5873bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -938,7 +938,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.7.4</version>
+ <version>2.8.1</version>
<configuration>
<configFile>${eclipseFormatterStyle}</configFile>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/security/SystemCredentialsTest.java
b/server/base/src/test/java/org/apache/accumulo/server/security/SystemCredentialsTest.java
index bfe840e..eaef091 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/security/SystemCredentialsTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/security/SystemCredentialsTest.java
@@ -24,8 +24,10 @@ import java.io.IOException;
import java.util.UUID;
import org.apache.accumulo.core.client.impl.AccumuloClientImpl;
+import org.apache.accumulo.core.client.impl.ClientContext;
import org.apache.accumulo.core.client.impl.Credentials;
import org.apache.accumulo.core.conf.SiteConfiguration;
+import org.apache.accumulo.core.singletons.SingletonReservation;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.security.SystemCredentials.SystemToken;
import org.junit.BeforeClass;
@@ -68,8 +70,8 @@ public class SystemCredentialsTest {
/**
* This is a test to ensure the string literal in
- * {@link
AccumuloClientImpl#AccumuloClientImpl(org.apache.accumulo.core.client.impl.ClientContext)}
- * is kept up-to-date if we move the {@link SystemToken}<br>
+ * {@link AccumuloClientImpl#AccumuloClientImpl(SingletonReservation,
ClientContext)} is kept
+ * up-to-date if we move the {@link SystemToken}<br>
* This check will not be needed after ACCUMULO-1578
*/
@Test
