Skip to content

Commit 6530df8

Browse files
committed
Merge branch 'main' of github.com:microsphere-projects/microsphere-spring-cloud
2 parents 315be2d + 9b3a697 commit 6530df8

146 files changed

Lines changed: 146 additions & 146 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/condition/ConditionalOnFeaturesEnabled.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@
4848
@Documented
4949
@ConditionalOnProperty(name = FEATURES_ENABLED_PROPERTY_NAME, matchIfMissing = true)
5050
public @interface ConditionalOnFeaturesEnabled {
51-
}
51+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/ReactiveDiscoveryClientAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ static <T> List<T> toList(Flux<T> flux) {
142142
}
143143
return mono.block();
144144
}
145-
}
145+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/UnionDiscoveryClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,4 @@ public void destroy() throws Exception {
217217
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
218218
this.context = applicationContext;
219219
}
220-
}
220+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/autoconfigure/DiscoveryClientAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ public UnionDiscoveryClient unionDiscoveryClient() {
9797
return new UnionDiscoveryClient();
9898
}
9999
}
100-
}
100+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/autoconfigure/ReactiveDiscoveryClientAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ public ReactiveDiscoveryClientAdapter reactiveDiscoveryClientAdapter(ReactiveDis
8181
return new ReactiveDiscoveryClientAdapter(reactiveDiscoveryClient);
8282
}
8383
}
84-
}
84+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/constants/DiscoveryClientConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ public interface DiscoveryClientConstants {
7272
* @see org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration
7373
*/
7474
String REACTIVE_COMPOSITE_DISCOVERY_CLIENT_AUTO_CONFIGURATION_CLASS_NAME = "org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration";
75-
}
75+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/util/DiscoveryUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ public static SimpleDiscoveryProperties simpleDiscoveryProperties(@Nonnull Simpl
103103

104104
private DiscoveryUtils() {
105105
}
106-
}
106+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/event/ServiceInstancesChangedEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ public boolean isProcessed() {
8686
return processed;
8787
}
8888

89-
}
89+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/DefaultRegistration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
* @since 1.0.0
2828
*/
2929
public class DefaultRegistration extends DefaultServiceInstance implements Registration {
30-
}
30+
}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/InMemoryServiceRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,4 @@ protected Map<String, String> getMetadata(Registration registration) {
156156
}
157157
return null;
158158
}
159-
}
159+
}

0 commit comments

Comments
 (0)