Skip to content

Commit a4608ab

Browse files
authored
downgrade javaparser version and add unit test for this regression (#63)
Signed-off-by: Olivier Lamy <[email protected]>
1 parent a3c35dc commit a4608ab

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<maven.compiler.source>11</maven.compiler.source>
5050
<maven.compiler.target>11</maven.compiler.target>
5151
<maven.version>3.8.7</maven.version>
52+
<javaparser.version>3.25.2</javaparser.version>
5253
</properties>
5354

5455
<developers>
@@ -79,7 +80,7 @@
7980
<dependency>
8081
<groupId>com.github.javaparser</groupId>
8182
<artifactId>javaparser-core</artifactId>
82-
<version>3.25.3</version>
83+
<version>${javaparser.version}</version>
8384
</dependency>
8485
<dependency>
8586
<groupId>org.apache.maven</groupId>

src/test/java/org/eclipse/jetty/toolchain/modifysources/ModifyEE9ToEE8Test.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ public void testChangeToEE8()
124124
assertThat(sourceModified, containsString("private JavaxWebSocketMessageMetadata textMetadata;"));
125125
assertThat(sourceModified, containsString("private JavaxWebSocketMessageMetadata textMetadata;"));
126126

127+
assertThat(sourceModified, containsString("int permits = _passes == null ? 0 : _passes.availablePermits();"));
128+
assertThat(sourceModified, containsString("_passes = new Semaphore((value - _throttledRequests + permits), true);"));
129+
127130
assertThat(sourceModified,
128131
containsString("JavaxWebSocketMessageMetadata actualTextMetadata = JavaxWebSocketMessageMetadata.copyOf(textMetadata);"));
129132
assertThat(sourceModified,

src/test/resources/project-modify/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/common/JakartaWebSocketFrameHandler.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.Map;
2323
import java.util.Optional;
2424
import java.util.Set;
25+
import java.util.concurrent.Semaphore;
2526
import java.util.concurrent.atomic.AtomicBoolean;
2627
import java.util.stream.Collectors;
2728

@@ -118,6 +119,13 @@ public JakartaWebSocketFrameHandler(JakartaWebSocketContainer container,
118119
this.endpointConfig = endpointConfig;
119120
}
120121

122+
public void setThrottledRequests(int value)
123+
{
124+
int permits = _passes == null ? 0 : _passes.availablePermits();
125+
_passes = new Semaphore((value - _throttledRequests + permits), true);
126+
_throttledRequests = value;
127+
}
128+
121129
public Object getEndpoint()
122130
{
123131
return endpointInstance;

0 commit comments

Comments
 (0)