Distribute springboot-petclinic-server among microservices

Author: mszarlinski

springboot-petclinic-server/src/main/resources/db_readme.txt db_readme.txt

@@ -36,6 +36,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
 
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -62,6 +66,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 	<build>

petclinic-clients-service/pom.xml

@@ -1,7 +1,9 @@
-package org.springframework.samples.petclinic.domain.model.owner;
+package org.springframework.samples.petclinic.clients.application;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
+import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.clients.domain.model.owner.OwnerRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/owner/OwnerService.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/OwnerService.java

@@ -1,7 +1,10 @@
-package org.springframework.samples.petclinic.domain.model.pet;
+package org.springframework.samples.petclinic.clients.application;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
+import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.clients.domain.model.pet.PetRepository;
+import org.springframework.samples.petclinic.clients.domain.model.pet.PetType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/PetService.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/PetService.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.boundary.web.owner;
+package org.springframework.samples.petclinic.clients.boundary.web.owner;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.samples.petclinic.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.domain.model.owner.OwnerService;
-import org.springframework.samples.petclinic.support.web.AbstractResourceController;
+import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.clients.application.OwnerService;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,7 +32,7 @@
  * @author Michael Isvy
  */
 @RestController
-public class OwnerResource extends AbstractResourceController {
+public class OwnerResource {
 
     private final OwnerService ownerService;
 

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/owner/OwnerResource.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/owner/OwnerResource.java

@@ -13,18 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.boundary.web.pet;
+package org.springframework.samples.petclinic.clients.boundary.web.pet;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
-import org.springframework.samples.petclinic.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.domain.model.owner.OwnerService;
-import org.springframework.samples.petclinic.domain.model.pet.Pet;
-import org.springframework.samples.petclinic.domain.model.pet.PetService;
-import org.springframework.samples.petclinic.domain.model.pet.PetType;
-import org.springframework.samples.petclinic.support.web.AbstractResourceController;
+import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.clients.application.OwnerService;
+import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.clients.application.PetService;
+import org.springframework.samples.petclinic.clients.domain.model.pet.PetType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.Size;
@@ -37,7 +36,7 @@
  * @author Arjen Poutsma
  */
 @RestController
-public class PetResource extends AbstractResourceController {
+public class PetResource {
 
     private final PetService petService;
 
@@ -66,8 +65,8 @@ public String initCreationForm(@PathVariable("ownerId") int ownerId, Map<String,
     @PostMapping("/owners/{ownerId}/pets")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public void processCreationForm(
-            @RequestBody PetRequest petRequest,
-            @PathVariable("ownerId") int ownerId) {
+        @RequestBody PetRequest petRequest,
+        @PathVariable("ownerId") int ownerId) {
 
         Pet pet = new Pet();
         Owner owner = ownerService.findOwnerById(ownerId);

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/pet/PetResource.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetResource.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.boundary.web.pet;
+package org.springframework.samples.petclinic.clients.boundary.web.pet;
 
-import org.springframework.samples.petclinic.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.Errors;
 

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/pet/PetValidator.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetValidator.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.clients.domain.model;
+
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.samples.petclinic.clients.support.jpa.BaseEntity;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * Simple JavaBean domain object representing an person.
+ *
+ * @author Ken Krebs
+ */
+@MappedSuperclass
+public class Person extends BaseEntity {
+
+    @Column(name = "first_name")
+    @NotEmpty
+    protected String firstName;
+
+    @Column(name = "last_name")
+    @NotEmpty
+    protected String lastName;
+
+    public String getFirstName() {
+        return this.firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return this.lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+
+}

petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/Person.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.domain.model.owner;
+package org.springframework.samples.petclinic.clients.domain.model.owner;
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
 import org.springframework.core.style.ToStringCreator;
-import org.springframework.samples.petclinic.domain.model.pet.Pet;
-import org.springframework.samples.petclinic.domain.shared.Person;
+import org.springframework.samples.petclinic.clients.domain.model.Person;
+import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
 
 import javax.persistence.*;
 import javax.validation.constraints.Digits;
@@ -53,7 +53,6 @@ public class Owner extends Person {
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "owner")
     private Set<Pet> pets;
 
-
     public String getAddress() {
         return this.address;
     }
@@ -134,13 +133,13 @@ public Pet getPet(String name, boolean ignoreNew) {
     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();
     }
 }

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/owner/Owner.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/Owner.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.domain.model.owner;
+package org.springframework.samples.petclinic.clients.domain.model.owner;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/owner/OwnerRepository.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/OwnerRepository.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.domain.model.pet;
+package org.springframework.samples.petclinic.clients.domain.model.pet;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.springframework.samples.petclinic.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.support.jpa.NamedEntity;
+import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.clients.support.jpa.NamedEntity;
 
 import javax.persistence.*;
 import java.util.Date;

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/Pet.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/Pet.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.domain.model.pet;
+package org.springframework.samples.petclinic.clients.domain.model.pet;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/PetRepository.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetRepository.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.domain.model.pet;
+package org.springframework.samples.petclinic.clients.domain.model.pet;
 
-import org.springframework.samples.petclinic.support.jpa.NamedEntity;
+import org.springframework.samples.petclinic.clients.support.jpa.NamedEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/PetType.java petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetType.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.clients.support.jpa;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * Simple JavaBean domain object with an id property. Used as a base class for objects needing this property.
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ */
+@MappedSuperclass
+public class BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    protected Integer id;
+
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public boolean isNew() {
+        return (this.id == null);
+    }
+
+}

petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/support/jpa/BaseEntity.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.clients.support.jpa;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+
+/**
+ * Simple JavaBean domain object adds a name property to <code>BaseEntity</code>. Used as a base class for objects
+ * needing these properties.
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ */
+@MappedSuperclass
+public class NamedEntity extends BaseEntity {
+
+    @Column(name = "name")
+    private String name;
+
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public String toString() {
+        return this.getName();
+    }
+
+}