File tree Expand file tree Collapse file tree 5 files changed +30
-10
lines changed
src/main/java/com/flowingcode/addons/applayout Expand file tree Collapse file tree 5 files changed +30
-10
lines changed Original file line number Diff line number Diff line change 1717/.vscode
1818.npmrc
1919/frontend /generated
20+ frontend /index.html
Original file line number Diff line number Diff line change 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
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
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 >
Original file line number Diff line number Diff line change 44import java .util .stream .Collectors ;
55import com .flowingcode .addons .applayout .MenuItem ;
66import 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
Original file line number Diff line number Diff line change 33import java .util .ArrayList ;
44import java .util .List ;
55import javax .annotation .Nullable ;
6- import com . vaadin . fusion .Nonnull ;
6+ import dev . hilla .Nonnull ;
77
88public class MenuItemDto {
99
Original file line number Diff line number Diff line change 55import com .flowingcode .addons .applayout .endpoint .MenuEndpoint ;
66import com .vaadin .flow .server .ServiceInitEvent ;
77import com .vaadin .flow .server .VaadinServiceInitListener ;
8- import com .vaadin .fusion .Endpoint ;
9- import com .vaadin .fusion .EndpointRegistry ;
108import org .springframework .beans .BeansException ;
119import org .springframework .context .ApplicationContext ;
1210import org .springframework .context .ApplicationContextAware ;
1311import org .springframework .stereotype .Component ;
12+ import dev .hilla .Endpoint ;
13+ import dev .hilla .EndpointRegistry ;
1414
1515@ Component
1616public 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
You can’t perform that action at this time.
0 commit comments