diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java index a2895f6ded57..d985ffbe1777 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -153,7 +153,6 @@ private static final class JettyDataBuffer implements PooledDataBuffer { private final AtomicInteger refCount = new AtomicInteger(1); - public JettyDataBuffer(DataBuffer delegate, Content.Chunk chunk) { Assert.notNull(delegate, "Delegate must not be null"); Assert.notNull(chunk, "Chunk must not be null"); @@ -390,7 +389,6 @@ private static final class JettyByteBufferIterator implements ByteBufferIterator private final Content.Chunk chunk; - public JettyByteBufferIterator(ByteBufferIterator delegate, Content.Chunk chunk) { Assert.notNull(delegate, "Delegate must not be null"); Assert.notNull(chunk, "Chunk must not be null"); @@ -400,7 +398,6 @@ public JettyByteBufferIterator(ByteBufferIterator delegate, Content.Chunk chunk) this.chunk.retain(); } - @Override public void close() { this.delegate.close(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java index 5e4b08d455ae..33db8439682e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java @@ -306,48 +306,18 @@ public void toByteBuffer(int srcPos, ByteBuffer dest, int destPos, int length) { @Override public ByteBufferIterator readableByteBuffers() { - ByteBufferIterator delegateIterator = this.delegate.readableByteBuffers(); - return new JettyByteBufferIterator(delegateIterator); + return this.delegate.readableByteBuffers(); } @Override public ByteBufferIterator writableByteBuffers() { - ByteBufferIterator delegateIterator = this.delegate.writableByteBuffers(); - return new JettyByteBufferIterator(delegateIterator); + return this.delegate.writableByteBuffers(); } @Override public String toString(int index, int length, Charset charset) { return this.delegate.toString(index, length, charset); } - - - private static class JettyByteBufferIterator implements ByteBufferIterator { - - private final ByteBufferIterator delegate; - - - JettyByteBufferIterator(ByteBufferIterator delegate) { - Assert.notNull(delegate, "Delegate must not be null"); - - this.delegate = delegate; - } - - @Override - public void close() { - this.delegate.close(); - } - - @Override - public boolean hasNext() { - return this.delegate.hasNext(); - } - - @Override - public ByteBuffer next() { - return this.delegate.next(); - } - } } }