Skip to content

Commit

Permalink
Merge branch 'main' into vaadinFilter
Browse files Browse the repository at this point in the history
  • Loading branch information
mshabarov authored Aug 30, 2023
2 parents a327e3b + 423bbb7 commit e922f3e
Show file tree
Hide file tree
Showing 50 changed files with 2,325 additions and 17 deletions.
2 changes: 1 addition & 1 deletion flow-jandex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>3.1.2</version>
<version>3.1.3</version>
<executions>
<execution>
<id>make-index</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ public class FeatureFlags implements Serializable {
"Collaboration Kit backend for clustering support",
"collaborationEngineBackend",
"https://github.com/vaadin/platform/issues/1988", true, null);
public static final Feature SIDE_NAV_COMPONENT = new Feature(
"SideNav component (Production ready but tweaks to at least the internal DOM will still take place)",
"sideNavComponent",
"https://vaadin.com/docs/latest/components/side-nav", true,
"com.vaadin.flow.component.sidenav.SideNav");

public static final Feature WEB_PUSH = new Feature(
"Server side WebPush API", "webPush",
Expand All @@ -87,7 +82,6 @@ public FeatureFlags(Lookup lookup) {
this.lookup = lookup;
features.add(new Feature(EXAMPLE));
features.add(new Feature(COLLABORATION_ENGINE_BACKEND));
features.add(new Feature(SIDE_NAV_COMPONENT));
features.add(new Feature(WEB_PUSH));
loadProperties();
}
Expand Down
6 changes: 6 additions & 0 deletions flow-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,12 @@
<module>test-webpush</module>
</modules>
</profile>
<profile>
<id>benchmark</id>
<modules>
<module>vaadin-spring-tests</module>
</modules>
</profile>
<profile>
<id>eclipse</id>
<build>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-theme-editor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-flow</artifactId>
<version>24.1.6</version>
<version>24.1.7</version>
</dependency>
</dependencies>

Expand Down
14 changes: 13 additions & 1 deletion flow-tests/vaadin-spring-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<component.version>24.1.5</component.version>
<component.version>24.1.7</component.version>
<nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version>
</properties>

Expand Down Expand Up @@ -329,8 +329,20 @@

<module>test-spring-boot-only-prepare</module>
<module>test-spring-white-list</module>

</modules>
</profile>

<profile>
<!-- Modules for performance benchmark -->
<id>benchmark</id>

<modules>
<module>test-spring-boot-reload-time</module>
<module>test-spring-boot-multimodule-reload-time</module>
</modules>
</profile>

</profiles>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
## Spring boot multimodule reload time project

Project to measure reload time of large Spring boot application.
Application is partly generated by Maven plugin under `/generator` submodule (`test-spring-boot-multimodule-reload-time-generator`).
See list of properties ahead to configure generator.

How to build Flow for `test-spring-boot-multimodule-reload-time` locally:
```
/flow
$ mvn clean install -DskipTests -Pvalidation,benchmark
```

How to run tests locally:

```
mvn verify -pl :test-spring-boot-multimodule-reload-time-ui -Pbenchmark -Dvaadin.test.codegen.maven.plugin.routes=1000
```

### Properties for code generator

`vaadin.test.codegen.maven.plugin.routes`: number of generated routes. Default is 500.

`vaadin.test.codegen.maven.plugin.services.per.route`: number of generated Spring components per route. Default is 1.

`vaadin.test.codegen.maven.plugin.cssimports.per.route`: number of generated
@CssImport + .css combos per route. CSS files are generated
in `frontend/generated-css` folder. CSS file has a rule that is used by the
route.
Default is 0.

`vaadin.test.codegen.maven.plugin.jsmodules.per.route`: number of generated
@JsModule + .js combos per route. JS files are generated
in `frontend/generated-js` folder. Javascript in the file defines a simple
web-component with
Lit. Web component is added to the DOM of the route. Default is 0.

### Other properties for the integration test

`route.hierarchy.enabled`: When 'true', adds a route with hierarchical
structure.
Route is mapped like '
catalog/product/0' (or with alias 'catalog/prod/0'). 'false' by default.
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>test-spring-boot-multimodule-reload-time</artifactId>
<groupId>com.vaadin</groupId>
<version>24.2-SNAPSHOT</version>
</parent>
<artifactId>test-spring-boot-multimodule-reload-time-generator</artifactId>
<name>The code generator Maven plugin for a Spring boot multimodule reload
time project
</name>

<packaging>maven-plugin</packaging>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mustache</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.9.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true
</skipErrorNoDescriptorsFound>
</configuration>
<executions>
<execution>
<id>mojo-descriptor</id>
<phase>process-classes</phase>
<goals>
<goal>descriptor</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>
${project.build.outputDirectory}/META-INF/MANIFEST.MF
</manifestFile>
<index>false</index>
<manifest>
<addDefaultImplementationEntries>true
</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
Loading

0 comments on commit e922f3e

Please sign in to comment.