From e513869cd6ec398386596411a69e2589147b7650 Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Thu, 30 Jul 2015 14:39:23 +0000 Subject: [PATCH] SOLR-6625: formatting fixed git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1693434 13f79535-47bb-0310-9956-ffa450edef68 --- .../solr/request/SolrQueryRequestContext.java | 8 ++++---- .../apache/solr/servlet/SolrDispatchFilter.java | 2 +- .../solr/client/solrj/impl/HttpClientUtil.java | 8 ++++---- .../org/apache/solr/common/util/ExecutorUtil.java | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/request/SolrQueryRequestContext.java b/solr/core/src/java/org/apache/solr/request/SolrQueryRequestContext.java index 65b977b4ef3..e1473376bc8 100644 --- a/solr/core/src/java/org/apache/solr/request/SolrQueryRequestContext.java +++ b/solr/core/src/java/org/apache/solr/request/SolrQueryRequestContext.java @@ -26,19 +26,19 @@ import org.apache.solr.client.solrj.impl.SolrHttpContext; */ public class SolrQueryRequestContext extends SolrHttpContext { final private SolrQueryRequest solrQueryRequest; - + public SolrQueryRequestContext(SolrQueryRequest solrQueryRequest) { this.solrQueryRequest = solrQueryRequest; setAttribute(SolrHttpContext.class.getName(), this); } - + public SolrQueryRequest getSolrQueryRequest() { return solrQueryRequest; } - + @Override public String toString() { - return "[SolrQueryRequestContext contains: "+solrQueryRequest+"]"; + return "[SolrQueryRequestContext contains: " + solrQueryRequest + "]"; } } diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java index c1c53d3cc36..1e1481fa772 100644 --- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java +++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java @@ -119,7 +119,7 @@ public class SolrDispatchFilter extends BaseSolrFilter { if (this.cores.getAuthenticationPlugin() != null) { HttpClientConfigurer configurer = this.cores.getAuthenticationPlugin().getDefaultConfigurer(); if (configurer != null) { - configurer.configure((DefaultHttpClient)httpClient, new ModifiableSolrParams()); + configurer.configure((DefaultHttpClient) httpClient, new ModifiableSolrParams()); } } diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java index 1a1691f27fe..a7a95583261 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java @@ -388,7 +388,7 @@ public class HttpClientUtil { Constructor constructor; try { constructor = systemDefaultHttpClientClass.getDeclaredConstructor(); - return constructor.newInstance(); + return constructor.newInstance(); } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { throw new SolrException(ErrorCode.SERVER_ERROR, "Unable to create HttpClient instance. ", e); } @@ -397,10 +397,10 @@ public class HttpClientUtil { public static DefaultHttpClient createHttpClient(ClientConnectionManager cm) { Constructor productConstructor; try { - productConstructor = defaultHttpClientClass.getDeclaredConstructor(new Class[] { ClientConnectionManager.class }); - return productConstructor.newInstance(new Object[] { cm }); + productConstructor = defaultHttpClientClass.getDeclaredConstructor(new Class[]{ClientConnectionManager.class}); + return productConstructor.newInstance(new Object[]{cm}); } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - throw new SolrException(ErrorCode.SERVER_ERROR, "Unable to create HttpClient instance, registered class is: "+defaultHttpClientClass, e); + throw new SolrException(ErrorCode.SERVER_ERROR, "Unable to create HttpClient instance, registered class is: " + defaultHttpClientClass, e); } } diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java index 79e32e2dcca..25913390ef2 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java @@ -169,7 +169,7 @@ public class ExecutorUtil { StringBuilder contextString = new StringBuilder(); if (submitterContext != null) { Collection values = submitterContext.values(); - + for (String value : values) { contextString.append(value + " "); } @@ -177,13 +177,13 @@ public class ExecutorUtil { contextString.setLength(contextString.length() - 1); } } - + String ctxStr = contextString.toString().replace("/", "//"); final String submitterContextStr = ctxStr.length() <= MAX_THREAD_NAME_LEN ? ctxStr : ctxStr.substring(0, MAX_THREAD_NAME_LEN); final Exception submitterStackTrace = new Exception("Submitter stack trace"); final List providersCopy = providers; - final ArrayList ctx = providersCopy.isEmpty()? null: new ArrayList<>(providersCopy.size()); - if(ctx != null) { + final ArrayList ctx = providersCopy.isEmpty() ? null : new ArrayList<>(providersCopy.size()); + if (ctx != null) { for (int i = 0; i < providers.size(); i++) { AtomicReference reference = new AtomicReference(); ctx.add(reference); @@ -193,7 +193,7 @@ public class ExecutorUtil { super.execute(new Runnable() { @Override public void run() { - if(ctx != null) { + if (ctx != null) { for (int i = 0; i < providersCopy.size(); i++) providersCopy.get(i).set(ctx.get(i)); } Map threadContext = MDC.getCopyOfContextMap(); @@ -208,7 +208,7 @@ public class ExecutorUtil { try { command.run(); } catch (Throwable t) { - if (t instanceof OutOfMemoryError) { + if (t instanceof OutOfMemoryError) { throw t; } log.error("Uncaught exception {} thrown by thread: {}", t, currentThread.getName(), submitterStackTrace); @@ -219,7 +219,7 @@ public class ExecutorUtil { } else { MDC.clear(); } - if(ctx != null) { + if (ctx != null) { for (int i = 0; i < providersCopy.size(); i++) providersCopy.get(i).clean(ctx.get(i)); } currentThread.setName(oldName);