JAVA-17818 Merge spring-cloud-modules/open-feign and spring-cloud-modules/open-feign-2 (#13530)

Co-authored-by: timis1 <noreplay@yahoo.com>

spring-cloud-modules/pom.xml

@@ -54,8 +54,7 @@
         <module>spring-cloud-bus</module>
         <module>spring-cloud-data-flow</module>
         <module>spring-cloud-sleuth</module>
-        <module>spring-cloud-openfeign-2</module>
+		<module>spring-cloud-open-telemetry</module>
-	<module>spring-cloud-open-telemetry</module>
     </modules>
 
     <build>

spring-cloud-modules/spring-cloud-openfeign-2/README.md

@@ -1,4 +0,0 @@
-
-### Relevant Articles:
-
-- [Feign Client Exception Handling](https://www.baeldung.com/java-feign-client-exception-handling)

spring-cloud-modules/spring-cloud-openfeign-2/pom.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.baeldung.cloud</groupId>
-    <artifactId>spring-cloud-openfeign-2</artifactId>
-    <name>spring-cloud-openfeign-2</name>
-    <description>OpenFeign project for Spring Boot</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
-    </parent>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-okhttp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form</artifactId>
-            <version>${feign-form.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <spring-cloud.version>2021.0.3</spring-cloud.version>
-        <feign-form.version>3.8.0</feign-form.version>
-    </properties>
-
-</project>

spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java

@@ -1,16 +0,0 @@
-package com.baeldung.cloud.openfeign;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-@SpringBootApplication
-@EnableFeignClients
-public class ExampleApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ExampleApplication.class, args);
-    }
-
-}
-

spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java

@@ -1,21 +0,0 @@
-package com.baeldung.cloud.openfeign.exception;
-
-public class BadRequestException extends Exception {
-
-    public BadRequestException() {
-    }
-
-    public BadRequestException(String message) {
-        super(message);
-    }
-
-    public BadRequestException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public String toString() {
-        return "BadRequestException: " + getMessage();
-    }
-
-}

spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java

@@ -1,18 +0,0 @@
-package com.baeldung.cloud.openfeign.exception;
-
-public class NotFoundException extends Exception {
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-    public NotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public String toString() {
-        return "NotFoundException: " + getMessage();
-    }
-
-}

spring-cloud-modules/spring-cloud-openfeign-2/src/main/resources/application.properties

@@ -1,10 +0,0 @@
-server.port=8085
-spring.main.allow-bean-definition-overriding=true
-spring.application.name= openfeign
-logging.level.com.baeldung.cloud.openfeign.client: DEBUG
-feign.hystrix.enabled=true
-
-spring.security.oauth2.client.registration.keycloak.authorization-grant-type=client_credentials
-spring.security.oauth2.client.registration.keycloak.client-id=payment-app
-spring.security.oauth2.client.registration.keycloak.client-secret=863e9de4-33d4-4471-b35e-f8d2434385bb
-spring.security.oauth2.client.provider.keycloak.token-uri=http://localhost:8083/auth/realms/master/protocol/openid-connect/token

spring-cloud-modules/spring-cloud-openfeign-2/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java

@@ -1,16 +0,0 @@
-package com.baeldung.cloud.openfeign;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ExampleApplication.class)
-public class SpringContextTest {
-    
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}

spring-cloud-modules/spring-cloud-openfeign/README.md

@@ -4,3 +4,4 @@
 - [Differences Between Netflix Feign and OpenFeign](https://www.baeldung.com/netflix-feign-vs-openfeign)
 - [Provide an OAuth2 Token to a Feign Client](https://www.baeldung.com/spring-cloud-feign-oauth-token)
 - [Propagating Exceptions With OpenFeign and Spring](https://www.baeldung.com/spring-openfeign-propagate-exception)
+- [Feign Client Exception Handling](https://www.baeldung.com/java-feign-client-exception-handling)