Update source for chapter 4

chapter4/licensing-service/Dockerfile

@@ -1,31 +1,6 @@
-#stage 1
-#Start with a base image containing Java runtime
-FROM openjdk:11-slim as build
-
-# Add Maintainer Info
-LABEL maintainer="Illary Huaylupo <illaryhs@gmail.com>"
-
-# The application's jar file
-ARG JAR_FILE
-
-# Add the application's jar to the container
-COPY ${JAR_FILE} app.jar
-
-#unpackage jar file
-RUN mkdir -p target/dependency && (cd target/dependency; jar -xf /app.jar)
-
-#stage 2
-#Same Java runtime
 FROM openjdk:11-slim
-
-#Add volume pointing to /tmp
-VOLUME /tmp
-
-#Copy unpackaged application to new container
-ARG DEPENDENCY=/target/dependency
-COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
-COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
-COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
-
-#execute the application
-ENTRYPOINT ["java","-cp","app:app/lib/*","com.optimagrowth.license.LicenseServiceApplication"]
+MAINTAINER "tinhcao <caodangtinh@gmail.com>"
+WORKDIR /app
+COPY ./target/licensing-service.jar ./
+EXPOSE 8080
+CMD ["java", "-jar", "licensing-service.jar"]

chapter4/licensing-service/pom.xml

@@ -52,6 +52,7 @@
 	</dependencies>
 
 	<build>
+		<finalName>${project.artifactId}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>

chapter4/licensing-service/src/main/java/com/optimagrowth/license/LicenseServiceApplication.java

@@ -22,7 +22,7 @@ public LocaleResolver localeResolver() {
 		localeResolver.setDefaultLocale(Locale.US);
 		return localeResolver;
 	}
-	@Bean
+	@Bean(name = "messageSource")
 	public ResourceBundleMessageSource messageSource() {
 		ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
 		messageSource.setUseCodeAsDefaultMessage(true);

chapter4/licensing-service/src/main/java/com/optimagrowth/license/controller/LicenseController.java

@@ -5,7 +5,7 @@
 
 import java.util.Locale;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -22,10 +22,10 @@
 
 @RestController
 @RequestMapping(value="v1/organization/{organizationId}/license")
+@AllArgsConstructor
 public class LicenseController {
 
-	@Autowired
-	private LicenseService licenseService;
+	private final LicenseService licenseService;
 
 	@RequestMapping(value="/{licenseId}",method = RequestMethod.GET)
 	public ResponseEntity<License> getLicense( @PathVariable("organizationId") String organizationId,

chapter4/licensing-service/src/main/java/com/optimagrowth/license/service/LicenseService.java

@@ -3,18 +3,20 @@
 import java.util.Locale;
 import java.util.Random;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import com.optimagrowth.license.model.License;
 
 @Service
+@AllArgsConstructor
 public class LicenseService {
-	
-	@Autowired
-	MessageSource messages;
+
+	@Qualifier("messageSource")
+	private final MessageSource messages;
 
 	public License getLicense(String licenseId, String organizationId){
 		License license = new License();