升级Vaadin到13的最终版本

pom.xml

@@ -15,8 +15,8 @@
     <description>Graduation Project Dormitory Management</description>
 
     <properties>
-        <java.version>1.12</java.version>
-        <vaadin.version>13.0.5</vaadin.version>
+        <java.version>1.8</java.version>
+        <vaadin.version>13.0.13</vaadin.version>
         <card.version>0.9.4</card.version>
     </properties>
 
@@ -70,6 +70,8 @@
             <groupId>com.github.appreciated</groupId>
             <artifactId>card</artifactId>
             <version>${card.version}</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/card-0.9.4.jar</systemPath>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->

src/main/java/zzk/project/dms/DmsApplication.java

@@ -4,11 +4,15 @@
 import com.google.common.eventbus.EventBus;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.client.RestTemplate;
 import zzk.project.dms.domain.entities.Account;
 import zzk.project.dms.domain.entities.DormitorySpace;
 import zzk.project.dms.domain.entities.DormitorySpaceType;
@@ -27,6 +31,13 @@ public class DmsApplication {
 
     public static void main(String[] args) {
         applicationContext = SpringApplication.run(DmsApplication.class, args);
+
+//        SpringApplicationBuilder springApplicationBuilder = new SpringApplicationBuilder();
+//        springApplicationBuilder.sources(DmsApplication.class)
+//                .parent()
+//                .child()
+//                .bannerMode(Banner.Mode.OFF)
+//                .run(args)
     }
 
     public static <T> T getBean(Class<T> type) {
@@ -66,11 +77,4 @@ public InitializingBean initializingBean(
 
         };
     }
-
-    @Bean
-    @Scope("prototype")
-    public EventBus eventBus() {
-        return new AsyncEventBus(Executors.newCachedThreadPool());
-    }
-
 }

src/main/java/zzk/project/dms/domain/dao/DormitorySpaceRepository.java

@@ -9,6 +9,7 @@
 import java.util.List;
 
 public interface DormitorySpaceRepository extends JpaRepository<DormitorySpace, Long> {
+
     List<DormitorySpace> findDormitorySpacesByParent(DormitorySpace parent);
 
     Page<DormitorySpace> findDormitorySpacesByParent(DormitorySpace parent, Pageable pageable);
@@ -26,4 +27,5 @@ public interface DormitorySpaceRepository extends JpaRepository<DormitorySpace,
     Page<DormitorySpace> findByNameContaining(String name, Pageable pageable);
 
     int countByNameContains(String name);
+
 }

src/main/java/zzk/project/dms/domain/services/impl/DormitorySpaceServiceImpl.java

@@ -22,6 +22,7 @@ public class DormitorySpaceServiceImpl implements DormitorySpaceService {
 
     @Autowired
     private DormitorySpaceRepository dormitorySpaceRepository;
+
     @Autowired
     private TenementService tenementService;
 
@@ -258,7 +259,7 @@ public boolean isFormerChildOfLatter(DormitorySpace former, DormitorySpace latte
         return false;
     }
 
-    private class SpaceTreeRepositoryIterator {
+    private static class SpaceTreeRepositoryIterator {
         private DormitorySpaceRepository dormitorySpaceRepository;
         private DormitorySpace parent;
         private DormitorySpace current;

src/main/java/zzk/project/dms/ui/dormitory/BeanConfigurationForDormitoryView.java

@@ -194,7 +194,7 @@ private void configDivideDialog(DormitorySpace dormitorySpace,
         RadioButtonGroup<DormitoryDivideApproach> approachRadioButtonGroup = new RadioButtonGroup<>();
         approachRadioButtonGroup.setLabel("分割方法");
         approachRadioButtonGroup.setItems(DormitoryDivideApproach.values());
-        approachRadioButtonGroup.setRenderer(new TextRenderer<>() {
+        approachRadioButtonGroup.setRenderer(new TextRenderer<DormitoryDivideApproach>() {
             @Override
             public Component createComponent(DormitoryDivideApproach dormitoryDivideApproach) {
                 return new Text(dormitoryDivideApproach.getCn());