diff options
Diffstat (limited to 'lib/java/src/main/java/org/apache/thrift/server')
8 files changed, 30 insertions, 20 deletions
diff --git a/lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java b/lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java index 01b15e841..954aaebf1 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java +++ b/lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java @@ -66,7 +66,7 @@ public abstract class AbstractNonblockingServer extends TServer { /** How many bytes are currently allocated to read buffers. */ final AtomicLong readBufferBytesAllocated = new AtomicLong(0); - public AbstractNonblockingServer(AbstractNonblockingServerArgs args) { + public AbstractNonblockingServer(AbstractNonblockingServerArgs<?> args) { super(args); MAX_READ_BUFFER_BYTES = args.maxReadBufferBytes; } diff --git a/lib/java/src/main/java/org/apache/thrift/server/Invocation.java b/lib/java/src/main/java/org/apache/thrift/server/Invocation.java index 64f896927..423b40bf3 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/Invocation.java +++ b/lib/java/src/main/java/org/apache/thrift/server/Invocation.java @@ -14,6 +14,7 @@ class Invocation implements Runnable { this.frameBuffer = frameBuffer; } + @Override public void run() { frameBuffer.invoke(); } diff --git a/lib/java/src/main/java/org/apache/thrift/server/TExtensibleServlet.java b/lib/java/src/main/java/org/apache/thrift/server/TExtensibleServlet.java index 5c141000a..fa5acac51 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/TExtensibleServlet.java +++ b/lib/java/src/main/java/org/apache/thrift/server/TExtensibleServlet.java @@ -52,8 +52,6 @@ public abstract class TExtensibleServlet extends HttpServlet { private TProtocolFactory inFactory; - private TProtocolFactory outFactory; - private Collection<Map.Entry<String, String>> customHeaders; /** @@ -85,7 +83,7 @@ public abstract class TExtensibleServlet extends HttpServlet { super.init(config); // no-args init() happens here this.processor = getProcessor(); this.inFactory = getInProtocolFactory(); - this.outFactory = getOutProtocolFactory(); + TProtocolFactory outFactory = getOutProtocolFactory(); this.customHeaders = new ArrayList<Map.Entry<String, String>>(); if (processor == null) { @@ -105,8 +103,8 @@ public abstract class TExtensibleServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - TTransport inTransport = null; - TTransport outTransport = null; + TTransport inTransport; + TTransport outTransport; try { response.setContentType("application/x-thrift"); @@ -146,14 +144,17 @@ public abstract class TExtensibleServlet extends HttpServlet { public void addCustomHeader(final String key, final String value) { this.customHeaders.add( new Map.Entry<String, String>() { + @Override public String getKey() { return key; } + @Override public String getValue() { return value; } + @Override public String setValue(String value) { return null; } diff --git a/lib/java/src/main/java/org/apache/thrift/server/TNonblockingServer.java b/lib/java/src/main/java/org/apache/thrift/server/TNonblockingServer.java index fa75569d9..5c015eb46 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/TNonblockingServer.java +++ b/lib/java/src/main/java/org/apache/thrift/server/TNonblockingServer.java @@ -47,7 +47,7 @@ public class TNonblockingServer extends AbstractNonblockingServer { private SelectAcceptThread selectAcceptThread_; - public TNonblockingServer(AbstractNonblockingServerArgs args) { + public TNonblockingServer(AbstractNonblockingServerArgs<?> args) { super(args); } @@ -132,6 +132,7 @@ public class TNonblockingServer extends AbstractNonblockingServer { * The work loop. Handles both selecting (all IO operations) and managing the selection * preferences of all existing connections. */ + @Override public void run() { try { if (eventHandler_ != null) { diff --git a/lib/java/src/main/java/org/apache/thrift/server/TServlet.java b/lib/java/src/main/java/org/apache/thrift/server/TServlet.java index c025a498e..831842b55 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/TServlet.java +++ b/lib/java/src/main/java/org/apache/thrift/server/TServlet.java @@ -87,6 +87,7 @@ public class TServlet extends HttpServlet { /** * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) */ + @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doPost(request, response); @@ -95,14 +96,17 @@ public class TServlet extends HttpServlet { public void addCustomHeader(final String key, final String value) { this.customHeaders.add( new Map.Entry<String, String>() { + @Override public String getKey() { return key; } + @Override public String getValue() { return value; } + @Override public String setValue(String value) { return null; } diff --git a/lib/java/src/main/java/org/apache/thrift/server/TSimpleServer.java b/lib/java/src/main/java/org/apache/thrift/server/TSimpleServer.java index 3530d6d8c..69af88a6b 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/TSimpleServer.java +++ b/lib/java/src/main/java/org/apache/thrift/server/TSimpleServer.java @@ -36,6 +36,7 @@ public class TSimpleServer extends TServer { super(args); } + @Override public void serve() { try { serverTransport_.listen(); diff --git a/lib/java/src/main/java/org/apache/thrift/server/TThreadPoolServer.java b/lib/java/src/main/java/org/apache/thrift/server/TThreadPoolServer.java index 357410f39..82d3a29d4 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/TThreadPoolServer.java +++ b/lib/java/src/main/java/org/apache/thrift/server/TThreadPoolServer.java @@ -82,7 +82,7 @@ public class TThreadPoolServer extends TServer { } // Executor service for handling client connections - private ExecutorService executorService_; + private final ExecutorService executorService_; private final TimeUnit stopTimeoutUnit; @@ -140,6 +140,7 @@ public class TThreadPoolServer extends TServer { return true; } + @Override public void serve() { if (!preServe()) { return; @@ -196,6 +197,7 @@ public class TThreadPoolServer extends TServer { return false; } + @Override public void stop() { stopped_ = true; serverTransport_.interrupt(); @@ -204,7 +206,7 @@ public class TThreadPoolServer extends TServer { private class WorkerProcess implements Runnable { /** Client that this services. */ - private TTransport client_; + private final TTransport client_; /** * Default constructor. @@ -216,6 +218,7 @@ public class TThreadPoolServer extends TServer { } /** Loops on processing a client forever */ + @Override public void run() { TProcessor processor = null; TTransport inputTransport = null; diff --git a/lib/java/src/main/java/org/apache/thrift/server/TThreadedSelectorServer.java b/lib/java/src/main/java/org/apache/thrift/server/TThreadedSelectorServer.java index 0a4d8575f..ae3d292d4 100644 --- a/lib/java/src/main/java/org/apache/thrift/server/TThreadedSelectorServer.java +++ b/lib/java/src/main/java/org/apache/thrift/server/TThreadedSelectorServer.java @@ -50,10 +50,10 @@ import org.slf4j.LoggerFactory; * reading and writing of client connections. A synchronous worker thread pool handles processing of * requests. * - * <p>Performs better than TNonblockingServer/THsHaServer in multi-core environments when the the + * <p>Performs better than TNonblockingServer/THsHaServer in multi-core environments when the * bottleneck is CPU on the single selector thread handling I/O. In addition, because the accept * handling is decoupled from reads/writes and invocation, the server has better ability to handle - * back- pressure from new connections (e.g. stop accepting when busy). + * back-pressure from new connections (e.g. stop accepting when busy). * * <p>Like TNonblockingServer, it relies on the use of TFramedTransport. */ @@ -183,7 +183,7 @@ public class TThreadedSelectorServer extends AbstractNonblockingServer { private AcceptThread acceptThread; // Threads handling events on client transports - private final Set<SelectorThread> selectorThreads = new HashSet<SelectorThread>(); + private final Set<SelectorThread> selectorThreads = new HashSet<>(); // This wraps all the functionality of queueing and thread pool management // for the passing of Invocations from the selector thread(s) to the workers @@ -257,10 +257,8 @@ public class TThreadedSelectorServer extends AbstractNonblockingServer { if (acceptThread != null) { acceptThread.wakeupSelector(); } - if (selectorThreads != null) { - for (SelectorThread thread : selectorThreads) { - if (thread != null) thread.wakeupSelector(); - } + for (SelectorThread thread : selectorThreads) { + if (thread != null) thread.wakeupSelector(); } } @@ -341,7 +339,7 @@ public class TThreadedSelectorServer extends AbstractNonblockingServer { /** * Set up the AcceptThead * - * @throws IOException + * @throws IOException if failed to register selector */ public AcceptThread( TNonblockingServerTransport serverTransport, SelectorThreadLoadBalancer threadChooser) @@ -464,8 +462,8 @@ public class TThreadedSelectorServer extends AbstractNonblockingServer { // Accepted connections added by the accept thread. private final BlockingQueue<TNonblockingTransport> acceptedQueue; - private int SELECTOR_AUTO_REBUILD_THRESHOLD = 512; - private long MONITOR_PERIOD = 1000L; + private static final int SELECTOR_AUTO_REBUILD_THRESHOLD = 512; + private static final long MONITOR_PERIOD = 1000L; private int jvmBug = 0; /** @@ -581,7 +579,8 @@ public class TThreadedSelectorServer extends AbstractNonblockingServer { } /** - * Do select and judge epoll bug happen. See : https://issues.apache.org/jira/browse/THRIFT-4251 + * Do select and judge epoll bug happen. See <a + * href="https://issues.apache.org/jira/browse/THRIFT-4251">THRIFT-4251</a> */ private void doSelect() throws IOException { long beforeSelect = System.currentTimeMillis(); |