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.

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

fix: fix compilation issues with Vert.x 4.3.1+ #93

Merged
merged 1 commit into from
Jan 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ Snapshots and `vaadin-flow-sockjs` classifiers are currently published on [Repsy
## Compatibility matrix

| Vaadin version | Vert.x version | vertx-vaadin version | Status |
|----------------|--------------|--------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 23.3 | 4.3 | vertx-vaadin-flow:23.4.x | ![Development](https://github.com/mcollovati/vertx-vaadin/actions/workflows/validation.yml/badge.svg?event=push&branch=development) |
|----------------|----------------|--------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 23.3 | 4.3.1+ | vertx-vaadin-flow:23.4.x | ![Development](https://github.com/mcollovati/vertx-vaadin/actions/workflows/validation.yml/badge.svg?event=push&branch=development) |

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<jreleaser-maven-plugin.version>1.9.0</jreleaser-maven-plugin.version>

<vertx.version>4.3.0</vertx.version>
<vertx.version>4.3.8</vertx.version>
<vaadin.platform.version>23.3.30</vaadin.platform.version>
<vaadin.flow.version>23.3.24</vaadin.flow.version>
<hilla.version>1.3.30</hilla.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -955,4 +955,19 @@ public Vertx vertx() {
return decoratedContext.vertx();
}

@Override
public int restIndex() {
if (decoratedContext instanceof RoutingContextInternal) {
return ((RoutingContextInternal) decoratedContext).restIndex();
}
return 0;
}

@Override
public boolean normalizedMatch() {
if (decoratedContext instanceof RoutingContextInternal) {
return ((RoutingContextInternal) decoratedContext).normalizedMatch();
}
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import io.vertx.core.eventbus.EventBus;
import io.vertx.core.file.FileSystem;
import io.vertx.core.impl.ContextInternal;
import io.vertx.core.impl.VertxInternal;
import io.vertx.core.json.JsonObject;
import io.vertx.core.shareddata.LocalMap;
import io.vertx.core.shareddata.SharedData;
Expand Down Expand Up @@ -71,7 +72,6 @@ public class MockServiceSessionSetup {

@Mock
private FileSystem fileSystem;
@Mock
private Vertx vertx;
@Mock
private VaadinRequest request;
Expand Down Expand Up @@ -99,6 +99,7 @@ public MockServiceSessionSetup() throws Exception {

public MockServiceSessionSetup(boolean sessionAvailable)
throws Exception {
vertx = Mockito.mock(VertxInternal.class);
MockitoAnnotations.initMocks(this);
SharedData sharedData = Mockito.mock(SharedData.class);
Mockito.when(vertx.sharedData()).thenReturn(sharedData);
Expand Down
Loading