Spring Boot upgrade 2.7.6 and passwordless

docker-compose.yml

@@ -28,6 +28,8 @@ services:
     entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
     ports:
     - 8081:8081
+    environment:
+      - SERVER_PORT=8081
 
   visits-service:
     image: springcommunity/spring-petclinic-visits-service
@@ -39,6 +41,8 @@ services:
     entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
     ports:
      - 8082:8082
+    environment:
+     - SERVER_PORT=8082
 
   vets-service:
     image: springcommunity/spring-petclinic-vets-service
@@ -50,6 +54,9 @@ services:
     entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
     ports:
      - 8083:8083
+    environment:
+     - SERVER_PORT=8083
+
 
   api-gateway:
     image: springcommunity/spring-petclinic-api-gateway
@@ -62,6 +69,7 @@ services:
     ports:
      - 8080:8080
 
+
   tracing-server:
     image: openzipkin/zipkin
     container_name: tracing-server

pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.1</version>
+        <version>2.7.6</version>
     </parent>
 
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-petclinic-microservices</artifactId>
-    <version>2.5.1</version>
+    <version>2.7.6</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
 
@@ -29,15 +29,16 @@
         <java.version>1.8</java.version>
         <assertj.version>3.17.1</assertj.version>
 
-        <spring-boot.version>2.5.1</spring-boot.version>
-        <spring-cloud.version>2020.0.3</spring-cloud.version>
-        <chaos-monkey-spring-boot.version>2.3.10</chaos-monkey-spring-boot.version>
+
+        <spring-cloud.version>2021.0.5</spring-cloud.version>
+        <chaos-monkey-spring-boot.version>2.6.1</chaos-monkey-spring-boot.version>
 
         <docker.image.prefix>springcommunity</docker.image.prefix>
         <docker.image.exposed.port>9090</docker.image.exposed.port>
         <docker.image.dockerfile.dir>${basedir}</docker.image.dockerfile.dir>
         <docker.image.dockerize.version>v0.6.1</docker.image.dockerize.version>
         <docker.plugin.version>1.2.0</docker.plugin.version>
+        <version.spring.cloud.azure>4.5.0</version.spring.cloud.azure>
     </properties>
 
     <dependencyManagement>
