[SUREFIRE-1982] Fix failures (java.nio.ChartBuffer) when compiled on …

…Java 9+ and run on Java 8
apache · Jan 19, 2022 · 747c757 · 747c757
1 parent 2da8f9b
commit 747c757
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
@@ -171,7 +171,7 @@ protected Charset readCharset( @Nonnull Memento memento ) throws IOException, Ma
 
     protected String readString( @Nonnull Memento memento ) throws IOException, MalformedFrameException
     {
-        memento.getCharBuffer().clear();
+        ( (Buffer) memento.getCharBuffer() ).clear();
         int readCount = readInt( memento );
         if ( readCount < 0 )
         {
@@ -293,7 +293,7 @@ private String readString( @Nonnull final Memento memento, @Nonnegative final in
     {
         memento.getDecoder().reset();
         final CharBuffer output = memento.getCharBuffer();
-        output.clear();
+        ( (Buffer) output ).clear();
         final ByteBuffer input = memento.getByteBuffer();
         final List<String> strings = new ArrayList<>();
         int countDecodedBytes = 0;
@@ -317,13 +317,13 @@ private String readString( @Nonnull final Memento memento, @Nonnegative final in
 
             if ( isLastChunk || !output.hasRemaining() )
             {
-                strings.add( output.flip().toString() );
-                output.clear();
+                strings.add( ( (Buffer) output ).flip().toString() );
+                ( (Buffer) output ).clear();
             }
         }
 
         memento.getDecoder().reset();
-        output.clear();
+        ( (Buffer) output ).clear();
 
         return toString( strings );
     }

diff --git a/...ire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java b/...ire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java
@@ -151,7 +151,7 @@ public void shouldDecodeHappyCase() throws Exception
         ByteBuffer input = ByteBuffer.allocate( 1024 );
         ( (Buffer) input.put( PATTERN2_BYTES ) ).flip();
         int bytesToDecode = PATTERN2_BYTES.length;
-        CharBuffer output = CharBuffer.allocate( 1024 );
+        Buffer output = CharBuffer.allocate( 1024 );
         int readBytes = invokeMethod( AbstractStreamDecoder.class, "decodeString", decoder, input, output,
             bytesToDecode, true, 0 );
 
@@ -172,7 +172,7 @@ public void shouldDecodeShifted() throws Exception
             .put( 91, (byte) 'B' )
             .put( 92, (byte) 'C' ) )
             .position( 90 );
-        CharBuffer output = CharBuffer.allocate( 1024 );
+        Buffer output = CharBuffer.allocate( 1024 );
         int readBytes =
             invokeMethod( AbstractStreamDecoder.class, "decodeString", decoder, input, output, 2, true, 0 );
 
@@ -371,9 +371,9 @@ public void shouldDecode100Bytes() throws Exception
         {
             decoder.reset()
                 .decode( buffer, chars, true ); // CharsetDecoder 71 nanos
-            s = chars.flip().toString(); // CharsetDecoder + toString = 91 nanos
+            s = ( (Buffer) chars ).flip().toString(); // CharsetDecoder + toString = 91 nanos
             ( (Buffer) buffer ).clear();
-            chars.clear();
+            ( (Buffer) chars ).clear();
         }
         long l2 = System.currentTimeMillis();
         System.out.println( "decoded 100 bytes within " + ( l2 - l1 ) + " millis (10 million cycles)" );