Commit 0b654e10 authored by cherrylzhao's avatar cherrylzhao
Browse files

refactor CountryServiceImpl & CountryRepositoryImpl.

parent ff46c828

example-common/repository-jdbc/src/main/java/org/apache/shardingsphere/example/common/jdbc/service/CountryServiceImpl.java

+8 −13
Original line number Diff line number Diff line
@@ -80,22 +80,17 @@ public class CountryServiceImpl implements CommonService { 
    private List<String> insertData() {

        System.out.println("---------------------------- Insert Data ----------------------------");

        List<String> result = new ArrayList<>();

        Locale[] locales = Locale.getAvailableLocales();

        int i = 0;

        for (Locale l:locales) {

            final String country = l.getCountry();

        for (Locale each : Locale.getAvailableLocales()) {

            final String country = each.getCountry();

            if (country == null || "".equals(country)) {

                continue;

            }

            Country currCountry = new Country();

            currCountry.setName(l.getDisplayCountry(l));

            currCountry.setLanguage(l.getLanguage());

            currCountry.setCode(l.getCountry());

            countryRepository.insert(currCountry);

            result.add(currCountry.getCode());

            if (++i == 10) {

                break;

            }

            Country entity = new Country();

            entity.setName(each.getDisplayCountry(each));

            entity.setLanguage(each.getLanguage());

            entity.setCode(each.getCountry());

            countryRepository.insert(entity);

            result.add(entity.getCode());

        }

        return result;

    }

example-common/repository-jpa/src/main/java/org/apache/shardingsphere/example/common/jpa/repository/CountryRepositoryImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ public class CountryRepositoryImpl implements CountryRepository { 
    }



    @Override

    public String insert(final Country country) {

    public Long insert(final Country country) {

        entityManager.persist(country);

        return country.getCode();

        return 1L;

    }



    @Override

example-common/repository-jpa/src/main/java/org/apache/shardingsphere/example/common/jpa/service/JPACountryServiceImpl.java

+8 −13
Original line number Diff line number Diff line
@@ -76,22 +76,17 @@ public class JPACountryServiceImpl implements JPACountryService { 
    private List<String> insertData() {

        System.out.println("---------------------------- Insert Data ----------------------------");

        List<String> result = new ArrayList<>();

        Locale[] locales = Locale.getAvailableLocales();

        int i = 0;

        for (Locale l:locales) {

            final String country = l.getCountry();

        for (Locale each : Locale.getAvailableLocales()) {

            final String country = each.getCountry();

            if (country == null || "".equals(country)) {

                continue;

            }

            CountryEntity currCountry = new CountryEntity();

            currCountry.setName(l.getDisplayCountry(l));

            currCountry.setLanguage(l.getLanguage());

            currCountry.setCode(l.getCountry());

            countryRepository.insert(currCountry);

            result.add(currCountry.getCode());

            if (++i == 10) {

                break;

            }

            CountryEntity entity = new CountryEntity();

            entity.setName(each.getDisplayCountry(each));

            entity.setLanguage(each.getLanguage());

            entity.setCode(each.getCountry());

            countryRepository.insert(entity);

            result.add(entity.getCode());

        }

        return result;

    }