Browse Source

optimize all imports

master
GAM 4 years ago
parent
commit
37882b0c69
25 changed files with 43 additions and 90 deletions
  1. +2
    -2
      frontend/components/leafletmap/leaflet-map.js
  2. +0
    -4
      src/main/java/com/example/application/data/bean/MatchForMatchdayView.java
  3. +2
    -2
      src/main/java/com/example/application/data/entity/SampleAddress.java
  4. +2
    -2
      src/main/java/com/example/application/data/entity/SamplePerson.java
  5. +1
    -10
      src/main/java/com/example/application/data/generator/DataGenerator.java
  6. +0
    -1
      src/main/java/com/example/application/data/service/GameInfoRepository.java
  7. +0
    -1
      src/main/java/com/example/application/data/service/MatchRepository.java
  8. +0
    -1
      src/main/java/com/example/application/data/service/MatchdayRepository.java
  9. +0
    -1
      src/main/java/com/example/application/data/service/PlayerInfoRepository.java
  10. +0
    -1
      src/main/java/com/example/application/data/service/PlayerRepository.java
  11. +0
    -1
      src/main/java/com/example/application/data/service/SampleAddressRepository.java
  12. +0
    -1
      src/main/java/com/example/application/data/service/SampleAddressService.java
  13. +0
    -2
      src/main/java/com/example/application/data/service/SamplePersonRepository.java
  14. +0
    -2
      src/main/java/com/example/application/data/service/SamplePersonService.java
  15. +0
    -1
      src/main/java/com/example/application/data/service/SeasonRepository.java
  16. +0
    -1
      src/main/java/com/example/application/data/service/SeasonService.java
  17. +2
    -3
      src/main/java/com/example/application/views/about/AboutView.java
  18. +2
    -2
      src/main/java/com/example/application/views/addressform/AddressFormView.java
  19. +6
    -7
      src/main/java/com/example/application/views/cardlist/CardListView.java
  20. +4
    -8
      src/main/java/com/example/application/views/creditcardform/CreditCardFormView.java
  21. +2
    -4
      src/main/java/com/example/application/views/helloworld/HelloWorldView.java
  22. +4
    -12
      src/main/java/com/example/application/views/main/MainView.java
  23. +3
    -4
      src/main/java/com/example/application/views/map/MapView.java
  24. +9
    -10
      src/main/java/com/example/application/views/masterdetail/MasterDetailView.java
  25. +4
    -7
      src/main/java/com/example/application/views/personform/PersonFormView.java

+ 2
- 2
frontend/components/leafletmap/leaflet-map.js View File

@ -1,5 +1,5 @@
import { PolymerElement } from '@polymer/polymer/polymer-element';
import { html } from '@polymer/polymer/lib/utils/html-tag';
import {PolymerElement} from '@polymer/polymer/polymer-element';
import {html} from '@polymer/polymer/lib/utils/html-tag';
import * as L from 'leaflet';
const openStreetMapLayer = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';


+ 0
- 4
src/main/java/com/example/application/data/bean/MatchForMatchdayView.java View File

