Skip to content

Commit b40f3ef

Browse files
jknackjknack
committed
output api: completely remove DataBuffer from source code (happy to do it)
- fix #3604
1 parent 94f37c0 commit b40f3ef

File tree

62 files changed

+35
-4824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+35
-4824
lines changed

‎jooby/src/main/java/io/jooby/Context.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030

3131
import edu.umd.cs.findbugs.annotations.NonNull;
3232
import edu.umd.cs.findbugs.annotations.Nullable;
33-
import io.jooby.buffer.DataBuffer;
34-
import io.jooby.buffer.DataBufferFactory;
3533
import io.jooby.internal.LocaleUtils;
3634
import io.jooby.internal.ParamLookupImpl;
3735
import io.jooby.internal.ReadOnlyContext;
@@ -147,8 +145,6 @@ private static Selector single() {
147145
*/
148146
Router getRouter();
149147

150-
DataBufferFactory getBufferFactory();
151-
152148
OutputFactory getOutputFactory();
153149

154150
/**
@@ -1310,14 +1306,6 @@ Context responseWriter(
13101306
*/
13111307
Context send(@NonNull ByteBuffer data);
13121308

1313-
/**
1314-
* Send response data.
1315-
*
1316-
* @param data Response.
1317-
* @return This context.
1318-
*/
1319-
Context send(@NonNull DataBuffer data);
1320-
13211309
/**
13221310
* Send response data.
13231311
*

‎jooby/src/main/java/io/jooby/DefaultContext.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
import edu.umd.cs.findbugs.annotations.NonNull;
3232
import edu.umd.cs.findbugs.annotations.Nullable;
33-
import io.jooby.buffer.DataBufferFactory;
3433
import io.jooby.exception.RegistryException;
3534
import io.jooby.internal.HashValue;
3635
import io.jooby.internal.MissingValue;
@@ -655,10 +654,6 @@ default Context sendError(@NonNull Throwable cause, @NonNull StatusCode code) {
655654
return this;
656655
}
657656

658-
default DataBufferFactory getBufferFactory() {
659-
return getRouter().getBufferFactory();
660-
}
661-
662657
@Override
663658
default OutputFactory getOutputFactory() {
664659
return new ByteBufferOutputFactory();

‎jooby/src/main/java/io/jooby/ForwardingContext.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
import edu.umd.cs.findbugs.annotations.NonNull;
2525
import edu.umd.cs.findbugs.annotations.Nullable;
26-
import io.jooby.buffer.DataBuffer;
27-
import io.jooby.buffer.DataBufferFactory;
2826
import io.jooby.exception.RegistryException;
2927
import io.jooby.output.Output;
3028
import io.jooby.output.OutputFactory;
@@ -672,11 +670,6 @@ public Router getRouter() {
672670
return ctx.getRouter();
673671
}
674672

675-
@Override
676-
public DataBufferFactory getBufferFactory() {
677-
return ctx.getBufferFactory();
678-
}
679-
680673
@Override
681674
public OutputFactory getOutputFactory() {
682675
return ctx.getOutputFactory();
@@ -1235,12 +1228,6 @@ public Context send(@NonNull ByteBuffer data) {
12351228
return this;
12361229
}
12371230

1238-
@Override
1239-
public Context send(@NonNull DataBuffer data) {
1240-
ctx.send(data);
1241-
return this;
1242-
}
1243-
12441231
@Override
12451232
public Context send(@NonNull Output output) {
12461233
ctx.send(output);

‎jooby/src/main/java/io/jooby/Jooby.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import com.typesafe.config.Config;
4646
import edu.umd.cs.findbugs.annotations.NonNull;
4747
import edu.umd.cs.findbugs.annotations.Nullable;
48-
import io.jooby.buffer.DataBufferFactory;
4948
import io.jooby.exception.RegistryException;
5049
import io.jooby.exception.StartupException;
5150
import io.jooby.internal.LocaleUtils;
@@ -741,17 +740,6 @@ public Jooby setDefaultWorker(@NonNull Executor worker) {
741740
return this;
742741
}
743742

744-
@NonNull @Override
745-
public DataBufferFactory getBufferFactory() {
746-
return router.getBufferFactory();
747-
}
748-
749-
@NonNull @Override
750-
public Jooby setBufferFactory(@NonNull DataBufferFactory bufferFactory) {
751-
router.setBufferFactory(bufferFactory);
752-
return this;
753-
}
754-
755743
@NonNull @Override
756744
public Logger getLog() {
757745
return LoggerFactory.getLogger(getClass());

‎jooby/src/main/java/io/jooby/Router.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.typesafe.config.Config;
3434
import edu.umd.cs.findbugs.annotations.NonNull;
3535
import edu.umd.cs.findbugs.annotations.Nullable;
36-
import io.jooby.buffer.DataBufferFactory;
3736
import io.jooby.exception.MissingValueException;
3837
import io.jooby.handler.AssetHandler;
3938
import io.jooby.handler.AssetSource;
@@ -537,14 +536,10 @@ default Object execute(@NonNull Context context) {
537536
*/
538537
@NonNull Router setDefaultWorker(@NonNull Executor worker);
539538

540-
@NonNull DataBufferFactory getBufferFactory();
541-
542539
@NonNull OutputFactory getOutputFactory();
543540

544541
@NonNull Router setOutputFactory(@NonNull OutputFactory outputFactory);
545542

546-
@NonNull Router setBufferFactory(@NonNull DataBufferFactory bufferFactory);
547-
548543
/**
549544
* Attach a filter to the route pipeline.
550545
*

‎jooby/src/main/java/io/jooby/Sender.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010

1111
import edu.umd.cs.findbugs.annotations.NonNull;
1212
import edu.umd.cs.findbugs.annotations.Nullable;
13-
import io.jooby.buffer.DataBuffer;
1413
import io.jooby.output.Output;
1514

1615
/**
17-
* Non-blocking sender. Reactive responses uses this class to send partial data in non-blocking
16+
* Non-blocking sender. Reactive responses use this class to send partial data in a non-blocking
1817
* manner.
1918
*
2019
* <p>RxJava example:
@@ -87,17 +86,15 @@ interface Callback {
8786
}
8887

8988
/**
90-
* Write a bytes chunk. Chunk is flushed immediately.
89+
* Write a byte chunk. Chunk is flushed immediately.
9190
*
9291
* @param data Bytes chunk.
9392
* @param callback Callback.
9493
* @return This sender.
9594
*/
96-
@NonNull Sender write(@NonNull byte[] data, @NonNull Callback callback);
95+
Sender write(@NonNull byte[] data, @NonNull Callback callback);
9796

98-
@NonNull Sender write(@NonNull DataBuffer data, @NonNull Callback callback);
99-
100-
@NonNull Sender write(@NonNull Output output, @NonNull Callback callback);
97+
Sender write(@NonNull Output output, @NonNull Callback callback);
10198

10299
/** Close the sender. */
103100
void close();

‎jooby/src/main/java/io/jooby/WebSocket.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import edu.umd.cs.findbugs.annotations.NonNull;
1313
import edu.umd.cs.findbugs.annotations.Nullable;
14-
import io.jooby.buffer.DataBuffer;
1514
import io.jooby.output.Output;
1615

1716
/**
@@ -242,12 +241,6 @@ interface WriteCallback {
242241

243242
@NonNull WebSocket send(@NonNull ByteBuffer message, @NonNull WriteCallback callback);
244243

245-
default @NonNull WebSocket send(@NonNull DataBuffer message) {
246-
return send(message, WriteCallback.NOOP);
247-
}
248-
249-
@NonNull WebSocket send(@NonNull DataBuffer message, @NonNull WriteCallback callback);
250-
251244
default @NonNull WebSocket send(@NonNull Output message) {
252245
return send(message, WriteCallback.NOOP);
253246
}
@@ -300,12 +293,6 @@ interface WriteCallback {
300293

301294
@NonNull WebSocket sendBinary(@NonNull ByteBuffer message, @NonNull WriteCallback callback);
302295

303-
default @NonNull WebSocket sendBinary(@NonNull DataBuffer message) {
304-
return sendBinary(message, WriteCallback.NOOP);
305-
}
306-
307-
@NonNull WebSocket sendBinary(@NonNull DataBuffer message, @NonNull WriteCallback callback);
308-
309296
default @NonNull WebSocket sendBinary(@NonNull Output message) {
310297
return sendBinary(message, WriteCallback.NOOP);
311298
}

‎jooby/src/main/java/io/jooby/buffer/Assert.java‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎jooby/src/main/java/io/jooby/buffer/CloseableDataBuffer.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)