This is an automated email from the ASF dual-hosted git repository.
mmiller 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 a751f9f Fix formatting
a751f9f is described below
commit a751f9f5e7905f80f4227d3418c0c5a176de1f9a
Author: Mike Miller <[email protected]>
AuthorDate: Thu May 3 16:11:04 2018 -0400
Fix formatting
---
proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 15 +++++++--------
.../apache/accumulo/test/functional/KerberosProxyIT.java | 3 ++-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index fa4af9c..14c669c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -194,10 +194,9 @@ public class Proxy implements KeywordExecutable {
}
public static ServerAddress createProxyServer(HostAndPort address,
- TProtocolFactory
protocolFactory, Properties props)
- throws Exception {
- final int numThreads = Integer.parseInt(
- props.getProperty(THRIFT_THREAD_POOL_SIZE_KEY,
THRIFT_THREAD_POOL_SIZE_DEFAULT));
+ TProtocolFactory protocolFactory, Properties props) throws Exception {
+ final int numThreads = Integer
+ .parseInt(props.getProperty(THRIFT_THREAD_POOL_SIZE_KEY,
THRIFT_THREAD_POOL_SIZE_DEFAULT));
final long maxFrameSize = ConfigurationTypeHelper.getFixedMemoryAsBytes(
props.getProperty(THRIFT_MAX_FRAME_SIZE_KEY,
THRIFT_MAX_FRAME_SIZE_DEFAULT));
final int simpleTimerThreadpoolSize = Integer
@@ -220,8 +219,7 @@ public class Proxy implements KeywordExecutable {
TProcessor processor = new AccumuloProxy.Processor<>(wrappedImpl);
// Get the type of thrift server to instantiate
- final String serverTypeStr = props.getProperty(THRIFT_SERVER_TYPE,
- THRIFT_SERVER_TYPE_DEFAULT);
+ final String serverTypeStr = props.getProperty(THRIFT_SERVER_TYPE,
THRIFT_SERVER_TYPE_DEFAULT);
ThriftServerType serverType = DEFAULT_SERVER_TYPE;
if (!THRIFT_SERVER_TYPE_DEFAULT.equals(serverTypeStr)) {
serverType = ThriftServerType.get(serverTypeStr);
@@ -248,8 +246,9 @@ public class Proxy implements KeywordExecutable {
final String kerberosPrincipal =
ClientProperty.AUTH_USERNAME.getValue(props);
final String kerberosKeytab =
ClientProperty.AUTH_KERBEROS_KEYTAB_PATH.getValue(props);
if (StringUtils.isBlank(kerberosPrincipal) ||
StringUtils.isBlank(kerberosKeytab)) {
- throw new IllegalStateException(String.format("Kerberos principal
'%s' and keytab '%s'"
- + " must be provided", kerberosPrincipal, kerberosKeytab));
+ throw new IllegalStateException(
+ String.format("Kerberos principal '%s' and keytab '%s'" + " must
be provided",
+ kerberosPrincipal, kerberosKeytab));
}
UserGroupInformation.loginUserFromKeytab(kerberosPrincipal,
kerberosKeytab);
UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
index 767f53f..723171c 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
@@ -273,7 +273,8 @@ public class KerberosProxyIT extends AccumuloITBase {
return proxyPropertiesFile;
}
- private File generateNewAccumuloClientConfiguration(MiniAccumuloConfigImpl
cfg) throws IOException {
+ private File generateNewAccumuloClientConfiguration(MiniAccumuloConfigImpl
cfg)
+ throws IOException {
// Proxy configuration
File propsFile = new File(cfg.getConfDir(),
"accumulo-client-proxy.properties");
if (propsFile.exists()) {
--
To stop receiving notification emails like this one, please contact
[email protected].
