Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#327] Default local ServiceInstance to a fixed URI i.o. null #330

Merged
merged 5 commits into from
Oct 26, 2023
Merged

[#327] Default local ServiceInstance to a fixed URI i.o. null #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c6aba0
Adjust test to not update the local capabilities
smcvb Oct 26, 2023
7e9ae3e
Default the ServiceInstance to a fixed URI version i.o. null
smcvb Oct 26, 2023
f181a05
Drop test prefix from tests, as that's the new style
smcvb Oct 26, 2023
2d70174
Add descriptive JavaDoc to the NoopUriServiceInstance
smcvb Oct 26, 2023
fcbf525
Rename the nop service instance to FixedURIServiceInstance
smcvb Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion ...ramework/extensions/springcloud/commandhandling/mode/AbstractCapabilityDiscoveryMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@

import org.axonframework.commandhandling.distributed.CommandMessageFilter;
import org.axonframework.common.AxonConfigurationException;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;

import java.net.URI;
import java.util.concurrent.atomic.AtomicReference;

/**
Expand All @@ -42,7 +44,7 @@ public abstract class AbstractCapabilityDiscoveryMode<B extends CapabilityDiscov
*/
protected AbstractCapabilityDiscoveryMode(Builder<B> builder) {
builder.validate();
localInstance = new AtomicReference<>();
localInstance = new AtomicReference<>(FixedURIServiceInstance.INSTANCE);
localCapabilities = new AtomicReference<>(DefaultMemberCapabilities.INCAPABLE_MEMBER);
}

Expand Down Expand Up @@ -76,4 +78,23 @@ protected abstract static class Builder<B extends CapabilityDiscoveryMode> {
*/
protected abstract void validate();
}

/**
* This no-op version of the {@link DefaultServiceInstance} enforces the {@link ServiceInstance#getUri()} to a fixed
* empty {@link URI}. Through this, there's always a {@code ServiceInstance} present that will never match others.
* <p>
* This no-op version is the default local {@code ServiceInstance}, ensuring that when
* {@link #updateLocalCapabilities(ServiceInstance, int, CommandMessageFilter)} is never invoked (when an instance
* has zero command handlers) it will still play nicely in the discovery mechanism.
*/
private static class FixedURIServiceInstance extends DefaultServiceInstance {

private static final ServiceInstance INSTANCE = new FixedURIServiceInstance();
private static final URI FIXED_URI = URI.create("");

@Override
public URI getUri() {
return FIXED_URI;
}
}
}
15 changes: 7 additions & 8 deletions ...ramework/extensions/springcloud/commandhandling/mode/RestCapabilityDiscoveryModeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void setUp() {
}

@Test
void testGetLocalMemberCapabilitiesReturnsIncapableMemberIfLocalCapabilitiesIsNeverUpdated() {
void getLocalMemberCapabilitiesReturnsIncapableMemberIfLocalCapabilitiesIsNeverUpdated() {
SerializedMemberCapabilities result = ((RestCapabilityDiscoveryMode) testSubject).getLocalMemberCapabilities();

DefaultMemberCapabilities deserializableResult =
Expand All @@ -76,7 +76,7 @@ void testGetLocalMemberCapabilitiesReturnsIncapableMemberIfLocalCapabilitiesIsNe
}

@Test
void testGetLocalMemberCapabilitiesReturnsUpdatedLocalCapabilities() {
void getLocalMemberCapabilitiesReturnsUpdatedLocalCapabilities() {
testSubject.updateLocalCapabilities(localInstance, LOAD_FACTOR, COMMAND_MESSAGE_FILTER);

SerializedMemberCapabilities result = ((RestCapabilityDiscoveryMode) testSubject).getLocalMemberCapabilities();
Expand All @@ -88,7 +88,7 @@ void testGetLocalMemberCapabilitiesReturnsUpdatedLocalCapabilities() {
}

@Test
void testCapabilitiesReturnsLocalCapabilitiesIfLocalServiceInstanceIsUsed() {
void capabilitiesReturnsLocalCapabilitiesIfLocalServiceInstanceIsUsed() {
testSubject.updateLocalCapabilities(localInstance, LOAD_FACTOR, COMMAND_MESSAGE_FILTER);

Optional<MemberCapabilities> resultCapabilities = testSubject.capabilities(localInstance);
Expand All @@ -101,7 +101,7 @@ void testCapabilitiesReturnsLocalCapabilitiesIfLocalServiceInstanceIsUsed() {
}

@Test
void testCapabilitiesReturnsLocalCapabilitiesIfServiceInstanceUriMatches() {
void capabilitiesReturnsLocalCapabilitiesIfServiceInstanceUriMatches() {
URI testURI = URI.create("http://remote");
when(localInstance.getUri()).thenReturn(testURI);

Expand All @@ -120,9 +120,8 @@ void testCapabilitiesReturnsLocalCapabilitiesIfServiceInstanceUriMatches() {
}

@Test
void testCapabilitiesGetsCapabilitiesThroughRestTemplate() {
void capabilitiesGetsCapabilitiesThroughRestTemplate() {
MemberCapabilities expectedCapabilities = new DefaultMemberCapabilities(LOAD_FACTOR, COMMAND_MESSAGE_FILTER);
testSubject.updateLocalCapabilities(localInstance, LOAD_FACTOR, COMMAND_MESSAGE_FILTER);

URI testURI = URI.create("http://remote");
ServiceInstance testServiceInstance = mock(ServiceInstance.class);
Expand Down Expand Up @@ -158,7 +157,7 @@ void testCapabilitiesGetsCapabilitiesThroughRestTemplate() {
}

@Test
void testCapabilitiesRethrowsHttpClientErrorExceptionAsServiceInstanceClientException() {
void capabilitiesRethrowsHttpClientErrorExceptionAsServiceInstanceClientException() {
testSubject.updateLocalCapabilities(localInstance, LOAD_FACTOR, COMMAND_MESSAGE_FILTER);

when(restTemplate.exchange(
Expand All @@ -182,7 +181,7 @@ void testCapabilitiesRethrowsHttpClientErrorExceptionAsServiceInstanceClientExce
}

@Test
void testCapabilitiesReturnsIncapableMemberWhenNonHttpClientErrorExceptionIsThrown() {
void capabilitiesReturnsIncapableMemberWhenNonHttpClientErrorExceptionIsThrown() {
testSubject.updateLocalCapabilities(localInstance, LOAD_FACTOR, COMMAND_MESSAGE_FILTER);

when(restTemplate.exchange(
Expand Down
Loading