@ -1,12 +1,8 @@
package com.example.application.data.bean;
import com.example.application.data.entity.Game;
import com.example.application.data.entity.Match;
import com.example.application.data.entity.Matchday;
import com.example.application.data.entity.Player;
import java.util.Collection;
public class MatchForMatchdayView {
private Match match;
private Player player1;


+ 2
- 2
src/main/java/com/example/application/data/entity/SampleAddress.java View File

@ -1,9 +1,9 @@
package com.example.application.data.entity;
import javax.persistence.Entity;
import com.example.application.data.AbstractEntity;
import javax.persistence.Entity;
@Entity
public class SampleAddress extends AbstractEntity {


+ 2
- 2
src/main/java/com/example/application/data/entity/SamplePerson.java View File

@ -1,8 +1,8 @@
package com.example.application.data.entity;
import javax.persistence.Entity;
import com.example.application.data.AbstractEntity;
import javax.persistence.Entity;
import java.time.LocalDate;
@Entity


+ 1
- 10
src/main/java/com/example/application/data/generator/DataGenerator.java View File

@ -1,18 +1,9 @@
package com.example.application.data.generator;
import com.vaadin.flow.spring.annotation.SpringComponent;
import com.example.application.data.service.SamplePersonRepository;
import com.example.application.data.entity.SamplePerson;
import java.time.LocalDateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.vaadin.flow.spring.annotation.SpringComponent;
import org.springframework.boot.CommandLineRunner;
import org.springframework.context.annotation.Bean;
import org.vaadin.artur.exampledata.DataType;
import org.vaadin.artur.exampledata.ExampleDataGenerator;
@SpringComponent
public class DataGenerator {


+ 0
- 1
src/main/java/com/example/application/data/service/GameInfoRepository.java View File

@ -1,6 +1,5 @@
package com.example.application.data.service;
import com.example.application.data.entity.Game;
import com.example.application.data.entity.GameInfo;
import org.springframework.data.jpa.repository.JpaRepository;


+ 0
- 1
src/main/java/com/example/application/data/service/MatchRepository.java View File

@ -1,6 +1,5 @@
package com.example.application.data.service;
import com.example.application.data.entity.Game;
import com.example.application.data.entity.Match;
import org.springframework.data.jpa.repository.JpaRepository;


+ 0
- 1
src/main/java/com/example/application/data/service/MatchdayRepository.java View File

@ -1,6 +1,5 @@
package com.example.application.data.service;
import com.example.application.data.entity.Game;
import com.example.application.data.entity.Matchday;
import org.springframework.data.jpa.repository.JpaRepository;


+ 0
- 1
src/main/java/com/example/application/data/service/PlayerInfoRepository.java View File

@ -1,6 +1,5 @@
package com.example.application.data.service;
import com.example.application.data.entity.Game;
import com.example.application.data.entity.PlayerInfo;
import org.springframework.data.jpa.repository.JpaRepository;


+ 0
- 1
src/main/java/com/example/application/data/service/PlayerRepository.java View File

@ -1,6 +1,5 @@
package com.example.application.data.service;
import com.example.application.data.entity.Game;
import com.example.application.data.entity.Player;
import org.springframework.data.jpa.repository.JpaRepository;


+ 0
- 1
src/main/java/com/example/application/data/service/SampleAddressRepository.java View File

@ -1,7 +1,6 @@
package com.example.application.data.service;
import com.example.application.data.entity.SampleAddress;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SampleAddressRepository extends JpaRepository<SampleAddress, Integer> {


+ 0
- 1
src/main/java/com/example/application/data/service/SampleAddressService.java View File

@ -1,7 +1,6 @@
package com.example.application.data.service;
import com.example.application.data.entity.SampleAddress;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.vaadin.artur.helpers.CrudService;


+ 0
- 2
src/main/java/com/example/application/data/service/SamplePersonRepository.java View File

@ -1,9 +1,7 @@
package com.example.application.data.service;
import com.example.application.data.entity.SamplePerson;
import org.springframework.data.jpa.repository.JpaRepository;
import java.time.LocalDate;
public interface SamplePersonRepository extends JpaRepository<SamplePerson, Integer> {

+ 0
- 2
src/main/java/com/example/application/data/service/SamplePersonService.java View File

@ -1,11 +1,9 @@
package com.example.application.data.service;
import com.example.application.data.entity.SamplePerson;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.vaadin.artur.helpers.CrudService;
import java.time.LocalDate;
@Service
public class SamplePersonService extends CrudService<SamplePerson, Integer> {


+ 0
- 1
src/main/java/com/example/application/data/service/SeasonRepository.java View File

@ -1,6 +1,5 @@
package com.example.application.data.service;
import com.example.application.data.entity.Game;
import com.example.application.data.entity.Season;
import org.springframework.data.jpa.repository.JpaRepository;


+ 0
- 1
src/main/java/com/example/application/data/service/SeasonService.java View File

@ -5,7 +5,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.vaadin.artur.helpers.CrudService;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;


+ 2
- 3
src/main/java/com/example/application/views/about/AboutView.java View File

@ -1,13 +1,12 @@
package com.example.application.views.about;
import com.example.application.data.entity.*;
import com.example.application.data.service.GameService;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.Text;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.router.Route;
@CssImport("./views/about/about-view.css")
@Route(value = "about", layout = MainView.class)


+ 2
- 2
src/main/java/com/example/application/views/addressform/AddressFormView.java View File

@ -2,6 +2,7 @@ package com.example.application.views.addressform;
import com.example.application.data.entity.SampleAddress;
import com.example.application.data.service.SampleAddressService;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
@ -14,9 +15,8 @@ import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.data.binder.Binder;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.router.Route;
@CssImport("./views/addressform/address-form-view.css")
@Route(value = "address-form", layout = MainView.class)


+ 6
- 7
src/main/java/com/example/application/views/cardlist/CardListView.java View File

@ -1,10 +1,7 @@
package com.example.application.views.cardlist;
import java.util.Arrays;
import java.util.List;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.dependency.JsModule;
import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.grid.GridVariant;
import com.vaadin.flow.component.html.Div;
@ -15,9 +12,11 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.router.AfterNavigationEvent;
import com.vaadin.flow.router.AfterNavigationObserver;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.router.Route;
import java.util.Arrays;
import java.util.List;
@CssImport("./views/cardlist/card-list-view.css")
@Route(value = "card-list", layout = MainView.class)
@ -31,7 +30,7 @@ public class CardListView extends Div implements AfterNavigationObserver {
setSizeFull();
grid.setHeight("100%");
grid.addThemeVariants(GridVariant.LUMO_NO_BORDER, GridVariant.LUMO_NO_ROW_BORDERS);
grid.addComponentColumn(person -> createCard(person));
grid.addComponentColumn(this::createCard);
add(grid);
}


+ 4
- 8
src/main/java/com/example/application/views/creditcardform/CreditCardFormView.java View File

@ -1,5 +1,6 @@
package com.example.application.views.creditcardform;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
@ -13,9 +14,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.select.Select;
import com.vaadin.flow.component.textfield.PasswordField;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.router.Route;
@CssImport("./views/creditcardform/credit-card-form-view.css")
@Route(value = "credit-card-form", layout = MainView.class)
@ -39,12 +39,8 @@ public class CreditCardFormView extends Div {
add(createFormLayout());
add(createButtonLayout());
cancel.addClickListener(e -> {
Notification.show("Not implemented");
});
submit.addClickListener(e -> {
Notification.show("Not implemented");
});
cancel.addClickListener(e -> Notification.show("Not implemented"));
submit.addClickListener(e -> Notification.show("Not implemented"));
}
private Component createTitle() {


+ 2
- 4
src/main/java/com/example/application/views/helloworld/HelloWorldView.java View File

@ -1,15 +1,13 @@
package com.example.application.views.helloworld;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.notification.Notification;
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.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.router.RouteAlias;
import com.vaadin.flow.router.Route;
@CssImport("./views/helloworld/hello-world-view.css")
@Route(value = "hello", layout = MainView.class)


+ 4
- 12
src/main/java/com/example/application/views/main/MainView.java View File

@ -1,7 +1,5 @@
package com.example.application.views.main;
import java.util.Optional;
import com.example.application.views.results.ResultsView;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.ComponentUtil;
@ -10,28 +8,22 @@ import com.vaadin.flow.component.applayout.DrawerToggle;
import com.vaadin.flow.component.avatar.Avatar;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.dependency.JsModule;
import com.vaadin.flow.component.html.Image;
import com.vaadin.flow.component.html.H1;
import com.vaadin.flow.component.html.Image;
import com.vaadin.flow.component.orderedlayout.FlexComponent;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.tabs.Tab;
import com.vaadin.flow.component.tabs.Tabs;
import com.vaadin.flow.component.tabs.TabsVariant;
import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.RouterLink;
import com.vaadin.flow.server.PWA;
import com.vaadin.flow.theme.Theme;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.helloworld.HelloWorldView;
import com.example.application.views.about.AboutView;
import com.example.application.views.cardlist.CardListView;
import com.example.application.views.masterdetail.MasterDetailView;
import com.example.application.views.personform.PersonFormView;
import com.example.application.views.addressform.AddressFormView;
import com.example.application.views.creditcardform.CreditCardFormView;
import com.example.application.views.map.MapView;
import com.vaadin.flow.theme.lumo.Lumo;
import java.util.Optional;
/**
* The main view is a top-level placeholder for other views.
*/


+ 3
- 4
src/main/java/com/example/application/views/map/MapView.java View File

@ -1,11 +1,10 @@
package com.example.application.views.map;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.example.application.components.leafletmap.LeafletMap;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.Route;
@Route(value = "map", layout = MainView.class)
@PageTitle("Map")


+ 9
- 10
src/main/java/com/example/application/views/masterdetail/MasterDetailView.java View File

@ -1,13 +1,14 @@
package com.example.application.views.masterdetail;
import java.util.Optional;
import com.example.application.data.entity.SamplePerson;
import com.example.application.data.service.SamplePersonService;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.HasStyle;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
import com.vaadin.flow.component.checkbox.Checkbox;
import com.vaadin.flow.component.datepicker.DatePicker;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.formlayout.FormLayout;
import com.vaadin.flow.component.grid.Grid;
@ -16,18 +17,16 @@ import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.splitlayout.SplitLayout;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.data.binder.BeanValidationBinder;
import com.vaadin.flow.data.binder.ValidationException;
import com.vaadin.flow.data.renderer.TemplateRenderer;
import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.Route;
import org.springframework.beans.factory.annotation.Autowired;
import org.vaadin.artur.helpers.CrudServiceDataProvider;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.data.renderer.TemplateRenderer;
import com.vaadin.flow.component.checkbox.Checkbox;
import com.vaadin.flow.component.datepicker.DatePicker;
import com.vaadin.flow.component.textfield.TextField;
import java.util.Optional;
@CssImport("./views/masterdetail/master-detail-view.css")
@Route(value = "master-detail", layout = MainView.class)


+ 4
- 7
src/main/java/com/example/application/views/personform/PersonFormView.java View File

@ -2,6 +2,7 @@ package com.example.application.views.personform;
import com.example.application.data.entity.SamplePerson;
import com.example.application.data.service.SamplePersonService;
import com.example.application.views.main.MainView;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
@ -17,11 +18,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.textfield.EmailField;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.data.binder.Binder;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.PageTitle;
import com.example.application.views.main.MainView;
import com.vaadin.flow.data.renderer.TemplateRenderer;
import com.vaadin.flow.component.checkbox.Checkbox;
import com.vaadin.flow.router.Route;
@CssImport("./views/personform/person-form-view.css")
@Route(value = "person-form", layout = MainView.class)
@ -38,7 +36,7 @@ public class PersonFormView extends Div {
private Button cancel = new Button("Cancel");
private Button save = new Button("Save");
private Binder<SamplePerson> binder = new Binder(SamplePerson.class);
private Binder<SamplePerson> binder = new Binder<>(SamplePerson.class);
public PersonFormView(SamplePersonService personService) {
addClassName("person-form-view");
@ -104,8 +102,7 @@ public class PersonFormView extends Div {
@Override
protected String generateModelValue() {
if (countryCode.getValue() != null && number.getValue() != null) {
String s = countryCode.getValue() + " " + number.getValue();
return s;
return countryCode.getValue() + " " + number.getValue();
}
return "";
}


Loading…
Cancel
Save