From 37882b0c69f98e14b3a91744b2dd3f5271a4f069 Mon Sep 17 00:00:00 2001 From: GAM Date: Sun, 7 Mar 2021 12:37:05 +0100 Subject: [PATCH] optimize all imports --- frontend/components/leafletmap/leaflet-map.js | 4 ++-- .../data/bean/MatchForMatchdayView.java | 4 ---- .../data/entity/SampleAddress.java | 4 ++-- .../application/data/entity/SamplePerson.java | 4 ++-- .../data/generator/DataGenerator.java | 11 +---------- .../data/service/GameInfoRepository.java | 1 - .../data/service/MatchRepository.java | 1 - .../data/service/MatchdayRepository.java | 1 - .../data/service/PlayerInfoRepository.java | 1 - .../data/service/PlayerRepository.java | 1 - .../data/service/SampleAddressRepository.java | 1 - .../data/service/SampleAddressService.java | 1 - .../data/service/SamplePersonRepository.java | 2 -- .../data/service/SamplePersonService.java | 2 -- .../data/service/SeasonRepository.java | 1 - .../data/service/SeasonService.java | 1 - .../application/views/about/AboutView.java | 5 ++--- .../views/addressform/AddressFormView.java | 4 ++-- .../views/cardlist/CardListView.java | 13 ++++++------- .../creditcardform/CreditCardFormView.java | 12 ++++-------- .../views/helloworld/HelloWorldView.java | 6 ++---- .../application/views/main/MainView.java | 16 ++++------------ .../application/views/map/MapView.java | 7 +++---- .../views/masterdetail/MasterDetailView.java | 19 +++++++++---------- .../views/personform/PersonFormView.java | 11 ++++------- 25 files changed, 43 insertions(+), 90 deletions(-) diff --git a/frontend/components/leafletmap/leaflet-map.js b/frontend/components/leafletmap/leaflet-map.js index 92d50fc..c038c00 100644 --- a/frontend/components/leafletmap/leaflet-map.js +++ b/frontend/components/leafletmap/leaflet-map.js @@ -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'; diff --git a/src/main/java/com/example/application/data/bean/MatchForMatchdayView.java b/src/main/java/com/example/application/data/bean/MatchForMatchdayView.java index 145f451..cbf8824 100644 --- a/src/main/java/com/example/application/data/bean/MatchForMatchdayView.java +++ b/src/main/java/com/example/application/data/bean/MatchForMatchdayView.java @@ -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; diff --git a/src/main/java/com/example/application/data/entity/SampleAddress.java b/src/main/java/com/example/application/data/entity/SampleAddress.java index 6105f26..9dcea51 100644 --- a/src/main/java/com/example/application/data/entity/SampleAddress.java +++ b/src/main/java/com/example/application/data/entity/SampleAddress.java @@ -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 { diff --git a/src/main/java/com/example/application/data/entity/SamplePerson.java b/src/main/java/com/example/application/data/entity/SamplePerson.java index d5c6ede..0dce05b 100644 --- a/src/main/java/com/example/application/data/entity/SamplePerson.java +++ b/src/main/java/com/example/application/data/entity/SamplePerson.java @@ -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 diff --git a/src/main/java/com/example/application/data/generator/DataGenerator.java b/src/main/java/com/example/application/data/generator/DataGenerator.java index 2b15935..9aab05f 100644 --- a/src/main/java/com/example/application/data/generator/DataGenerator.java +++ b/src/main/java/com/example/application/data/generator/DataGenerator.java @@ -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 { diff --git a/src/main/java/com/example/application/data/service/GameInfoRepository.java b/src/main/java/com/example/application/data/service/GameInfoRepository.java index e07997e..562fbf8 100644 --- a/src/main/java/com/example/application/data/service/GameInfoRepository.java +++ b/src/main/java/com/example/application/data/service/GameInfoRepository.java @@ -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; diff --git a/src/main/java/com/example/application/data/service/MatchRepository.java b/src/main/java/com/example/application/data/service/MatchRepository.java index b6dbd30..da42e7f 100644 --- a/src/main/java/com/example/application/data/service/MatchRepository.java +++ b/src/main/java/com/example/application/data/service/MatchRepository.java @@ -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; diff --git a/src/main/java/com/example/application/data/service/MatchdayRepository.java b/src/main/java/com/example/application/data/service/MatchdayRepository.java index a0f5db2..5f69e62 100644 --- a/src/main/java/com/example/application/data/service/MatchdayRepository.java +++ b/src/main/java/com/example/application/data/service/MatchdayRepository.java @@ -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; diff --git a/src/main/java/com/example/application/data/service/PlayerInfoRepository.java b/src/main/java/com/example/application/data/service/PlayerInfoRepository.java index e112046..69881e0 100644 --- a/src/main/java/com/example/application/data/service/PlayerInfoRepository.java +++ b/src/main/java/com/example/application/data/service/PlayerInfoRepository.java @@ -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; diff --git a/src/main/java/com/example/application/data/service/PlayerRepository.java b/src/main/java/com/example/application/data/service/PlayerRepository.java index 9a0df4d..a6e7bc5 100644 --- a/src/main/java/com/example/application/data/service/PlayerRepository.java +++ b/src/main/java/com/example/application/data/service/PlayerRepository.java @@ -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; diff --git a/src/main/java/com/example/application/data/service/SampleAddressRepository.java b/src/main/java/com/example/application/data/service/SampleAddressRepository.java index 19fe9ff..f33b1c4 100644 --- a/src/main/java/com/example/application/data/service/SampleAddressRepository.java +++ b/src/main/java/com/example/application/data/service/SampleAddressRepository.java @@ -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 { diff --git a/src/main/java/com/example/application/data/service/SampleAddressService.java b/src/main/java/com/example/application/data/service/SampleAddressService.java index b7f54da..fb183b8 100644 --- a/src/main/java/com/example/application/data/service/SampleAddressService.java +++ b/src/main/java/com/example/application/data/service/SampleAddressService.java @@ -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; diff --git a/src/main/java/com/example/application/data/service/SamplePersonRepository.java b/src/main/java/com/example/application/data/service/SamplePersonRepository.java index dfaa490..59dbfb1 100644 --- a/src/main/java/com/example/application/data/service/SamplePersonRepository.java +++ b/src/main/java/com/example/application/data/service/SamplePersonRepository.java @@ -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 { diff --git a/src/main/java/com/example/application/data/service/SamplePersonService.java b/src/main/java/com/example/application/data/service/SamplePersonService.java index e50f299..34eccee 100644 --- a/src/main/java/com/example/application/data/service/SamplePersonService.java +++ b/src/main/java/com/example/application/data/service/SamplePersonService.java @@ -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 { diff --git a/src/main/java/com/example/application/data/service/SeasonRepository.java b/src/main/java/com/example/application/data/service/SeasonRepository.java index 2e08350..f667a39 100644 --- a/src/main/java/com/example/application/data/service/SeasonRepository.java +++ b/src/main/java/com/example/application/data/service/SeasonRepository.java @@ -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; diff --git a/src/main/java/com/example/application/data/service/SeasonService.java b/src/main/java/com/example/application/data/service/SeasonService.java index 4682ae7..9365512 100644 --- a/src/main/java/com/example/application/data/service/SeasonService.java +++ b/src/main/java/com/example/application/data/service/SeasonService.java @@ -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; diff --git a/src/main/java/com/example/application/views/about/AboutView.java b/src/main/java/com/example/application/views/about/AboutView.java index 34f7f93..bcdcc7e 100644 --- a/src/main/java/com/example/application/views/about/AboutView.java +++ b/src/main/java/com/example/application/views/about/AboutView.java @@ -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) diff --git a/src/main/java/com/example/application/views/addressform/AddressFormView.java b/src/main/java/com/example/application/views/addressform/AddressFormView.java index 0818556..81c889f 100644 --- a/src/main/java/com/example/application/views/addressform/AddressFormView.java +++ b/src/main/java/com/example/application/views/addressform/AddressFormView.java @@ -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) diff --git a/src/main/java/com/example/application/views/cardlist/CardListView.java b/src/main/java/com/example/application/views/cardlist/CardListView.java index f55de84..ef6ebf9 100644 --- a/src/main/java/com/example/application/views/cardlist/CardListView.java +++ b/src/main/java/com/example/application/views/cardlist/CardListView.java @@ -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); } diff --git a/src/main/java/com/example/application/views/creditcardform/CreditCardFormView.java b/src/main/java/com/example/application/views/creditcardform/CreditCardFormView.java index a5888a0..e1d4f6e 100644 --- a/src/main/java/com/example/application/views/creditcardform/CreditCardFormView.java +++ b/src/main/java/com/example/application/views/creditcardform/CreditCardFormView.java @@ -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() { diff --git a/src/main/java/com/example/application/views/helloworld/HelloWorldView.java b/src/main/java/com/example/application/views/helloworld/HelloWorldView.java index 08113e9..fbdde75 100644 --- a/src/main/java/com/example/application/views/helloworld/HelloWorldView.java +++ b/src/main/java/com/example/application/views/helloworld/HelloWorldView.java @@ -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) diff --git a/src/main/java/com/example/application/views/main/MainView.java b/src/main/java/com/example/application/views/main/MainView.java index 9607485..69b9626 100644 --- a/src/main/java/com/example/application/views/main/MainView.java +++ b/src/main/java/com/example/application/views/main/MainView.java @@ -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. */ diff --git a/src/main/java/com/example/application/views/map/MapView.java b/src/main/java/com/example/application/views/map/MapView.java index e4d5cc5..c77587a 100644 --- a/src/main/java/com/example/application/views/map/MapView.java +++ b/src/main/java/com/example/application/views/map/MapView.java @@ -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") diff --git a/src/main/java/com/example/application/views/masterdetail/MasterDetailView.java b/src/main/java/com/example/application/views/masterdetail/MasterDetailView.java index 3470807..eae2506 100644 --- a/src/main/java/com/example/application/views/masterdetail/MasterDetailView.java +++ b/src/main/java/com/example/application/views/masterdetail/MasterDetailView.java @@ -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) diff --git a/src/main/java/com/example/application/views/personform/PersonFormView.java b/src/main/java/com/example/application/views/personform/PersonFormView.java index 0336986..22e16f8 100644 --- a/src/main/java/com/example/application/views/personform/PersonFormView.java +++ b/src/main/java/com/example/application/views/personform/PersonFormView.java @@ -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 binder = new Binder(SamplePerson.class); + private Binder 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 ""; }