From 5803468c79199442e4535c90ba858758f47089ba Mon Sep 17 00:00:00 2001 From: Anton Klaren Date: Tue, 13 Mar 2018 09:56:02 +0100 Subject: [PATCH] Removed unused generic type --- .../main/java/org/neo4j/backup/BackupClient.java | 4 ++-- .../main/java/org/neo4j/backup/BackupServer.java | 4 ++-- .../com/src/main/java/org/neo4j/com/Client.java | 10 +++++----- .../src/main/java/org/neo4j/com/Protocol.java | 2 +- .../src/main/java/org/neo4j/com/RequestType.java | 2 +- .../com/src/main/java/org/neo4j/com/Server.java | 16 ++++++++-------- .../org/neo4j/com/monitor/RequestMonitor.java | 2 +- .../test/java/org/neo4j/com/MadeUpServer.java | 6 +++--- .../src/test/java/org/neo4j/com/ServerTest.java | 2 +- .../neo4j/kernel/ha/AbstractHaRequestTypes.java | 5 ++--- .../java/org/neo4j/kernel/ha/HaRequestType.java | 3 +-- .../java/org/neo4j/kernel/ha/HaRequestTypes.java | 7 +++---- .../org/neo4j/kernel/ha/MasterClient214.java | 4 ++-- .../neo4j/kernel/ha/com/master/MasterServer.java | 2 +- .../neo4j/kernel/ha/com/master/SlaveClient.java | 2 +- .../neo4j/kernel/ha/com/slave/SlaveServer.java | 2 +- 16 files changed, 35 insertions(+), 38 deletions(-) diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupClient.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupClient.java index 7782568b7127b..fcfc16c765a7e 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupClient.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupClient.java @@ -80,12 +80,12 @@ public ProtocolVersion getProtocolVersion() } @Override - protected boolean shouldCheckStoreId( RequestType type ) + protected boolean shouldCheckStoreId( RequestType type ) { return type != BackupRequestType.FULL_BACKUP; } - public enum BackupRequestType implements RequestType + public enum BackupRequestType implements RequestType { FULL_BACKUP( (TargetCaller) ( master, context, input, target ) -> { diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupServer.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupServer.java index 3c538d5283108..17da9ae674dc8 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupServer.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupServer.java @@ -103,13 +103,13 @@ public HostnamePort getServerAddress() } @Override - protected void responseWritten( RequestType type, Channel channel, + protected void responseWritten( RequestType type, Channel channel, RequestContext context ) { } @Override - protected RequestType getRequestContext( byte id ) + protected RequestType getRequestContext( byte id ) { return contexts[id]; } diff --git a/enterprise/com/src/main/java/org/neo4j/com/Client.java b/enterprise/com/src/main/java/org/neo4j/com/Client.java index b3930c9024c10..82ed9c3e34833 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/Client.java +++ b/enterprise/com/src/main/java/org/neo4j/com/Client.java @@ -282,13 +282,13 @@ public void stop() msgLog.info( toString() + " shutdown", true ); } - protected Response sendRequest( RequestType type, RequestContext context, + protected Response sendRequest( RequestType type, RequestContext context, Serializer serializer, Deserializer deserializer ) { return sendRequest( type, context, serializer, deserializer, null, NO_OP_TX_HANDLER ); } - protected Response sendRequest( RequestType type, RequestContext context, + protected Response sendRequest( RequestType type, RequestContext context, Serializer serializer, Deserializer deserializer, StoreId specificStoreId, TxHandler txHandler ) { @@ -351,12 +351,12 @@ protected Response sendRequest( RequestType type, RequestContext conte } } - protected long getReadTimeout( RequestType type, long readTimeout ) + protected long getReadTimeout( RequestType type, long readTimeout ) { return readTimeout; } - protected boolean shouldCheckStoreId( RequestType type ) + protected boolean shouldCheckStoreId( RequestType type ) { return true; } @@ -374,7 +374,7 @@ private void assertCorrectStoreId( StoreId storeId, StoreId myStoreId ) } } - private ChannelContext acquireChannelContext( RequestType type ) + private ChannelContext acquireChannelContext( RequestType type ) { try { diff --git a/enterprise/com/src/main/java/org/neo4j/com/Protocol.java b/enterprise/com/src/main/java/org/neo4j/com/Protocol.java index 8c6d8343a0098..9a6dbcfa1495d 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/Protocol.java +++ b/enterprise/com/src/main/java/org/neo4j/com/Protocol.java @@ -175,7 +175,7 @@ public static void assertChunkSizeIsWithinFrameSize( int chunkSize, int frameLen } } - public void serializeRequest( Channel channel, ChannelBuffer buffer, RequestType type, RequestContext ctx, + public void serializeRequest( Channel channel, ChannelBuffer buffer, RequestType type, RequestContext ctx, Serializer payload ) throws IOException { buffer.clear(); diff --git a/enterprise/com/src/main/java/org/neo4j/com/RequestType.java b/enterprise/com/src/main/java/org/neo4j/com/RequestType.java index 2d95653acabe9..37411a18a3da7 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/RequestType.java +++ b/enterprise/com/src/main/java/org/neo4j/com/RequestType.java @@ -19,7 +19,7 @@ */ package org.neo4j.com; -public interface RequestType +public interface RequestType { TargetCaller getTargetCaller(); diff --git a/enterprise/com/src/main/java/org/neo4j/com/Server.java b/enterprise/com/src/main/java/org/neo4j/com/Server.java index 983825f4a435e..eb51dc15b88ad 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/Server.java +++ b/enterprise/com/src/main/java/org/neo4j/com/Server.java @@ -411,7 +411,7 @@ protected void handleRequest( ChannelBuffer buffer, final Channel channel ) if ( partialRequest == null ) { // This is the first chunk in a multi-chunk request - RequestType type = getRequestContext( buffer.readByte() ); + RequestType type = getRequestContext( buffer.readByte() ); RequestContext context = readContext( buffer ); ChannelBuffer targetBuffer = mapSlave( channel, context ); partialRequest = new PartialRequest( type, context, targetBuffer ); @@ -422,7 +422,7 @@ protected void handleRequest( ChannelBuffer buffer, final Channel channel ) else { PartialRequest partialRequest = partialRequests.remove( channel ); - RequestType type; + RequestType type; RequestContext context; ChannelBuffer targetBuffer; ChannelBuffer bufferToReadFrom; @@ -488,7 +488,7 @@ protected void writeFailureResponse( Throwable exception, ChunkingChannelBuffer } } - protected void responseWritten( RequestType type, Channel channel, RequestContext context ) + protected void responseWritten( RequestType type, Channel channel, RequestContext context ) { } @@ -511,7 +511,7 @@ protected RequestContext readContext( ChannelBuffer buffer ) return readRequestContext; } - protected abstract RequestType getRequestContext( byte id ); + protected abstract RequestType getRequestContext( byte id ); protected ChannelBuffer mapSlave( Channel channel, RequestContext slave ) { @@ -551,13 +551,13 @@ protected ChunkingChannelBuffer newChunkingBuffer( ChannelBuffer bufferToWriteTo private class TargetCaller implements Response.Handler, Runnable { - private final RequestType type; + private final RequestType type; private final Channel channel; private final RequestContext context; private final ChunkingChannelBuffer targetBuffer; private final ChannelBuffer bufferToReadFrom; - TargetCaller( RequestType type, Channel channel, RequestContext context, + TargetCaller( RequestType type, Channel channel, RequestContext context, ChunkingChannelBuffer targetBuffer, ChannelBuffer bufferToReadFrom ) { this.type = type; @@ -621,9 +621,9 @@ private class PartialRequest { final RequestContext context; final ChannelBuffer buffer; - final RequestType type; + final RequestType type; - PartialRequest( RequestType type, RequestContext context, ChannelBuffer buffer ) + PartialRequest( RequestType type, RequestContext context, ChannelBuffer buffer ) { this.type = type; this.context = context; diff --git a/enterprise/com/src/main/java/org/neo4j/com/monitor/RequestMonitor.java b/enterprise/com/src/main/java/org/neo4j/com/monitor/RequestMonitor.java index 836f1870762b9..ffa872e351906 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/monitor/RequestMonitor.java +++ b/enterprise/com/src/main/java/org/neo4j/com/monitor/RequestMonitor.java @@ -26,7 +26,7 @@ public interface RequestMonitor { - void beginRequest( SocketAddress remoteAddress, RequestType requestType, RequestContext requestContext ); + void beginRequest( SocketAddress remoteAddress, RequestType requestType, RequestContext requestContext ); void endRequest( Throwable t ); } diff --git a/enterprise/com/src/test/java/org/neo4j/com/MadeUpServer.java b/enterprise/com/src/test/java/org/neo4j/com/MadeUpServer.java index b40864fdca756..37d72af6d1a68 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/MadeUpServer.java +++ b/enterprise/com/src/test/java/org/neo4j/com/MadeUpServer.java @@ -76,7 +76,7 @@ public HostnamePort getServerAddress() } @Override - protected void responseWritten( RequestType type, Channel channel, + protected void responseWritten( RequestType type, Channel channel, RequestContext context ) { responseWritten = true; @@ -96,7 +96,7 @@ protected byte getInternalProtocolVersion() } @Override - protected RequestType getRequestContext( byte id ) + protected RequestType getRequestContext( byte id ) { return MadeUpRequestType.values()[id]; } @@ -116,7 +116,7 @@ public boolean responseFailureEncountered() return responseFailureEncountered; } - enum MadeUpRequestType implements RequestType + enum MadeUpRequestType implements RequestType { MULTIPLY( ( master, context, input, target ) -> { diff --git a/enterprise/com/src/test/java/org/neo4j/com/ServerTest.java b/enterprise/com/src/test/java/org/neo4j/com/ServerTest.java index af7764fc7bc5f..34853c1c0e148 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/ServerTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/ServerTest.java @@ -138,7 +138,7 @@ private Server newServer( final TxChecksumVerifier checksumVerifi mock( ByteCounterMonitor.class ), mock( RequestMonitor.class ) ) { @Override - protected RequestType getRequestContext( byte id ) + protected RequestType getRequestContext( byte id ) { return mock( RequestType.class ); } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractHaRequestTypes.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractHaRequestTypes.java index 78d102e7373f8..89551cc327656 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractHaRequestTypes.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractHaRequestTypes.java @@ -22,7 +22,6 @@ import org.neo4j.com.ObjectSerializer; import org.neo4j.com.RequestType; import org.neo4j.com.TargetCaller; -import org.neo4j.kernel.ha.com.master.Master; abstract class AbstractHaRequestTypes implements HaRequestTypes { @@ -40,13 +39,13 @@ protected void register( Type type, TargetCaller targetCaller, Obje } @Override - public RequestType type( Type type ) + public RequestType type( Type type ) { return type( (byte) type.ordinal() ); } @Override - public RequestType type( byte id ) + public RequestType type( byte id ) { HaRequestType requestType = types[id]; if ( requestType == null ) diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestType.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestType.java index a77a73a2090c6..403060073a4ed 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestType.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestType.java @@ -22,9 +22,8 @@ import org.neo4j.com.ObjectSerializer; import org.neo4j.com.RequestType; import org.neo4j.com.TargetCaller; -import org.neo4j.kernel.ha.com.master.Master; -public class HaRequestType implements RequestType +public class HaRequestType implements RequestType { private final TargetCaller targetCaller; private final ObjectSerializer objectSerializer; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestTypes.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestTypes.java index cf5cb43bf3041..0c12dc5208571 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestTypes.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaRequestTypes.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.ha; import org.neo4j.com.RequestType; -import org.neo4j.kernel.ha.com.master.Master; public interface HaRequestTypes { @@ -43,13 +42,13 @@ enum Type CREATE_PROPERTY_KEY, CREATE_LABEL; - public boolean is( RequestType type ) + public boolean is( RequestType type ) { return type.id() == ordinal(); } } - RequestType type( Type type ); + RequestType type( Type type ); - RequestType type( byte id ); + RequestType type( byte id ); } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient214.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient214.java index 0a9345939be7f..065112405b574 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient214.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient214.java @@ -151,7 +151,7 @@ public Deserializer createLockResultDeserializer() } @Override - protected long getReadTimeout( RequestType type, long readTimeout ) + protected long getReadTimeout( RequestType type, long readTimeout ) { if ( HaRequestTypes.Type.ACQUIRE_EXCLUSIVE_LOCK.is( type ) || HaRequestTypes.Type.ACQUIRE_SHARED_LOCK.is( type ) ) @@ -166,7 +166,7 @@ protected long getReadTimeout( RequestType type, long readTimeout ) } @Override - protected boolean shouldCheckStoreId( RequestType type ) + protected boolean shouldCheckStoreId( RequestType type ) { return !HaRequestTypes.Type.COPY_STORE.is( type ); } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterServer.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterServer.java index 00998cf0df9b1..51192202fc2e2 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterServer.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterServer.java @@ -57,7 +57,7 @@ public MasterServer( Master requestTarget, LogProvider logProvider, Configuratio } @Override - protected RequestType getRequestContext( byte id ) + protected RequestType getRequestContext( byte id ) { return requestTypes.type( id ); } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/SlaveClient.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/SlaveClient.java index a177d6763c49d..0a0da9239923c 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/SlaveClient.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/SlaveClient.java @@ -75,7 +75,7 @@ public ProtocolVersion getProtocolVersion() return SlaveServer.SLAVE_PROTOCOL_VERSION; } - public enum SlaveRequestType implements RequestType + public enum SlaveRequestType implements RequestType { PULL_UPDATES( (TargetCaller) ( master, context, input, target ) -> { diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/SlaveServer.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/SlaveServer.java index ea118e226ae6c..df3ecf078f21e 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/SlaveServer.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/SlaveServer.java @@ -48,7 +48,7 @@ public SlaveServer( Slave requestTarget, Configuration config, LogProvider logPr } @Override - protected RequestType getRequestContext( byte id ) + protected RequestType getRequestContext( byte id ) { return SlaveRequestType.values()[id]; }