buffer: remove deprecated methods

jknack · jknack · commit 4c068417932c · 2024-05-12T16:28:35.000-03:00
diff --git a/jooby/src/main/java/io/jooby/buffer/DataBuffer.java b/jooby/src/main/java/io/jooby/buffer/DataBuffer.java
@@ -95,33 +95,6 @@ public interface DataBuffer {
    */
   int capacity();
 
-  /**
-   * Set the number of bytes that this buffer can contain.
-   *
-   * <p>If the new capacity is lower than the current capacity, the contents of this buffer will be
-   * truncated. If the new capacity is higher than the current capacity, it will be expanded.
-   *
-   * @param capacity the new capacity
-   * @return this buffer
-   * @deprecated as of 6.0, in favor of {@link #ensureWritable(int)}, which has different semantics
-   */
-  @Deprecated(since = "6.0")
-  DataBuffer capacity(int capacity);
-
-  /**
-   * Ensure that the current buffer has enough {@link #writableByteCount()} to write the amount of
-   * data given as an argument. If not, the missing capacity will be added to the buffer.
-   *
-   * @param capacity the writable capacity to check for
-   * @return this buffer
-   * @since 5.1.4
-   * @deprecated since 6.0, in favor of {@link #ensureWritable(int)}
-   */
-  @Deprecated(since = "6.0")
-  default DataBuffer ensureCapacity(int capacity) {
-    return ensureWritable(capacity);
-  }
-
   /**
    * Ensure that the current buffer has enough {@link #writableByteCount()} to write the amount of
    * data given as an argument. If not, the missing capacity will be added to the buffer.
@@ -300,51 +273,11 @@ default DataBuffer write(CharSequence charSequence, Charset charset) {
     return this;
   }
 
-  /**
-   * Create a new {@code DataBuffer} whose contents is a shared subsequence of this data buffer's
-   * content. Data between this data buffer and the returned buffer is shared; though changes in the
-   * returned buffer's position will not be reflected in the reading nor writing position of this
-   * data buffer.
-   *
-   * <p><strong>Note</strong> that this method will <strong>not</strong> call {@link
-   * DataBufferUtils#retain(DataBuffer)} on the resulting slice: the reference count will not be
-   * increased.
-   *
-   * @param index the index at which to start the slice
-   * @param length the length of the slice
-   * @return the specified slice of this data buffer
-   * @deprecated as of 6.0, in favor of {@link #split(int)}, which has different semantics
-   */
-  @Deprecated(since = "6.0")
-  DataBuffer slice(int index, int length);
-
-  /**
-   * Create a new {@code DataBuffer} whose contents is a shared, retained subsequence of this data
-   * buffer's content. Data between this data buffer and the returned buffer is shared; though
-   * changes in the returned buffer's position will not be reflected in the reading nor writing
-   * position of this data buffer.
-   *
-   * <p><strong>Note</strong> that unlike {@link #slice(int, int)}, this method
-   * <strong>will</strong> call {@link DataBufferUtils#retain(DataBuffer)} (or equivalent) on the
-   * resulting slice.
-   *
-   * @param index the index at which to start the slice
-   * @param length the length of the slice
-   * @return the specified, retained slice of this data buffer
-   * @since 5.2
-   * @deprecated as of 6.0, in favor of {@link #split(int)}, which has different semantics
-   */
-  @Deprecated(since = "6.0")
-  default DataBuffer retainedSlice(int index, int length) {
-    return DataBufferUtils.retain(slice(index, length));
-  }
-
   /**
    * Splits this data buffer into two at the given index.
    *
    * <p>Data that precedes the {@code index} will be returned in a new buffer, while this buffer
-   * will contain data that follows after {@code index}. Memory between the two buffers is shared,
-   * but independent and cannot overlap (unlike {@link #slice(int, int) slice}).
+   * will contain data that follows after {@code index}. Memory between the two buffers is shared.
    *
    * <p>The {@linkplain #readPosition() read} and {@linkplain #writePosition() write} position of
    * the returned buffer are truncated to fit within the buffers {@linkplain #capacity() capacity}
@@ -357,64 +290,6 @@ default DataBuffer retainedSlice(int index, int length) {
    */
   DataBuffer split(int index);
 
-  /**
-   * Expose this buffer's bytes as a {@link ByteBuffer}. Data between this {@code DataBuffer} and
-   * the returned {@code ByteBuffer} is shared; though changes in the returned buffer's {@linkplain
-   * ByteBuffer#position() position} will not be reflected in the reading nor writing position of
-   * this data buffer.
-   *
-   * @return this data buffer as a byte buffer
-   * @deprecated as of 6.0, in favor of {@link #toByteBuffer(ByteBuffer)}, {@link
-   *     #readableByteBuffers()}, or {@link #writableByteBuffers()}.
-   */
-  @Deprecated(since = "6.0")
-  ByteBuffer asByteBuffer();
-
-  /**
-   * Expose a subsequence of this buffer's bytes as a {@link ByteBuffer}. Data between this {@code
-   * DataBuffer} and the returned {@code ByteBuffer} is shared; though changes in the returned
-   * buffer's {@linkplain ByteBuffer#position() position} will not be reflected in the reading nor
-   * writing position of this data buffer.
-   *
-   * @param index the index at which to start the byte buffer
-   * @param length the length of the returned byte buffer
-   * @return this data buffer as a byte buffer
-   * @since 5.0.1
-   * @deprecated as of 6.0, in favor of {@link #toByteBuffer(int, ByteBuffer, int, int)}, {@link
-   *     #readableByteBuffers()}, or {@link #writableByteBuffers()}.
-   */
-  @Deprecated(since = "6.0")
-  ByteBuffer asByteBuffer(int index, int length);
-
-  /**
-   * Returns a {@link ByteBuffer} representation of this data buffer. Data between this {@code
-   * DataBuffer} and the returned {@code ByteBuffer} is <strong>not</strong> shared.
-   *
-   * @return this data buffer as a byte buffer
-   * @since 6.0
-   * @see #readableByteBuffers()
-   * @see #writableByteBuffers()
-   * @deprecated as of 6.0.5, in favor of {@link #toByteBuffer(ByteBuffer)}
-   */
-  @Deprecated(since = "6.0.5")
-  default ByteBuffer toByteBuffer() {
-    return toByteBuffer(readPosition(), readableByteCount());
-  }
-
-  /**
-   * Returns a {@link ByteBuffer} representation of a subsequence of this buffer's bytes. Data
-   * between this {@code DataBuffer} and the returned {@code ByteBuffer} is <strong>not</strong>
-   * shared.
-   *
-   * @return this data buffer as a byte buffer
-   * @since 6.0
-   * @see #readableByteBuffers()
-   * @see #writableByteBuffers()
-   * @deprecated as of 6.0.5, in favor of {@link #toByteBuffer(int, ByteBuffer, int, int)}
-   */
-  @Deprecated(since = "6.0.5")
-  ByteBuffer toByteBuffer(int index, int length);
-
   /**
    * Copies this entire data buffer into the given destination {@code ByteBuffer}, beginning at the
    * current {@linkplain #readPosition() reading position}, and the current {@linkplain
@@ -442,7 +317,6 @@ default void toByteBuffer(ByteBuffer dest) {
 
   /**
    * Returns a closeable iterator over each {@link ByteBuffer} in this data buffer that can be read.
-   * Calling this method is more efficient than {@link #toByteBuffer()}, as no data is copied.
    * However, the byte buffers provided can only be used during the iteration.
    *
    * <p><b>Note</b> that the returned iterator must be used in a try-with-resources clause or
diff --git a/jooby/src/main/java/io/jooby/buffer/DataBufferFactory.java b/jooby/src/main/java/io/jooby/buffer/DataBufferFactory.java
@@ -23,9 +23,7 @@ public interface DataBufferFactory {
    * implementation and its configuration, this will be heap-based or direct buffer.
    *
    * @return the allocated buffer
-   * @deprecated as of 6.0, in favor of {@link #allocateBuffer(int)}
    */
-  @Deprecated(since = "6.0")
   DataBuffer allocateBuffer();
 
   /**
diff --git a/jooby/src/main/java/io/jooby/buffer/DataBufferWrapper.java b/jooby/src/main/java/io/jooby/buffer/DataBufferWrapper.java
@@ -69,18 +69,6 @@ public int capacity() {
     return this.delegate.capacity();
   }
 
-  @Override
-  @Deprecated
-  public DataBuffer capacity(int capacity) {
-    return this.delegate.capacity(capacity);
-  }
-
-  @Override
-  @Deprecated
-  public DataBuffer ensureCapacity(int capacity) {
-    return this.delegate.ensureCapacity(capacity);
-  }
-
   @Override
   public DataBuffer ensureWritable(int capacity) {
     return this.delegate.ensureWritable(capacity);
@@ -156,47 +144,11 @@ public DataBuffer write(CharSequence charSequence, Charset charset) {
     return this.delegate.write(charSequence, charset);
   }
 
-  @Override
-  @Deprecated
-  public DataBuffer slice(int index, int length) {
-    return this.delegate.slice(index, length);
-  }
-
-  @Override
-  @Deprecated
-  public DataBuffer retainedSlice(int index, int length) {
-    return this.delegate.retainedSlice(index, length);
-  }
-
   @Override
   public DataBuffer split(int index) {
     return this.delegate.split(index);
   }
 
-  @Override
-  @Deprecated
-  public ByteBuffer asByteBuffer() {
-    return this.delegate.asByteBuffer();
-  }
-
-  @Override
-  @Deprecated
-  public ByteBuffer asByteBuffer(int index, int length) {
-    return this.delegate.asByteBuffer(index, length);
-  }
-
-  @Override
-  @Deprecated
-  public ByteBuffer toByteBuffer() {
-    return this.delegate.toByteBuffer();
-  }
-
-  @Override
-  @Deprecated
-  public ByteBuffer toByteBuffer(int index, int length) {
-    return this.delegate.toByteBuffer(index, length);
-  }
-
   @Override
   public void toByteBuffer(ByteBuffer dest) {
     this.delegate.toByteBuffer(dest);
diff --git a/jooby/src/main/java/io/jooby/buffer/DefaultDataBuffer.java b/jooby/src/main/java/io/jooby/buffer/DefaultDataBuffer.java
@@ -167,13 +167,6 @@ public int capacity() {
     return this.capacity;
   }
 
-  @Override
-  @Deprecated
-  public DataBuffer capacity(int capacity) {
-    setCapacity(capacity);
-    return this;
-  }
-
   private void setCapacity(int newCapacity) {
     if (newCapacity < 0) {
       throw new IllegalArgumentException(
@@ -333,21 +326,6 @@ private void write(ByteBuffer source) {
     this.writePosition += length;
   }
 
-  @Override
-  @Deprecated
-  public DefaultDataBuffer slice(int index, int length) {
-    checkIndex(index, length);
-    int oldPosition = this.byteBuffer.position();
-    try {
-      this.byteBuffer.position(index);
-      ByteBuffer slice = this.byteBuffer.slice();
-      slice.limit(length);
-      return new SlicedDefaultDataBuffer(slice, this.dataBufferFactory, length);
-    } finally {
-      this.byteBuffer.position(oldPosition);
-    }
-  }
-
   @Override
   public DataBuffer split(int index) {
     checkIndex(index);
@@ -372,35 +350,6 @@ public DataBuffer split(int index) {
     return result;
   }
 
-  @Override
-  @Deprecated
-  public ByteBuffer asByteBuffer() {
-    return asByteBuffer(this.readPosition, readableByteCount());
-  }
-
-  @Override
-  @Deprecated
-  public ByteBuffer asByteBuffer(int index, int length) {
-    checkIndex(index, length);
-
-    ByteBuffer duplicate = this.byteBuffer.duplicate();
-    duplicate.position(index);
-    duplicate.limit(index + length);
-    return duplicate.slice();
-  }
-
-  @Override
-  @Deprecated
-  public ByteBuffer toByteBuffer(int index, int length) {
-    checkIndex(index, length);
-
-    ByteBuffer copy = allocate(length, this.byteBuffer.isDirect());
-    ByteBuffer readOnly = this.byteBuffer.asReadOnlyBuffer();
-    readOnly.clear().position(index).limit(index + length);
-    copy.put(readOnly);
-    return copy.flip();
-  }
-
   @Override
   public void toByteBuffer(int srcPos, ByteBuffer dest, int destPos, int length) {
     checkIndex(srcPos, length);
@@ -521,13 +470,6 @@ private static class SlicedDefaultDataBuffer extends DefaultDataBuffer {
       super(dataBufferFactory, byteBuffer);
       writePosition(length);
     }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public DefaultDataBuffer capacity(int newCapacity) {
-      throw new UnsupportedOperationException(
-          "Changing the capacity of a sliced buffer is not supported");
-    }
   }
 
   private static final class ByteBufferIterator implements DataBuffer.ByteBufferIterator {
diff --git a/jooby/src/main/java/io/jooby/buffer/DefaultDataBufferFactory.java b/jooby/src/main/java/io/jooby/buffer/DefaultDataBufferFactory.java
@@ -70,7 +70,6 @@ public DefaultDataBufferFactory(boolean preferDirect, int defaultInitialCapacity
   }
 
   @Override
-  @Deprecated
   public DefaultDataBuffer allocateBuffer() {
     return allocateBuffer(this.defaultInitialCapacity);
   }
diff --git a/jooby/src/main/java/io/jooby/buffer/package-info.java b/jooby/src/main/java/io/jooby/buffer/package-info.java
@@ -1,8 +1,16 @@
 /**
- * Generic abstraction for working with byte buffer implementations. Copy from
+ * Generic abstraction for working with byte buffer implementations.
+ *
+ * <p>Copy from
  * https://github.com/spring-projects/spring-framework/tree/main/spring-core/src/main/java/org/springframework/core/io/buffer.
- * - Copy all package inside io.jooby.byffer - remove all Assert/ObjectUtils import references -
- * remove Netty5DataBuffer references. - replace reactive stream classes references by JDK reactive
- * streams. - DataBufferUtils is a limited version of original - remove Deprecated methods
+ *
+ * <ul>
+ *   <li>Copy all package inside io.jooby.byffer
+ *   <li>remove all Assert/ObjectUtils import references
+ *   <li>remove Netty5DataBuffer references
+ *   <li>replace reactive stream classes references by JDK reactive streams
+ *   <li>DataBufferUtils is a limited version of original - remove Deprecated methods
+ *   <li>Remove all deprecated since 6.0 from DataBuffer and DataBufferFactory
+ * </ul>
  */
 package io.jooby.buffer;
diff --git a/modules/jooby-jackson/src/main/java/io/jooby/jackson/JacksonModule.java b/modules/jooby-jackson/src/main/java/io/jooby/jackson/JacksonModule.java
@@ -6,6 +6,7 @@
 package io.jooby.jackson;
 
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -155,6 +156,7 @@ public void install(@NonNull Jooby application) {
   @Override
   public ByteBuffer encode(@NonNull Context ctx, @NonNull Object value) throws Exception {
     ctx.setDefaultResponseType(mediaType);
+    mapper.writer().writeValue(OutputStream.nullOutputStream(), value);
     return ByteBuffer.wrap(mapper.writer().writeValueAsBytes(value));
   }
 
diff --git a/modules/jooby-netty/src/main/java/io/jooby/netty/buffer/NettyDataBuffer.java b/modules/jooby-netty/src/main/java/io/jooby/netty/buffer/NettyDataBuffer.java
diff --git a/modules/jooby-netty/src/main/java/io/jooby/netty/buffer/NettyDataBufferFactory.java b/modules/jooby-netty/src/main/java/io/jooby/netty/buffer/NettyDataBufferFactory.java

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ public interface DataBufferFactory {`
`23`	`23`	`* implementation and its configuration, this will be heap-based or direct buffer.`
`24`	`24`	`*`
`25`	`25`	`* @return the allocated buffer`
`26`		`- * @deprecated as of 6.0, in favor of {@link #allocateBuffer(int)}`
`27`	`26`	`*/`
`28`		`- @Deprecated(since = "6.0")`
`29`	`27`	`DataBuffer allocateBuffer();`
`30`	`28`
`31`	`29`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ public DefaultDataBufferFactory(boolean preferDirect, int defaultInitialCapacity`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
`73`		`- @Deprecated`
`74`	`73`	`public DefaultDataBuffer allocateBuffer() {`
`75`	`74`	`return allocateBuffer(this.defaultInitialCapacity);`
`76`	`75`	`}`