BAEL-8841 Merge vaadin and vaadin-spring
- Moved vaadin-spring code to vaadin module
This commit is contained in:
parent
2449866727
commit
381908a3a0
2
pom.xml
2
pom.xml
|
@ -579,6 +579,7 @@
|
|||
<module>testing-modules/mockserver</module>
|
||||
<module>testing-modules/test-containers</module>
|
||||
<module>undertow</module>
|
||||
<module>vaadin</module>
|
||||
<module>vertx-and-rxjava</module>
|
||||
<module>saas</module>
|
||||
<module>deeplearning4j</module>
|
||||
|
@ -1126,6 +1127,7 @@
|
|||
<module>testing-modules/mockserver</module>
|
||||
<module>testing-modules/test-containers</module>
|
||||
<module>undertow</module>
|
||||
<module>vaadin</module>
|
||||
<module>vertx-and-rxjava</module>
|
||||
<module>saas</module>
|
||||
<module>deeplearning4j</module>
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
## Relevant articles:
|
||||
|
||||
- [Introduction to Vaadin](http://www.baeldung.com/vaadin)
|
||||
- [Sample Application with Spring Boot and Vaadin](https://www.baeldung.com/spring-boot-vaadin)
|
||||
|
|
|
@ -8,21 +8,30 @@
|
|||
<packaging>war</packaging>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<name>Vaadin</name>
|
||||
<prerequisites>
|
||||
<maven>3</maven>
|
||||
</prerequisites>
|
||||
|
||||
<parent>
|
||||
<artifactId>parent-boot-2</artifactId>
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>parent-modules</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<relativePath>../parent-boot-2</relativePath>
|
||||
</parent>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.vaadin</groupId>
|
||||
<artifactId>vaadin-bom</artifactId>
|
||||
<version>${vaadin.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>${servlet.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -41,6 +50,25 @@
|
|||
<groupId>com.vaadin</groupId>
|
||||
<artifactId>vaadin-themes</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.vaadin</groupId>
|
||||
<artifactId>vaadin-spring-boot-starter</artifactId>
|
||||
<version>${vaadin-spring-boot-starter.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -97,21 +125,13 @@
|
|||
<scanIntervalSeconds>2</scanIntervalSeconds>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.vaadin</groupId>
|
||||
<artifactId>vaadin-bom</artifactId>
|
||||
<version>${vaadin.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>vaadin-addons</id>
|
||||
|
@ -166,6 +186,7 @@
|
|||
<servlet.version>3.0.1</servlet.version>
|
||||
<vaadin.version>7.7.10</vaadin.version>
|
||||
<vaadin.plugin.version>8.0.6</vaadin.plugin.version>
|
||||
<vaadin-spring-boot-starter.version>10.0.1</vaadin-spring-boot-starter.version>
|
||||
<jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
package com.baeldung;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
||||
@SpringBootApplication
|
||||
public class Application {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(Application.class);
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(Application.class);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public CommandLineRunner loadData(EmployeeRepository repository) {
|
||||
return (args) -> {
|
||||
repository.save(new Employee("Bill", "Gates"));
|
||||
repository.save(new Employee("Mark", "Zuckerberg"));
|
||||
repository.save(new Employee("Sundar", "Pichai"));
|
||||
repository.save(new Employee("Jeff", "Bezos"));
|
||||
};
|
||||
}
|
||||
}
|
|
@ -0,0 +1,51 @@
|
|||
package com.baeldung;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.Id;
|
||||
|
||||
@Entity
|
||||
public class Employee {
|
||||
|
||||
@Id
|
||||
@GeneratedValue
|
||||
private Long id;
|
||||
|
||||
private String firstName;
|
||||
|
||||
private String lastName;
|
||||
|
||||
protected Employee() {
|
||||
}
|
||||
|
||||
public Employee(String firstName, String lastName) {
|
||||
this.firstName = firstName;
|
||||
this.lastName = lastName;
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public String getFirstName() {
|
||||
return firstName;
|
||||
}
|
||||
|
||||
public void setFirstName(String firstName) {
|
||||
this.firstName = firstName;
|
||||
}
|
||||
|
||||
public String getLastName() {
|
||||
return lastName;
|
||||
}
|
||||
|
||||
public void setLastName(String lastName) {
|
||||
this.lastName = lastName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("Employee[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,90 @@
|
|||
package com.baeldung;
|
||||
|
||||
import com.vaadin.flow.component.Key;
|
||||
import com.vaadin.flow.component.KeyNotifier;
|
||||
import com.vaadin.flow.component.button.Button;
|
||||
import com.vaadin.flow.component.icon.VaadinIcon;
|
||||
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
|
||||
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
|
||||
import com.vaadin.flow.component.textfield.TextField;
|
||||
import com.vaadin.flow.data.binder.Binder;
|
||||
import com.vaadin.flow.spring.annotation.SpringComponent;
|
||||
import com.vaadin.flow.spring.annotation.UIScope;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@SpringComponent
|
||||
@UIScope
|
||||
public class EmployeeEditor extends VerticalLayout implements KeyNotifier {
|
||||
|
||||
private final EmployeeRepository repository;
|
||||
|
||||
private Employee employee;
|
||||
|
||||
TextField firstName = new TextField("First name");
|
||||
TextField lastName = new TextField("Last name");
|
||||
|
||||
Button save = new Button("Save", VaadinIcon.CHECK.create());
|
||||
Button cancel = new Button("Cancel");
|
||||
Button delete = new Button("Delete", VaadinIcon.TRASH.create());
|
||||
HorizontalLayout actions = new HorizontalLayout(save, cancel, delete);
|
||||
|
||||
Binder<Employee> binder = new Binder<>(Employee.class);
|
||||
private ChangeHandler changeHandler;
|
||||
|
||||
@Autowired
|
||||
public EmployeeEditor(EmployeeRepository repository) {
|
||||
this.repository = repository;
|
||||
|
||||
add(firstName, lastName, actions);
|
||||
|
||||
binder.bindInstanceFields(this);
|
||||
|
||||
setSpacing(true);
|
||||
|
||||
save.getElement().getThemeList().add("primary");
|
||||
delete.getElement().getThemeList().add("error");
|
||||
|
||||
addKeyPressListener(Key.ENTER, e -> save());
|
||||
|
||||
save.addClickListener(e -> save());
|
||||
delete.addClickListener(e -> delete());
|
||||
cancel.addClickListener(e -> editEmployee(employee));
|
||||
setVisible(false);
|
||||
}
|
||||
|
||||
void delete() {
|
||||
repository.delete(employee);
|
||||
changeHandler.onChange();
|
||||
}
|
||||
|
||||
void save() {
|
||||
repository.save(employee);
|
||||
changeHandler.onChange();
|
||||
}
|
||||
|
||||
public interface ChangeHandler {
|
||||
void onChange();
|
||||
}
|
||||
|
||||
public final void editEmployee(Employee c) {
|
||||
if (c == null) {
|
||||
setVisible(false);
|
||||
return;
|
||||
}
|
||||
final boolean persisted = c.getId() != null;
|
||||
if (persisted) {
|
||||
employee = repository.findById(c.getId()).get();
|
||||
} else {
|
||||
employee = c;
|
||||
}
|
||||
|
||||
cancel.setVisible(persisted);
|
||||
binder.setBean(employee);
|
||||
setVisible(true);
|
||||
firstName.focus();
|
||||
}
|
||||
|
||||
public void setChangeHandler(ChangeHandler h) {
|
||||
changeHandler = h;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,10 @@
|
|||
package com.baeldung;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
public interface EmployeeRepository extends JpaRepository<Employee, Long> {
|
||||
|
||||
List<Employee> findByLastNameStartsWithIgnoreCase(String lastName);
|
||||
}
|
|
@ -0,0 +1,67 @@
|
|||
package com.baeldung;
|
||||
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import com.vaadin.flow.component.button.Button;
|
||||
import com.vaadin.flow.component.grid.Grid;
|
||||
import com.vaadin.flow.component.icon.VaadinIcon;
|
||||
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
|
||||
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
|
||||
import com.vaadin.flow.component.textfield.TextField;
|
||||
import com.vaadin.flow.data.value.ValueChangeMode;
|
||||
import com.vaadin.flow.router.Route;
|
||||
|
||||
@Route
|
||||
public class MainView extends VerticalLayout {
|
||||
|
||||
private final EmployeeRepository employeeRepository;
|
||||
|
||||
private final EmployeeEditor editor;
|
||||
|
||||
final Grid<Employee> grid;
|
||||
|
||||
final TextField filter;
|
||||
|
||||
private final Button addNewBtn;
|
||||
|
||||
public MainView(EmployeeRepository repo, EmployeeEditor editor) {
|
||||
this.employeeRepository = repo;
|
||||
this.editor = editor;
|
||||
this.grid = new Grid<>(Employee.class);
|
||||
this.filter = new TextField();
|
||||
this.addNewBtn = new Button("New employee", VaadinIcon.PLUS.create());
|
||||
|
||||
HorizontalLayout actions = new HorizontalLayout(filter, addNewBtn);
|
||||
add(actions, grid, editor);
|
||||
|
||||
grid.setHeight("200px");
|
||||
grid.setColumns("id", "firstName", "lastName");
|
||||
grid.getColumnByKey("id").setWidth("50px").setFlexGrow(0);
|
||||
|
||||
filter.setPlaceholder("Filter by last name");
|
||||
|
||||
filter.setValueChangeMode(ValueChangeMode.EAGER);
|
||||
filter.addValueChangeListener(e -> listEmployees(e.getValue()));
|
||||
|
||||
grid.asSingleSelect().addValueChangeListener(e -> {
|
||||
editor.editEmployee(e.getValue());
|
||||
});
|
||||
|
||||
addNewBtn.addClickListener(e -> editor.editEmployee(new Employee("", "")));
|
||||
|
||||
editor.setChangeHandler(() -> {
|
||||
editor.setVisible(false);
|
||||
listEmployees(filter.getValue());
|
||||
});
|
||||
|
||||
listEmployees(null);
|
||||
}
|
||||
|
||||
void listEmployees(String filterText) {
|
||||
if (StringUtils.isEmpty(filterText)) {
|
||||
grid.setItems(employeeRepository.findAll());
|
||||
} else {
|
||||
grid.setItems(employeeRepository.findByLastNameStartsWithIgnoreCase(filterText));
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue