Centralized configuration added

Nasruddin · Nasruddin · commit 86c381404291 · 2021-08-27T20:44:58.000+05:30
diff --git a/api-gateway-service/pom.xml b/api-gateway-service/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.assignment</groupId>
+	<groupId>com.javatab</groupId>
 	<artifactId>api-gateway-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>api-gateway-service</name>
@@ -49,7 +49,7 @@
 			<version>0.9.0</version>
 		</dependency>
 		<dependency>
-			<groupId>com.assignment</groupId>
+			<groupId>com.javatab</groupId>
 			<artifactId>common-service</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
diff --git a/api-gateway-service/src/main/java/com/javatab/apigatewayservice/ApiGatewayServiceApplication.java b/api-gateway-service/src/main/java/com/javatab/apigatewayservice/ApiGatewayServiceApplication.java
@@ -1,4 +1,4 @@
-package com.assignment.apigatewayservice;
+package com.javatab.apigatewayservice;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/JwtAuthenticationEntryPoint.java b/api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/JwtAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package com.assignment.apigatewayservice.security;
+package com.javatab.apigatewayservice.security;
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
diff --git a/api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/JwtTokenAuthenticationFilter.java b/api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/JwtTokenAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.assignment.apigatewayservice.security;
+package com.javatab.apigatewayservice.security;
 
 import com.javatab.commonservice.JwtConfig;
 import io.jsonwebtoken.Claims;
diff --git a/api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/SecurityTokenConfig.java b/api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/SecurityTokenConfig.java
@@ -1,4 +1,4 @@
-package com.assignment.apigatewayservice.security;
+package com.javatab.apigatewayservice.security;
 
 import com.javatab.commonservice.JwtConfig;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/api-gateway-service/src/main/resources/application.yml b/api-gateway-service/src/main/resources/application.yml
@@ -1,39 +1,11 @@
 spring:
   application:
     name: api-gateway-service
-
+  config:
+    import: optional:config-server/
+    cloud:
+      bootstrap:
+        enabled: true
 server:
   port: 8762
 
-eureka:
-  client:
-    server-url:
-      default-zone: http://localhost:8761/eureka/
-
-# Disable accessing services using service name (i.e. students-service).
-# They should be only accessed through the path defined below.
-zuul:
-  ignored-services: '*'
-# Map paths to services
-  routes:
-    course-service:
-      path: /course/**
-      service-id: COURSE-SERVICE
-
-    #student-service:
-     # path: /student/**
-      #service-id: STUDENT-SERVICE
-# Map path to auth service
-    auth-service:
-      path: /auth/**
-      service-id: AUTH-SERVICE
-
-      strip-prefix: false
-
-# Exclude authorization from sensitive headers
-      sensitive-headers: Cookie,Set-Cookie
-      ignored-headers: Access-Control-Allow-Credentials, Access-Control-Allow-Origin
-
-ribbon:
-  ReadTimeout: 60000
-
diff --git a/api-gateway-service/src/test/java/com/javatab/apigatewayservice/ApiGatewayServiceApplicationTests.java b/api-gateway-service/src/test/java/com/javatab/apigatewayservice/ApiGatewayServiceApplicationTests.java
@@ -1,4 +1,4 @@
-package com.assignment.apigatewayservice;
+package com.javatab.apigatewayservice;
 
 import org.junit.jupiter.api.Disabled;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/auth-service/pom.xml b/auth-service/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.assignment</groupId>
+	<groupId>com.javatab</groupId>
 	<artifactId>auth-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>auth-service</name>
@@ -71,6 +71,12 @@
 			<artifactId>common-service</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.javatab</groupId>
+			<artifactId>common-service</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/auth-service/src/main/java/com/javatab/authservice/AuthServiceApplication.java b/auth-service/src/main/java/com/javatab/authservice/AuthServiceApplication.java
@@ -1,4 +1,4 @@
-package com.assignment.authservice;
+package com.javatab.authservice;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/auth-service/src/main/java/com/javatab/authservice/model/LoggedInUserDetails.java b/auth-service/src/main/java/com/javatab/authservice/model/LoggedInUserDetails.java
@@ -1,4 +1,4 @@
-package com.assignment.authservice.model;
+package com.javatab.authservice.model;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
diff --git a/auth-service/src/main/java/com/javatab/authservice/security/JwtUsernameAndPasswordAuthenticationFilter.java b/auth-service/src/main/java/com/javatab/authservice/security/JwtUsernameAndPasswordAuthenticationFilter.java
@@ -1,6 +1,6 @@
-package com.assignment.authservice.security;
+package com.javatab.authservice.security;
 
-import com.assignment.authservice.model.LoggedInUserDetails;
+import com.javatab.authservice.model.LoggedInUserDetails;
 import com.javatab.commonservice.JwtConfig;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
diff --git a/auth-service/src/main/java/com/javatab/authservice/security/SecurityCredentialsConfig.java b/auth-service/src/main/java/com/javatab/authservice/security/SecurityCredentialsConfig.java
@@ -1,4 +1,4 @@
-package com.assignment.authservice.security;
+package com.javatab.authservice.security;
 
 import com.javatab.commonservice.JwtConfig;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/auth-service/src/main/java/com/javatab/authservice/security/UserDetailsServiceImpl.java b/auth-service/src/main/java/com/javatab/authservice/security/UserDetailsServiceImpl.java
@@ -1,4 +1,4 @@
-package com.assignment.authservice.security;
+package com.javatab.authservice.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
diff --git a/auth-service/src/main/resources/application.yml b/auth-service/src/main/resources/application.yml
@@ -1,7 +1,11 @@
 spring:
   application:
     name: auth-service
-
+  config:
+    import: optional:config-server/
+    cloud:
+      bootstrap:
+        enabled: true
 server:
   port: 9100
 
diff --git a/auth-service/src/test/java/com/javatab/authservice/AuthServiceApplicationTests.java b/auth-service/src/test/java/com/javatab/authservice/AuthServiceApplicationTests.java
@@ -1,4 +1,4 @@
-package com.assignment.authservice;
+package com.javatab.authservice;
 
 import org.junit.jupiter.api.Disabled;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/common-service/src/main/resources/application.yml b/common-service/src/main/resources/application.yml
@@ -1,6 +1,11 @@
 spring:
   application:
     name: common-service
+  config:
+    import: optional:config-server/
+    cloud:
+      bootstrap:
+        enabled: true
 
 server:
   port: 9200
diff --git a/common-service/src/test/java/com/javatab/commonservice/CommonServiceApplicationTests.java b/common-service/src/test/java/com/javatab/commonservice/CommonServiceApplicationTests.java
@@ -1,15 +1,14 @@
 package com.javatab.commonservice;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Disabled;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class CommonServiceApplicationTests {
 
-	@Test
+	@Disabled
 	public void contextLoads() {
 	}
 
diff --git a/config-server/src/main/resources/application.yml b/config-server/src/main/resources/application.yml
@@ -0,0 +1,21 @@
+spring:
+  application:
+    name: config-server
+  profiles:
+    active:
+      - git
+  cloud:
+    config:
+      server:
+        git:
+          uri: https://github.com/nasruddin/config.git
+
+server:
+  port: 8071
+
+#Enable all Spring Boot Actuator endpoints.
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
diff --git a/course-service/pom.xml b/course-service/pom.xml
@@ -48,6 +48,10 @@
 			<artifactId>spring-boot-devtools</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -57,6 +61,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 
diff --git a/course-service/src/main/java/com/javatab/courseservice/CourseServiceApplication.java b/course-service/src/main/java/com/javatab/courseservice/CourseServiceApplication.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice;
+package com.javatab.courseservice;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/course-service/src/main/java/com/javatab/courseservice/controller/web/v1/CourseControllerV1.java b/course-service/src/main/java/com/javatab/courseservice/controller/web/v1/CourseControllerV1.java
@@ -1,11 +1,11 @@
-package com.assignment.courseservice.controller.web.v1;
+package com.javatab.courseservice.controller.web.v1;
 
-import com.assignment.courseservice.exception.InvalidCourseOrSeatNotAvailableException;
-import com.assignment.courseservice.exception.NoCourseAvailableException;
-import com.assignment.courseservice.model.Course;
-import com.assignment.courseservice.model.StudentCourse;
-import com.assignment.courseservice.service.CourseService;
-import com.assignment.courseservice.service.StudentService;
+import com.javatab.courseservice.exception.InvalidCourseOrSeatNotAvailableException;
+import com.javatab.courseservice.exception.NoCourseAvailableException;
+import com.javatab.courseservice.model.Course;
+import com.javatab.courseservice.model.StudentCourse;
+import com.javatab.courseservice.service.CourseService;
+import com.javatab.courseservice.service.StudentService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/course-service/src/main/java/com/javatab/courseservice/controller/web/v1/StudentControllerV1.java b/course-service/src/main/java/com/javatab/courseservice/controller/web/v1/StudentControllerV1.java
@@ -1,20 +1,18 @@
-package com.assignment.courseservice.controller.web.v1;
+package com.javatab.courseservice.controller.web.v1;
 
 
-import com.assignment.courseservice.dto.StudentCourseDto;
-import com.assignment.courseservice.exception.InvalidCourseOrSeatNotAvailableException;
-import com.assignment.courseservice.exception.NoCourseRegisteredForUserException;
-import com.assignment.courseservice.model.Student;
-import com.assignment.courseservice.model.StudentCourse;
-import com.assignment.courseservice.service.StudentService;
+import com.javatab.courseservice.dto.StudentCourseDto;
+import com.javatab.courseservice.exception.InvalidCourseOrSeatNotAvailableException;
+import com.javatab.courseservice.exception.NoCourseRegisteredForUserException;
+import com.javatab.courseservice.model.Student;
+import com.javatab.courseservice.service.StudentService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Optional;
 
 @RestController
 @RequestMapping("v1/students")
diff --git a/course-service/src/main/java/com/javatab/courseservice/dto/StudentCourseDto.java b/course-service/src/main/java/com/javatab/courseservice/dto/StudentCourseDto.java
@@ -1,6 +1,6 @@
-package com.assignment.courseservice.dto;
+package com.javatab.courseservice.dto;
 
-import com.assignment.courseservice.model.Status;
+import com.javatab.courseservice.model.Status;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/course-service/src/main/java/com/javatab/courseservice/exception/InvalidCourseOrSeatNotAvailableAdvice.java b/course-service/src/main/java/com/javatab/courseservice/exception/InvalidCourseOrSeatNotAvailableAdvice.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.exception;
+package com.javatab.courseservice.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/course-service/src/main/java/com/javatab/courseservice/exception/InvalidCourseOrSeatNotAvailableException.java b/course-service/src/main/java/com/javatab/courseservice/exception/InvalidCourseOrSeatNotAvailableException.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.exception;
+package com.javatab.courseservice.exception;
 
 public class InvalidCourseOrSeatNotAvailableException extends RuntimeException {
 
diff --git a/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseAvailableAdvice.java b/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseAvailableAdvice.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.exception;
+package com.javatab.courseservice.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseAvailableException.java b/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseAvailableException.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.exception;
+package com.javatab.courseservice.exception;
 
 public class NoCourseAvailableException extends RuntimeException {
 
diff --git a/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseRegisteredForUserAdvice.java b/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseRegisteredForUserAdvice.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.exception;
+package com.javatab.courseservice.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseRegisteredForUserException.java b/course-service/src/main/java/com/javatab/courseservice/exception/NoCourseRegisteredForUserException.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.exception;
+package com.javatab.courseservice.exception;
 
 public class NoCourseRegisteredForUserException extends RuntimeException {
 
diff --git a/course-service/src/main/java/com/javatab/courseservice/model/Course.java b/course-service/src/main/java/com/javatab/courseservice/model/Course.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.model;
+package com.javatab.courseservice.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
diff --git a/course-service/src/main/java/com/javatab/courseservice/model/Seat.java b/course-service/src/main/java/com/javatab/courseservice/model/Seat.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.model;
+package com.javatab.courseservice.model;
 
 import lombok.*;
 
diff --git a/course-service/src/main/java/com/javatab/courseservice/model/SeatType.java b/course-service/src/main/java/com/javatab/courseservice/model/SeatType.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.model;
+package com.javatab.courseservice.model;
 
 public enum SeatType {
     FRONT, BACK, MIDDLE
diff --git a/course-service/src/main/java/com/javatab/courseservice/model/Status.java b/course-service/src/main/java/com/javatab/courseservice/model/Status.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.model;
+package com.javatab.courseservice.model;
 
 public enum Status {
     PENDING, APPROVED, CANCELLED
diff --git a/course-service/src/main/java/com/javatab/courseservice/model/Student.java b/course-service/src/main/java/com/javatab/courseservice/model/Student.java
@@ -1,9 +1,7 @@
-package com.assignment.courseservice.model;
+package com.javatab.courseservice.model;
 
 
 import lombok.*;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/course-service/src/main/java/com/javatab/courseservice/model/StudentCourse.java b/course-service/src/main/java/com/javatab/courseservice/model/StudentCourse.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.model;
+package com.javatab.courseservice.model;
 
 import lombok.*;
 
diff --git a/course-service/src/main/java/com/javatab/courseservice/model/Type.java b/course-service/src/main/java/com/javatab/courseservice/model/Type.java
@@ -1,4 +1,4 @@
-package com.assignment.courseservice.model;
+package com.javatab.courseservice.model;
 
 public enum Type {
     INTERNAL, EXTERNAL
diff --git a/course-service/src/main/java/com/javatab/courseservice/repository/CourseRepository.java b/course-service/src/main/java/com/javatab/courseservice/repository/CourseRepository.java
@@ -1,6 +1,6 @@
-package com.assignment.courseservice.repository;
+package com.javatab.courseservice.repository;
 
-import com.assignment.courseservice.model.Course;
+import com.javatab.courseservice.model.Course;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
diff --git a/course-service/src/main/java/com/javatab/courseservice/repository/SeatRepository.java b/course-service/src/main/java/com/javatab/courseservice/repository/SeatRepository.java
diff --git a/course-service/src/main/java/com/javatab/courseservice/repository/StudentCourseRepository.java b/course-service/src/main/java/com/javatab/courseservice/repository/StudentCourseRepository.java
diff --git a/course-service/src/main/java/com/javatab/courseservice/repository/StudentRepository.java b/course-service/src/main/java/com/javatab/courseservice/repository/StudentRepository.java
diff --git a/course-service/src/main/java/com/javatab/courseservice/service/CourseService.java b/course-service/src/main/java/com/javatab/courseservice/service/CourseService.java
diff --git a/course-service/src/main/java/com/javatab/courseservice/service/SeatService.java b/course-service/src/main/java/com/javatab/courseservice/service/SeatService.java
diff --git a/course-service/src/main/java/com/javatab/courseservice/service/StudentService.java b/course-service/src/main/java/com/javatab/courseservice/service/StudentService.java
diff --git a/course-service/src/main/resources/application.yml b/course-service/src/main/resources/application.yml
diff --git a/course-service/src/test/java/com/assignment/courseservice/controller/web/v1/CourseControllerV1Test.java b/course-service/src/test/java/com/assignment/courseservice/controller/web/v1/CourseControllerV1Test.java
diff --git a/course-service/src/test/java/com/assignment/courseservice/controller/web/v1/StudentControllerV1Test.java b/course-service/src/test/java/com/assignment/courseservice/controller/web/v1/StudentControllerV1Test.java
diff --git a/course-service/src/test/java/com/javatab/courseservice/CourseServiceApplicationTests.java b/course-service/src/test/java/com/javatab/courseservice/CourseServiceApplicationTests.java
diff --git a/discovery-service/pom.xml b/discovery-service/pom.xml
diff --git a/discovery-service/src/main/java/com/javatab/discoveryservice/DiscoveryServiceApplication.java b/discovery-service/src/main/java/com/javatab/discoveryservice/DiscoveryServiceApplication.java
diff --git a/discovery-service/src/main/resources/application.yml b/discovery-service/src/main/resources/application.yml
diff --git a/discovery-service/src/test/java/com/javatab/discoveryservice/DiscoveryServiceApplicationTests.java b/discovery-service/src/test/java/com/javatab/discoveryservice/DiscoveryServiceApplicationTests.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.assignment.apigatewayservice;`
	`1`	`+package com.javatab.apigatewayservice;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.assignment.apigatewayservice.security;`
	`1`	`+package com.javatab.apigatewayservice.security;`
`2`	`2`
`3`	`3`	`import org.springframework.security.core.AuthenticationException;`
`4`	`4`	`import org.springframework.security.web.AuthenticationEntryPoint;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.assignment.authservice;`
	`1`	`+package com.javatab.authservice;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.assignment.authservice.model;`
	`1`	`+package com.javatab.authservice.model;`
`2`	`2`
`3`	`3`	`import lombok.Data;`
`4`	`4`	`import lombok.RequiredArgsConstructor;`