#96 Reformat code with EditorConfig

.editorconfig

+# top-most EditorConfig file
+root = true
+
+[*.{java,xml}]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true

src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java

@@ -32,15 +32,14 @@ public class BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     protected Integer id;
 
+    public Integer getId() {
+        return id;
+    }
 
     public void setId(Integer id) {
         this.id = id;
     }
 
-    public Integer getId() {
-        return id;
-    }
-
     public boolean isNew() {
         return (this.id == null);
     }

src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java

@@ -32,15 +32,14 @@ public class NamedEntity extends BaseEntity {
     @Column(name = "name")
     private String name;
 
+    public String getName() {
+        return this.name;
+    }
 
     public void setName(String name) {
         this.name = name;
     }
 
-    public String getName() {
-        return this.name;
-    }
-
     @Override
     public String toString() {
         return this.getName();

src/main/java/org/springframework/samples/petclinic/model/Owner.java

@@ -85,10 +85,6 @@ public class Owner extends Person {
         this.telephone = telephone;
     }
 
-    protected void setPetsInternal(Set<Pet> pets) {
-        this.pets = pets;
-    }
-
     protected Set<Pet> getPetsInternal() {
         if (this.pets == null) {
             this.pets = new HashSet<>();
@@ -96,6 +92,10 @@ public class Owner extends Person {
         return this.pets;
     }
 
+    protected void setPetsInternal(Set<Pet> pets) {
+        this.pets = pets;
+    }
+
     public List<Pet> getPets() {
         List<Pet> sortedPets = new ArrayList<>(getPetsInternal());
         PropertyComparator.sort(sortedPets, new MutableSortDefinition("name", true, true));
@@ -141,13 +141,13 @@ public class Owner extends Person {
     public String toString() {
         return new ToStringCreator(this)
 
-                .append("id", this.getId())
-                .append("new", this.isNew())
-                .append("lastName", this.getLastName())
-                .append("firstName", this.getFirstName())
-                .append("address", this.address)
-                .append("city", this.city)
-                .append("telephone", this.telephone)
-                .toString();
+            .append("id", this.getId())
+            .append("new", this.isNew())
+            .append("lastName", this.getLastName())
+            .append("firstName", this.getFirstName())
+            .append("address", this.address)
+            .append("city", this.city)
+            .append("telephone", this.telephone)
+            .toString();
     }
 }

src/main/java/org/springframework/samples/petclinic/model/Pet.java

@@ -63,33 +63,28 @@ public class Pet extends NamedEntity {
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "pet", fetch = FetchType.EAGER)
     private Set<Visit> visits;
 
-
-    public void setBirthDate(DateTime birthDate) {
-        this.birthDate = birthDate;
-    }
-
     public DateTime getBirthDate() {
         return this.birthDate;
     }
 
-    public void setType(PetType type) {
-        this.type = type;
+    public void setBirthDate(DateTime birthDate) {
+        this.birthDate = birthDate;
     }
 
     public PetType getType() {
         return this.type;
     }
 
-    protected void setOwner(Owner owner) {
-        this.owner = owner;
+    public void setType(PetType type) {
+        this.type = type;
     }
 
     public Owner getOwner() {
         return this.owner;
     }
 
-    protected void setVisitsInternal(Set<Visit> visits) {
-        this.visits = visits;
+    protected void setOwner(Owner owner) {
+        this.owner = owner;
     }
 
     protected Set<Visit> getVisitsInternal() {
@@ -99,6 +94,10 @@ public class Pet extends NamedEntity {
         return this.visits;
     }
 
+    protected void setVisitsInternal(Set<Visit> visits) {
+        this.visits = visits;
+    }
+
     public List<Visit> getVisits() {
         List<Visit> sortedVisits = new ArrayList<>(getVisitsInternal());
         PropertyComparator.sort(sortedVisits, new MutableSortDefinition("date", false, false));

src/main/java/org/springframework/samples/petclinic/model/PetType.java

@@ -20,7 +20,7 @@ import javax.persistence.Table;
 
 /**
  * @author Juergen Hoeller
- * Can be Cat, Dog, Hamster...
+ *         Can be Cat, Dog, Hamster...
  */
 @Entity
 @Table(name = "types")

src/main/java/org/springframework/samples/petclinic/model/Vet.java

@@ -46,14 +46,9 @@ public class Vet extends Person {
 
     @ManyToMany(fetch = FetchType.EAGER)
     @JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
-            inverseJoinColumns = @JoinColumn(name = "specialty_id"))
+        inverseJoinColumns = @JoinColumn(name = "specialty_id"))
     private Set<Specialty> specialties;
 
-
-    protected void setSpecialtiesInternal(Set<Specialty> specialties) {
-        this.specialties = specialties;
-    }
-
     protected Set<Specialty> getSpecialtiesInternal() {
         if (this.specialties == null) {
             this.specialties = new HashSet<>();
@@ -61,6 +56,10 @@ public class Vet extends Person {
         return this.specialties;
     }
 
+    protected void setSpecialtiesInternal(Set<Specialty> specialties) {
+        this.specialties = specialties;
+    }
+
     @XmlElement
     public List<Specialty> getSpecialties() {
         List<Specialty> sortedSpecs = new ArrayList<>(getSpecialtiesInternal());

src/main/java/org/springframework/samples/petclinic/model/package-info.java

-
 /**
- *
  * The classes in this package represent PetClinic's business layer.
- *
  */
 package org.springframework.samples.petclinic.model;
 

src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java

@@ -53,7 +53,7 @@ public interface OwnerRepository {
      *
      * @param lastName Value to search for
      * @return a <code>Collection</code> of matching <code>Owner</code>s (or an empty <code>Collection</code> if none
-     *         found)
+     * found)
      */
     Collection<Owner> findByLastName(String lastName) throws DataAccessException;
 
@@ -62,8 +62,7 @@ public interface OwnerRepository {
      *
      * @param id the id to search for
      * @return the <code>Owner</code> if found
-     * @throws org.springframework.dao.DataRetrievalFailureException
-     *          if not found
+     * @throws org.springframework.dao.DataRetrievalFailureException if not found
      */
     Owner findById(int id) throws DataAccessException;
 

src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java

@@ -45,8 +45,7 @@ public interface PetRepository {
      *
      * @param id the id to search for
      * @return the <code>Pet</code> if found
-     * @throws org.springframework.dao.DataRetrievalFailureException
-     *          if not found
+     * @throws org.springframework.dao.DataRetrievalFailureException if not found
      */
     Pet findById(int id) throws DataAccessException;
 

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java

@@ -59,8 +59,8 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
     public JdbcOwnerRepositoryImpl(DataSource dataSource, NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
 
         this.insertOwner = new SimpleJdbcInsert(dataSource)
-                .withTableName("owners")
-                .usingGeneratedKeyColumns("id");
+            .withTableName("owners")
+            .usingGeneratedKeyColumns("id");
 
         this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
 
@@ -77,9 +77,9 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
         Map<String, Object> params = new HashMap<>();
         params.put("lastName", lastName + "%");
         List<Owner> owners = this.namedParameterJdbcTemplate.query(
-                "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like :lastName",
-                params,
-                BeanPropertyRowMapper.newInstance(Owner.class)
+            "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like :lastName",
+            params,
+            BeanPropertyRowMapper.newInstance(Owner.class)
         );
         loadOwnersPetsAndVisits(owners);
         return owners;
@@ -96,9 +96,9 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
             Map<String, Object> params = new HashMap<>();
             params.put("id", id);
             owner = this.namedParameterJdbcTemplate.queryForObject(
-                    "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id= :id",
-                    params,
-                    BeanPropertyRowMapper.newInstance(Owner.class)
+                "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id= :id",
+                params,
+                BeanPropertyRowMapper.newInstance(Owner.class)
             );
         } catch (EmptyResultDataAccessException ex) {
             throw new ObjectRetrievalFailureException(Owner.class, id);
@@ -111,9 +111,9 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
         Map<String, Object> params = new HashMap<>();
         params.put("id", owner.getId());
         final List<JdbcPet> pets = this.namedParameterJdbcTemplate.query(
-                "SELECT pets.id, name, birth_date, type_id, owner_id, visits.id as visit_id, visit_date, description, pet_id FROM pets LEFT OUTER JOIN visits ON  pets.id = pet_id WHERE owner_id=:id",
-                params,
-                new JdbcPetVisitExtractor()
+            "SELECT pets.id, name, birth_date, type_id, owner_id, visits.id as visit_id, visit_date, description, pet_id FROM pets LEFT OUTER JOIN visits ON  pets.id = pet_id WHERE owner_id=:id",
+            params,
+            new JdbcPetVisitExtractor()
         );
         Collection<PetType> petTypes = getPetTypes();
         for (JdbcPet pet : pets) {
@@ -130,16 +130,16 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
             owner.setId(newKey.intValue());
         } else {
             this.namedParameterJdbcTemplate.update(
-                    "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " +
-                            "city=:city, telephone=:telephone WHERE id=:id",
-                    parameterSource);
+                "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " +
+                    "city=:city, telephone=:telephone WHERE id=:id",
+                parameterSource);
         }
     }
 
     public Collection<PetType> getPetTypes() throws DataAccessException {
         return this.namedParameterJdbcTemplate.query(
-                "SELECT id, name FROM types ORDER BY name", new HashMap<String, Object>(),
-                BeanPropertyRowMapper.newInstance(PetType.class));
+            "SELECT id, name FROM types ORDER BY name", new HashMap<String, Object>(),
+            BeanPropertyRowMapper.newInstance(PetType.class));
     }
 
     /**

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java

@@ -29,21 +29,20 @@ class JdbcPet extends Pet {
 
     private int ownerId;
 
+    public int getTypeId() {
+        return this.typeId;
+    }
 
     public void setTypeId(int typeId) {
         this.typeId = typeId;
     }
 
-    public int getTypeId() {
-        return this.typeId;
+    public int getOwnerId() {
+        return this.ownerId;
     }
 
     public void setOwnerId(int ownerId) {
         this.ownerId = ownerId;
     }
 
-    public int getOwnerId() {
-        return this.ownerId;
-    }
-
 }

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java

@@ -64,8 +64,8 @@ public class JdbcPetRepositoryImpl implements PetRepository {
         this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
 
         this.insertPet = new SimpleJdbcInsert(dataSource)
-                .withTableName("pets")
-                .usingGeneratedKeyColumns("id");
+            .withTableName("pets")
+            .usingGeneratedKeyColumns("id");
 
         this.ownerRepository = ownerRepository;
         this.visitRepository = visitRepository;
@@ -75,9 +75,9 @@ public class JdbcPetRepositoryImpl implements PetRepository {
     public List<PetType> findPetTypes() throws DataAccessException {
         Map<String, Object> params = new HashMap<>();
         return this.namedParameterJdbcTemplate.query(
-                "SELECT id, name FROM types ORDER BY name",
-                params,
-                BeanPropertyRowMapper.newInstance(PetType.class));
+            "SELECT id, name FROM types ORDER BY name",
+            params,
+            BeanPropertyRowMapper.newInstance(PetType.class));
     }
 
     @Override
@@ -87,9 +87,9 @@ public class JdbcPetRepositoryImpl implements PetRepository {
             Map<String, Object> params = new HashMap<>();
             params.put("id", id);
             pet = this.namedParameterJdbcTemplate.queryForObject(
-                    "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=:id",
-                    params,
-                    new JdbcPetRowMapper());
+                "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=:id",
+                params,
+                new JdbcPetRowMapper());
         } catch (EmptyResultDataAccessException ex) {
             throw new ObjectRetrievalFailureException(Pet.class, id);
         }
@@ -108,13 +108,13 @@ public class JdbcPetRepositoryImpl implements PetRepository {
     public void save(Pet pet) throws DataAccessException {
         if (pet.isNew()) {
             Number newKey = this.insertPet.executeAndReturnKey(
-                    createPetParameterSource(pet));
+                createPetParameterSource(pet));
             pet.setId(newKey.intValue());
         } else {
             this.namedParameterJdbcTemplate.update(
-                    "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " +
-                            "owner_id=:owner_id WHERE id=:id",
-                    createPetParameterSource(pet));
+                "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " +
+                    "owner_id=:owner_id WHERE id=:id",
+                createPetParameterSource(pet));
         }
     }
 
@@ -123,11 +123,11 @@ public class JdbcPetRepositoryImpl implements PetRepository {
      */
     private MapSqlParameterSource createPetParameterSource(Pet pet) {
         return new MapSqlParameterSource()
-                .addValue("id", pet.getId())
-                .addValue("name", pet.getName())
-                .addValue("birth_date", pet.getBirthDate().toDate())
-                .addValue("type_id", pet.getType().getId())
-                .addValue("owner_id", pet.getOwner().getId());
+            .addValue("id", pet.getId())
+            .addValue("name", pet.getName())
+            .addValue("birth_date", pet.getBirthDate().toDate())
+            .addValue("type_id", pet.getType().getId())
+            .addValue("owner_id", pet.getOwner().getId());
     }
 
 }

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java

@@ -27,7 +27,7 @@ import java.sql.SQLException;
  * {@link OneToManyResultSetExtractor} of Spring Data Core JDBC Extensions.
  */
 public class JdbcPetVisitExtractor extends
-        OneToManyResultSetExtractor<JdbcPet, Visit, Integer> {
+    OneToManyResultSetExtractor<JdbcPet, Visit, Integer> {
 
     public JdbcPetVisitExtractor() {
         super(new JdbcPetRowMapper(), new JdbcVisitRowMapper());
@@ -51,4 +51,4 @@ public class JdbcPetVisitExtractor extends
     protected void addChild(JdbcPet root, Visit child) {
         root.addVisit(child);
     }
-}
\ No newline at end of file
+}

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java

@@ -60,25 +60,25 @@ public class JdbcVetRepositoryImpl implements VetRepository {
         List<Vet> vets = new ArrayList<>();
         // Retrieve the list of all vets.
         vets.addAll(this.jdbcTemplate.query(
-                "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name",
-                BeanPropertyRowMapper.newInstance(Vet.class)));
+            "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name",
+            BeanPropertyRowMapper.newInstance(Vet.class)));
 
         // Retrieve the list of all possible specialties.
         final List<Specialty> specialties = this.jdbcTemplate.query(
-                "SELECT id, name FROM specialties",
-                BeanPropertyRowMapper.newInstance(Specialty.class));
+            "SELECT id, name FROM specialties",
+            BeanPropertyRowMapper.newInstance(Specialty.class));
 
         // Build each vet's list of specialties.
         for (Vet vet : vets) {
             final List<Integer> vetSpecialtiesIds = this.jdbcTemplate.query(
-                    "SELECT specialty_id FROM vet_specialties WHERE vet_id=?",
-                    new BeanPropertyRowMapper<Integer>() {
-                        @Override
-                        public Integer mapRow(ResultSet rs, int row) throws SQLException {
-                            return rs.getInt(1);
-                        }
-                    },
-                    vet.getId());
+                "SELECT specialty_id FROM vet_specialties WHERE vet_id=?",
+                new BeanPropertyRowMapper<Integer>() {
+                    @Override
+                    public Integer mapRow(ResultSet rs, int row) throws SQLException {
+                        return rs.getInt(1);
+                    }
+                },
+                vet.getId());
             for (int specialtyId : vetSpecialtiesIds) {
                 Specialty specialty = EntityUtils.getById(specialties, Specialty.class, specialtyId);
                 vet.addSpecialty(specialty);

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java

@@ -50,8 +50,8 @@ public class JdbcVisitRepositoryImpl implements VisitRepository {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
 
         this.insertVisit = new SimpleJdbcInsert(dataSource)
-                .withTableName("visits")
-                .usingGeneratedKeyColumns("id");
+            .withTableName("visits")
+            .usingGeneratedKeyColumns("id");
     }
 
 
@@ -59,7 +59,7 @@ public class JdbcVisitRepositoryImpl implements VisitRepository {
     public void save(Visit visit) throws DataAccessException {
         if (visit.isNew()) {
             Number newKey = this.insertVisit.executeAndReturnKey(
-                    createVisitParameterSource(visit));
+                createVisitParameterSource(visit));
             visit.setId(newKey.intValue());
         } else {
             throw new UnsupportedOperationException("Visit update not supported");
@@ -72,17 +72,17 @@ public class JdbcVisitRepositoryImpl implements VisitRepository {
      */
     private MapSqlParameterSource createVisitParameterSource(Visit visit) {
         return new MapSqlParameterSource()
-                .addValue("id", visit.getId())
-                .addValue("visit_date", visit.getDate().toDate())
-                .addValue("description", visit.getDescription())
-                .addValue("pet_id", visit.getPet().getId());
+            .addValue("id", visit.getId())
+            .addValue("visit_date", visit.getDate().toDate())
+            .addValue("description", visit.getDescription())
+            .addValue("pet_id", visit.getPet().getId());
     }
 
     @Override
     public List<Visit> findByPetId(Integer petId) {
         return this.jdbcTemplate.query(
-                "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?",
-                new JdbcVisitRowMapper(), petId);
+            "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?",
+            new JdbcVisitRowMapper(), petId);
     }
 
 }

src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java

-
 /**
- *
  * The classes in this package represent the JDBC implementation
  * of PetClinic's persistence layer.
- *
  */
 package org.springframework.samples.petclinic.repository.jdbc;
 

src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java

@@ -43,7 +43,7 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository {
 
 
     /**
-     * Important: in the current version of this method, we load Owners with all their Pets and Visits while 
+     * Important: in the current version of this method, we load Owners with all their Pets and Visits while
      * we do not need Visits at all and we only need one property from the Pet objects (the 'name' property).
      * There are some ways to improve it such as:
      * - creating a Ligtweight class (example here: https://community.jboss.org/wiki/LightweightClass)
@@ -70,12 +70,11 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository {
 
     @Override
     public void save(Owner owner) {
-    	if (owner.getId() == null) {
-    		this.em.persist(owner);     		
-    	}
-    	else {
-    		this.em.merge(owner);    
-    	}
+        if (owner.getId() == null) {
+            this.em.persist(owner);
+        } else {
+            this.em.merge(owner);
+        }
 
     }
 

src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java

@@ -53,12 +53,11 @@ public class JpaPetRepositoryImpl implements PetRepository {
 
     @Override
     public void save(Pet pet) {
-    	if (pet.getId() == null) {
-    		this.em.persist(pet);     		
-    	}
-    	else {
-    		this.em.merge(pet);    
-    	}
+        if (pet.getId() == null) {
+            this.em.persist(pet);
+        } else {
+            this.em.merge(pet);
+        }
     }
 
 }