Merge pull request #2 from Nasruddin/feature/add-config-server

Feature/add config server

Author: Nasruddin

api-gateway-service/pom.xml

@@ -3,7 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.assignment</groupId>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.5.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<groupId>com.javatab</groupId>
 	<artifactId>api-gateway-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>api-gateway-service</name>
@@ -14,13 +21,6 @@
 		<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
 	</properties>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -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>

api-gateway-service/src/main/java/com/assignment/apigatewayservice/ApiGatewayServiceApplication.java renamed to 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;

api-gateway-service/src/main/java/com/assignment/apigatewayservice/security/JwtAuthenticationEntryPoint.java renamed to 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;

api-gateway-service/src/main/java/com/assignment/apigatewayservice/security/JwtTokenAuthenticationFilter.java renamed to api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/JwtTokenAuthenticationFilter.java

@@ -1,6 +1,6 @@
-package com.assignment.apigatewayservice.security;
+package com.javatab.apigatewayservice.security;
 
-import com.assignment.commonservice.JwtConfig;
+import com.javatab.commonservice.JwtConfig;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

api-gateway-service/src/main/java/com/assignment/apigatewayservice/security/SecurityTokenConfig.java renamed to api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/SecurityTokenConfig.java

@@ -1,6 +1,6 @@
-package com.assignment.apigatewayservice.security;
+package com.javatab.apigatewayservice.security;
 
-import com.assignment.commonservice.JwtConfig;
+import com.javatab.commonservice.JwtConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;

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
-

api-gateway-service/src/test/java/com/assignment/apigatewayservice/ApiGatewayServiceApplicationTests.java renamed to 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;

auth-service/pom.xml

@@ -3,23 +3,25 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.assignment</groupId>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.5.4</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<groupId>com.javatab</groupId>
 	<artifactId>auth-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>auth-service</name>
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
 		<java.version>11</java.version>
-		<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
+		<spring-cloud.version>2020.0.3</spring-cloud.version>
 	</properties>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
+
 
 	<dependencies>
 		<dependency>
@@ -69,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>

auth-service/src/main/java/com/assignment/authservice/AuthServiceApplication.java renamed to 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;

auth-service/src/main/java/com/assignment/authservice/model/LoggedInUserDetails.java renamed to 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;