From 9b8d93e211142bf12140e14a9908a009471e66cf Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 8 Feb 2023 15:24:33 +0100 Subject: [PATCH] Add POC. --- .../openfeign/FeignClientFactoryBean.java | 5 ++- .../cloud/openfeign/PropertyBasedTarget.java | 38 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/PropertyBasedTarget.java diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java index 470676c0..b17408a8 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java @@ -505,7 +505,10 @@ public class FeignClientFactoryBean "Provide Feign client URL either in @FeignClient() or in config properties."); } - return new HardCodedTarget(type, name, FeignClientsRegistrar.getUrl(config.getUrl())); + // TODO: create the appropriate target + return new PropertyBasedTarget(type, name, config); + // return new HardCodedTarget(type, name, + // FeignClientsRegistrar.getUrl(config.getUrl())); } private boolean isUrlAvailableInConfig(String contextId) { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/PropertyBasedTarget.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/PropertyBasedTarget.java new file mode 100644 index 00000000..18ad8778 --- /dev/null +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/PropertyBasedTarget.java @@ -0,0 +1,38 @@ +/* + * Copyright 2013-2023 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.openfeign; + +import feign.Target; + +/** + * @author Olga Maciaszek-Sharma + */ +public class PropertyBasedTarget extends Target.HardCodedTarget { + + private final FeignClientProperties.FeignClientConfiguration config; + + public PropertyBasedTarget(Class type, String name, FeignClientProperties.FeignClientConfiguration config) { + super(type, name, config.getUrl()); + this.config = config; + } + + @Override + public String url() { + return config.getUrl(); + } + +}