@@ -60,6 +61,13 @@
                 <version>${assertj.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.azure.spring</groupId>
+                <artifactId>spring-cloud-azure-dependencies</artifactId>
+                <version>${version.spring.cloud.azure}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -69,21 +77,14 @@
             <activation>
                 <file>
                     <!-- Just a way to identify a Spring Boot application -->
-                    <exists>src/main/resources/bootstrap.yml</exists>
+                    <exists>src/main/resources/application.yml</exists>
                 </file>
             </activation>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
-                        <configuration>
-                            <fork>true</fork>
-                            <!-- Layered jars optimizes Docker images -->
-                            <layers>
-                                <enabled>true</enabled>
-                            </layers>
-                        </configuration>
                         <executions>
                             <execution>
                                 <!-- Spring Boot Actuator displays build-related information if a META-INF/build-info.properties file is present -->

spring-petclinic-admin-server/pom.xml

@@ -12,11 +12,11 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>2.5.1</version>
+        <version>2.7.6</version>
     </parent>
 
     <properties>
-        <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
+        <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
         <docker.image.exposed.port>9090</docker.image.exposed.port>
         <docker.image.dockerfile.dir>${basedir}/../docker</docker.image.dockerfile.dir>
     </properties>

spring-petclinic-admin-server/src/main/java/org/springframework/samples/petclinic/admin/SpringBootAdminApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-admin-server/src/main/resources/application.yml

@@ -0,0 +1,13 @@
+spring:
+  application:
+    name: admin-server
+  config:
+    import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
+
+
+---
+spring:
+  config:
+    activate:
+      on-profile: docker
+    import: configserver:http://config-server:8888

spring-petclinic-api-gateway/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>2.5.1</version>
+        <version>2.7.6</version>
     </parent>
 
     <properties>

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -18,7 +18,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.samples.petclinic.api.dto.OwnerDetails;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/OwnerDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/VisitDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/Visits.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.

spring-petclinic-api-gateway/src/main/resources/application.yml

@@ -1,8 +1,9 @@
 spring:
+  application:
+    name: api-gateway
+  config:
+    import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
   cloud:
-    loadbalancer:
-      ribbon:
-        enabled: false
     gateway:
       routes:
         - id: vets-service
@@ -23,3 +24,12 @@ spring:
             - Path=/api/customer/**
           filters:
             - StripPrefix=2
+
+
+
+---
+spring:
+  config:
+    activate:
+      on-profile: docker
+    import: configserver:http://config-server:8888

spring-petclinic-api-gateway/src/main/resources/static/index.html

@@ -46,6 +46,9 @@
     <script src="/scripts/vet-list/vet-list.js"></script>
     <script src="/scripts/vet-list/vet-list.controller.js"></script>
     <script src="/scripts/vet-list/vet-list.component.js"></script>
+
+    <script src="/scripts/infrastructure/infrastructure.js"></script>
+    <script src="/scripts/infrastructure/httpErrorHandlingInterceptor.js"></script>
 </head>
 
 <body class="container">

spring-petclinic-api-gateway/src/main/resources/static/scripts/app.js

@@ -1,14 +1,15 @@
 'use strict';
 /* App Module */
 var petClinicApp = angular.module('petClinicApp', [
-    'ui.router', 'layoutNav', 'layoutFooter', 'layoutWelcome',
+    'ui.router', 'infrastructure', 'layoutNav', 'layoutFooter', 'layoutWelcome',
     'ownerList', 'ownerDetails', 'ownerForm', 'petForm', 'visits', 'vetList']);
 
 petClinicApp.config(['$stateProvider', '$urlRouterProvider', '$locationProvider', '$httpProvider', function(
     $stateProvider, $urlRouterProvider, $locationProvider, $httpProvider) {
 
     // safari turns to be lazy sending the Cache-Control header
     $httpProvider.defaults.headers.common["Cache-Control"] = 'no-cache';
+    $httpProvider.interceptors.push('HttpErrorHandlingInterceptor');
 
     $locationProvider.hashPrefix('!');
 
@@ -32,4 +33,4 @@ petClinicApp.config(['$stateProvider', '$urlRouterProvider', '$locationProvider'
     angular.module(mod).component(mod, {
         templateUrl: "scripts/fragments/" + c + ".html"
     });
-});
+});

spring-petclinic-api-gateway/src/main/resources/static/scripts/infrastructure/httpErrorHandlingInterceptor.js

@@ -0,0 +1,17 @@
+'use strict';
+
+/**
+ * Global HTTP errors handler.
+ */
+angular.module('infrastructure')
+    .factory('HttpErrorHandlingInterceptor', function () {
+        return {
+            responseError: function (response) {
+                var error = response.data;
+                alert(error.error + "\r\n" + error.errors.map(function (e) {
+                    return e.field + ": " + e.defaultMessage;
+                }).join("\r\n"));
+                return response;
+            }
+        }
+    });

spring-petclinic-api-gateway/src/main/resources/static/scripts/infrastructure/infrastructure.js

@@ -0,0 +1,3 @@
+'use strict';
+
+angular.module('infrastructure', []);

spring-petclinic-api-gateway/src/main/resources/static/scripts/owner-form/owner-form.controller.js

@@ -16,20 +16,15 @@ angular.module('ownerForm')
 
         self.submitOwnerForm = function () {
             var id = self.owner.id;
-            var req;
+
             if (id) {
-                req = $http.put("api/customer/owners/" + id, self.owner);
+                $http.put('api/customer/owners/' + id, self.owner).then(function () {
+                    $state.go('ownerDetails', {ownerId: ownerId});
+                });
             } else {
-                req = $http.post("api/customer/owners", self.owner);
+                $http.post('api/customer/owners', self.owner).then(function () {
+                    $state.go('owners');
+                });
             }
-
-            req.then(function () {
-                $state.go('owners');
-            }, function (response) {
-                var error = response.data;
-                alert(error.error + "\r\n" + error.errors.map(function (e) {
-                        return e.field + ": " + e.defaultMessage;
-                    }).join("\r\n"));
-            });
         };
     }]);

spring-petclinic-api-gateway/src/main/resources/static/scripts/owner-form/owner-form.template.html

@@ -27,7 +27,8 @@ <h2>Owner</h2>
 
     <div class="form-group">
         <label>Telephone</label>
-        <input class="form-control" ng-model="$ctrl.owner.telephone" name="telephone" required/>
+        <input class="form-control" ng-model="$ctrl.owner.telephone" pattern="[0-9]{12}" placeholder="905554443322"
+               name="telephone" maxlength="12" required/>
         <span ng-show="ownerForm.telephone.$error.required" class="help-block">Telephone is required.</span>
     </div>
 

spring-petclinic-api-gateway/src/main/resources/static/scripts/pet-form/pet-form.controller.js

@@ -46,13 +46,7 @@ angular.module('petForm')
             }
 
             req.then(function () {
-                $state.go("owners", {ownerId: ownerId});
-            }, function (response) {
-                var error = response.data;
-                error.errors = error.errors || [];
-                alert(error.error + "\r\n" + error.errors.map(function (e) {
-                        return e.field + ": " + e.defaultMessage;
-                    }).join("\r\n"));
+                $state.go('ownerDetails', {ownerId: ownerId});
             });
         };
     }]);