Repository navigation
Make lease allocation strategy pluggable #65
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
...om/yashdotdev/distributed_traffic_control/allocation/AllocationStrategyConfiguration.java
This file contains hidden or 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,18 @@ | ||
| package com.yashdotdev.distributed_traffic_control.allocation; | ||
|
|
||
| import org.springframework.boot.autoconfigure.AutoConfiguration; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| import org.springframework.boot.context.properties.EnableConfigurationProperties; | ||
| import org.springframework.context.annotation.Bean; | ||
|
|
||
| @AutoConfiguration | ||
| @EnableConfigurationProperties(AllocationProperties.class) | ||
| public class AllocationStrategyConfiguration { | ||
|
|
||
| @Bean | ||
| @ConditionalOnMissingBean(AllocationStrategy.class) | ||
| public AllocationStrategy allocationStrategy( | ||
| AllocationProperties allocationProperties) { | ||
| return new FixedAllocationStrategy(allocationProperties); | ||
| } | ||
| } | ||
This file contains hidden or 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
57 changes: 57 additions & 0 deletions
57
...ashdotdev/distributed_traffic_control/allocation/AllocationStrategyConfigurationTest.java
This file contains hidden or 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,57 @@ | ||
| package com.yashdotdev.distributed_traffic_control.allocation; | ||
|
|
||
| import com.yashdotdev.distributed_traffic_control.policy.TrafficPolicy; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.boot.test.context.runner.ApplicationContextRunner; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class AllocationStrategyConfigurationTest { | ||
|
|
||
| private final ApplicationContextRunner contextRunner = | ||
| new ApplicationContextRunner() | ||
| .withConfiguration( | ||
| org.springframework.boot.autoconfigure.AutoConfigurations.of( | ||
| AllocationStrategyConfiguration.class)); | ||
|
|
||
| @Test | ||
| void shouldRegisterFixedAllocationStrategyByDefault() { | ||
| contextRunner.run(context -> { | ||
| assertThat(context).hasNotFailed(); | ||
| assertThat(context).hasSingleBean(AllocationStrategy.class); | ||
| assertThat(context.getBean(AllocationStrategy.class)) | ||
| .isInstanceOf(FixedAllocationStrategy.class); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldUseCustomAllocationStrategyWhenProvided() { | ||
| contextRunner | ||
| .withUserConfiguration(CustomStrategyConfiguration.class) | ||
| .run(context -> { | ||
| assertThat(context).hasNotFailed(); | ||
| assertThat(context).hasSingleBean(AllocationStrategy.class); | ||
| assertThat(context.getBean(AllocationStrategy.class)) | ||
| .isInstanceOf(CustomAllocationStrategy.class); | ||
| }); | ||
| } | ||
|
|
||
| @Configuration(proxyBeanMethods = false) | ||
| static class CustomStrategyConfiguration { | ||
|
|
||
| @Bean | ||
| AllocationStrategy customAllocationStrategy() { | ||
| return new CustomAllocationStrategy(); | ||
| } | ||
| } | ||
|
|
||
| static class CustomAllocationStrategy implements AllocationStrategy { | ||
|
|
||
| @Override | ||
| public long determineCapacity(TrafficPolicy policy) { | ||
| return 1; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If a consumer declares its custom strategy in a separate
@Configurationclass that is processed after this imported configuration,@ConditionalOnMissingBeancan register the default first, leaving twoAllocationStrategybeans and making injection intocapacityAllocatorambiguous.TrafficControlConfigurationimports this class directly rather than loading it through Boot’s auto-configuration ordering; the new test usesAutoConfigurations.of(...)and does not cover that import path. Ensure user bean definitions are considered before registering the default.Useful? React with 👍 / 👎.