Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete TODO to fix WebSocket RemoteEndpoint API in Jetty 12 #8598

Merged
merged 3 commits into from
Sep 21, 2022
Merged

Complete TODO to fix WebSocket RemoteEndpoint API in Jetty 12 #8598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53c0d7b
Complete todo to fix WebSocket RemoteEndpoint API
lachlan-roberts Sep 19, 2022
88adc23
Complete todo to fix WebSocket RemoteEndpoint API
lachlan-roberts Sep 19, 2022
e43346b
fix error in AnnotatedPartialListenerTest
lachlan-roberts Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ebsocket-jetty-api/src/main/java/org/eclipse/jetty/ee10/websocket/api/RemoteEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ public interface RemoteEndpoint
* @param fragment the text being sent
* @param isLast true if this is the last piece of the partial bytes
* @param callback callback to notify of success or failure of the write operation
* @throws IOException this never throws IOException, it was a mistake to have this in the signature.
*/
void sendPartialString(String fragment, boolean isLast, WriteCallback callback) throws IOException;
void sendPartialString(String fragment, boolean isLast, WriteCallback callback);

/**
* Send a Ping message containing the given application data to the remote endpoint, blocking until all of the
Expand Down
1 change: 0 additions & 1 deletion ...n/src/main/java/org/eclipse/jetty/ee10/websocket/common/JettyWebSocketRemoteEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ public void sendPartialString(String fragment, boolean isLast) throws IOExceptio
b.block(getBlockingTimeout(), TimeUnit.MILLISECONDS);
}

// FIXME: Remove the throws IOException from API for this method in the next major release.
@Override
public void sendPartialString(String fragment, boolean isLast, WriteCallback callback)
{
Expand Down
10 changes: 1 addition & 9 deletions ...ts/src/test/java/org/eclipse/jetty/ee10/websocket/tests/AnnotatedPartialListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

package org.eclipse.jetty.ee10.websocket.tests;

import java.io.IOException;
import java.net.URI;
import java.nio.ByteBuffer;
import java.util.Objects;
Expand Down Expand Up @@ -62,14 +61,7 @@ public void onWebSocketPartialBinary(ByteBuffer payload, boolean fin)
@Override
public void onWebSocketPartialText(String payload, boolean fin)
{
try
{
session.getRemote().sendPartialString(payload, fin, WriteCallback.NOOP);
}
catch (IOException e)
{
throw new IllegalStateException(e);
}
session.getRemote().sendPartialString(payload, fin, WriteCallback.NOOP);
}
}

Expand Down
3 changes: 1 addition & 2 deletions ...websocket-jetty-api/src/main/java/org/eclipse/jetty/ee9/websocket/api/RemoteEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ public interface RemoteEndpoint
* @param fragment the text being sent
* @param isLast true if this is the last piece of the partial bytes
* @param callback callback to notify of success or failure of the write operation
* @throws IOException this never throws IOException, it was a mistake to have this in the signature.
*/
void sendPartialString(String fragment, boolean isLast, WriteCallback callback) throws IOException;
void sendPartialString(String fragment, boolean isLast, WriteCallback callback);

/**
* Send a Ping message containing the given application data to the remote endpoint, blocking until all of the
Expand Down
1 change: 0 additions & 1 deletion ...on/src/main/java/org/eclipse/jetty/ee9/websocket/common/JettyWebSocketRemoteEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ public void sendPartialString(String fragment, boolean isLast) throws IOExceptio
b.block(getBlockingTimeout(), TimeUnit.MILLISECONDS);
}

// FIXME: Remove the throws IOException from API for this method in the next major release.
@Override
public void sendPartialString(String fragment, boolean isLast, WriteCallback callback)
{
Expand Down
10 changes: 1 addition & 9 deletions ...sts/src/test/java/org/eclipse/jetty/ee9/websocket/tests/AnnotatedPartialListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

package org.eclipse.jetty.ee9.websocket.tests;

import java.io.IOException;
import java.net.URI;
import java.nio.ByteBuffer;
import java.util.Objects;
Expand Down Expand Up @@ -62,14 +61,7 @@ public void onWebSocketPartialBinary(ByteBuffer payload, boolean fin)
@Override
public void onWebSocketPartialText(String payload, boolean fin)
{
try
{
session.getRemote().sendPartialString(payload, fin, WriteCallback.NOOP);
}
catch (IOException e)
{
throw new IllegalStateException(e);
}
session.getRemote().sendPartialString(payload, fin, WriteCallback.NOOP);
}
}

Expand Down