Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Optionally remove Jersey dependencies from Eureka Client (#1850)
Fixes gh-1849
- Loading branch information
1 parent
fd78373
commit 348c96b
Showing
17 changed files
with
982 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
...springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2017 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 | ||
| * | ||
| * http://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.netflix.eureka.config; | ||
|
|
||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; | ||
| import org.springframework.boot.autoconfigure.condition.SearchStrategy; | ||
| import org.springframework.cloud.netflix.eureka.MutableDiscoveryClientOptionalArgs; | ||
| import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs; | ||
|
|
||
| /** | ||
| * @author Daniel Lavoie | ||
| */ | ||
| @Configuration | ||
| public class DiscoveryClientOptionalArgsConfiguration { | ||
| @Bean | ||
| @ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter") | ||
| @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT) | ||
| public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs() { | ||
| return new RestTemplateDiscoveryClientOptionalArgs(); | ||
| } | ||
|
|
||
| @Bean | ||
| @ConditionalOnClass(name = "com.sun.jersey.api.client.filter.ClientFilter") | ||
| @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT) | ||
| public MutableDiscoveryClientOptionalArgs discoveryClientOptionalArgs() { | ||
| return new MutableDiscoveryClientOptionalArgs(); | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
...lient/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaApplications.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright 2017 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 | ||
| * | ||
| * http://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.netflix.eureka.http; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.netflix.discovery.shared.Application; | ||
| import com.netflix.discovery.shared.Applications; | ||
|
|
||
| /** | ||
| * A simple wrapper class for {@link Applications} that insure proprer Jackson | ||
| * serialization through the JsonPropert overwrites. | ||
| * | ||
| * @author Daniel Lavoie | ||
| */ | ||
| public class EurekaApplications extends com.netflix.discovery.shared.Applications { | ||
|
|
||
| @JsonCreator | ||
| public EurekaApplications(@JsonProperty("apps__hashcode") String appsHashCode, | ||
| @JsonProperty("versions__delta") Long versionDelta, | ||
| @JsonProperty("application") List<Application> registeredApplications) { | ||
| super(appsHashCode, versionDelta, registeredApplications); | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
...rg/springframework/cloud/netflix/eureka/http/RestTemplateDiscoveryClientOptionalArgs.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright 2017 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 | ||
| * | ||
| * http://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.netflix.eureka.http; | ||
|
|
||
| import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs; | ||
|
|
||
| /** | ||
| * @author Daniel Lavoie | ||
| */ | ||
| public class RestTemplateDiscoveryClientOptionalArgs | ||
| extends AbstractDiscoveryClientOptionalArgs<Void> { | ||
| public RestTemplateDiscoveryClientOptionalArgs() { | ||
| setTransportClientFactories(new RestTemplateTransportClientFactories()); | ||
| } | ||
| } |
Oops, something went wrong.