Repository: maven-surefire Updated Branches: refs/heads/master f1f3b6fab -> 9c77aa40d
[SUREFIRE-1381] Refactoring in AbstractCommandStream and MasterProcessCommand Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9c77aa40 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9c77aa40 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9c77aa40 Branch: refs/heads/master Commit: 9c77aa40d1d4fc3455f6059d06a21341ba593c99 Parents: f1f3b6f Author: Tibor17 <tibordig...@apache.org> Authored: Sun Jun 4 23:42:27 2017 +0200 Committer: Tibor17 <tibordig...@apache.org> Committed: Sun Jun 4 23:42:27 2017 +0200 ---------------------------------------------------------------------- .../lazytestprovider/AbstractCommandStream.java | 21 ++++++-------------- .../surefire/booter/MasterProcessCommand.java | 13 +++++++----- 2 files changed, 14 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c77aa40/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java index 075d92e..31b56c4 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java @@ -36,7 +36,6 @@ public abstract class AbstractCommandStream { private byte[] currentBuffer; private int currentPos; - private volatile MasterProcessCommand lastCommand; protected abstract boolean isClosed(); @@ -71,12 +70,6 @@ public abstract class AbstractCommandStream currentPos = 0; } - @Deprecated - protected final MasterProcessCommand getLastCommand() - { - return lastCommand; - } - /** * Used by single thread in StreamFeeder class. * @@ -94,8 +87,7 @@ public abstract class AbstractCommandStream return -1; } - byte[] buffer = currentBuffer; - if ( buffer == null ) + if ( currentBuffer == null ) { tryFlush(); @@ -113,17 +105,16 @@ public abstract class AbstractCommandStream } Command cmd = nextCommand(); - lastCommand = cmd.getCommandType(); - buffer = lastCommand.hasDataType() ? lastCommand.encode( cmd.getData() ) : lastCommand.encode(); + MasterProcessCommand cmdType = cmd.getCommandType(); + currentBuffer = cmdType.hasDataType() ? cmdType.encode( cmd.getData() ) : cmdType.encode(); } - int b = buffer[currentPos++] & 0xff; - if ( currentPos == buffer.length ) + int b = currentBuffer[currentPos++] & 0xff; + if ( currentPos == currentBuffer.length ) { - buffer = null; + currentBuffer = null; currentPos = 0; } - currentBuffer = buffer; return b; } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c77aa40/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java index c82c798..5d47212 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java @@ -84,12 +84,15 @@ public enum MasterProcessCommand throw new IllegalArgumentException( "Data type can be only " + String.class ); } - byte[] dataBytes = fromDataType( data ); - byte[] encoded = new byte[8 + dataBytes.length]; - int command = getId(); - int len = dataBytes.length; + final byte[] dataBytes = fromDataType( data ); + final int len = dataBytes.length; + + final byte[] encoded = new byte[8 + len]; + + final int command = getId(); setCommandAndDataLength( command, len, encoded ); - System.arraycopy( dataBytes, 0, encoded, 8, dataBytes.length ); + System.arraycopy( dataBytes, 0, encoded, 8, len ); + return encoded; }
