Skip to content

Commit 1d1713d

Browse files
authored
feat: update to Vaadin 23.0.9
Close #94
1 parent 7dad473 commit 1d1713d

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
/.vscode
1818
.npmrc
1919
/frontend/generated
20+
frontend/index.html

pom.xml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<description>Integration of app-layout for Vaadin Flow</description>
1010

1111
<properties>
12-
<vaadin.version>22.0.2</vaadin.version>
12+
<vaadin.version>23.0.9</vaadin.version>
13+
<hilla.version>1.0.1</hilla.version>
1314

14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
15+
<maven.compiler.source>11</maven.compiler.source>
16+
<maven.compiler.target>11</maven.compiler.target>
1617
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1718
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1819

@@ -49,6 +50,13 @@
4950
<scope>import</scope>
5051
<version>${vaadin.version}</version>
5152
</dependency>
53+
<dependency>
54+
<groupId>dev.hilla</groupId>
55+
<artifactId>hilla-bom</artifactId>
56+
<version>${hilla.version}</version>
57+
<type>pom</type>
58+
<scope>import</scope>
59+
</dependency>
5260
</dependencies>
5361
</dependencyManagement>
5462

@@ -78,6 +86,17 @@
7886
<groupId>com.vaadin</groupId>
7987
<artifactId>vaadin-core</artifactId>
8088
</dependency>
89+
<dependency>
90+
<groupId>dev.hilla</groupId>
91+
<artifactId>hilla</artifactId>
92+
<optional>true</optional>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.springframework.boot</groupId>
96+
<artifactId>spring-boot-autoconfigure</artifactId>
97+
<version>2.4.5</version>
98+
<optional>true</optional>
99+
</dependency>
81100
<dependency>
82101
<groupId>org.vaadin.artur</groupId>
83102
<artifactId>a-vaadin-helper</artifactId>

src/main/java/com/flowingcode/addons/applayout/endpoint/MenuEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.stream.Collectors;
55
import com.flowingcode.addons.applayout.MenuItem;
66
import com.vaadin.flow.server.auth.AnonymousAllowed;
7-
import com.vaadin.fusion.Endpoint;
8-
import com.vaadin.fusion.Nonnull;
7+
import dev.hilla.Endpoint;
8+
import dev.hilla.Nonnull;
99

1010
@Endpoint
1111
@AnonymousAllowed

src/main/java/com/flowingcode/addons/applayout/endpoint/MenuItemDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55
import javax.annotation.Nullable;
6-
import com.vaadin.fusion.Nonnull;
6+
import dev.hilla.Nonnull;
77

88
public class MenuItemDto {
99

src/main/java/com/flowingcode/addons/applayout/listener/RegisterEndpointServiceInitListener.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
import com.flowingcode.addons.applayout.endpoint.MenuEndpoint;
66
import com.vaadin.flow.server.ServiceInitEvent;
77
import com.vaadin.flow.server.VaadinServiceInitListener;
8-
import com.vaadin.fusion.Endpoint;
9-
import com.vaadin.fusion.EndpointRegistry;
108
import org.springframework.beans.BeansException;
119
import org.springframework.context.ApplicationContext;
1210
import org.springframework.context.ApplicationContextAware;
1311
import org.springframework.stereotype.Component;
12+
import dev.hilla.Endpoint;
13+
import dev.hilla.EndpointRegistry;
1414

1515
@Component
1616
public class RegisterEndpointServiceInitListener implements VaadinServiceInitListener, ApplicationContextAware {
1717

1818
private static ApplicationContext context;
1919

20-
private EndpointRegistry endpointRegistry;
20+
private transient EndpointRegistry endpointRegistry;
2121

2222
@Override
2323
public void serviceInit(ServiceInitEvent event) {
@@ -36,7 +36,7 @@ private void registerEndpoint(Object endpointBean) {
3636
m.setAccessible(true);
3737
m.invoke(endpointRegistry, endpointBean);
3838
} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
39-
throw new RuntimeException("Problem registering endpoint",e);
39+
throw new IllegalStateException("Problem registering endpoint",e);
4040
}
4141
}
4242

0 commit comments

Comments
 (0)