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

Config for Helidon 2.0 #1102

Merged
merged 27 commits into from
Dec 5, 2019
Merged

Config for Helidon 2.0 #1102

merged 27 commits into from
Dec 5, 2019

Conversation

tomas-langer
Copy link
Member

Resolves #1101

Meta configuration now based on Java service loader

  • ConfigSourceProvider - creates an instance of a config source based on a type (name -such as file) and meta configuration
  • PollingStrategyProvider - creates an instance of a polling strategy function based on a type and meta configuration (the function gets the target type instance and provides a polling strategy, where target type may be Path and instance a specific file on a files system)
  • RetryPolicyProvider - creates an instance of a retry policy based on type and meta configuration

The MetaConfig class is responsible for locating meta configuration, creating config sources, retry policies and polling strategies from metaconfiguration

@tomas-langer tomas-langer added this to the 2.0.0 milestone Oct 16, 2019
@tomas-langer tomas-langer self-assigned this Oct 16, 2019
@tomas-langer tomas-langer changed the title Meta config update WIP: Meta config update Oct 16, 2019
@tomas-langer tomas-langer changed the title WIP: Meta config update Meta config update (DO NOT MERGE) Oct 17, 2019
Verdent
Verdent previously approved these changes Oct 23, 2019
View reviewed changes
@tomas-langer tomas-langer changed the title Meta config update (DO NOT MERGE) Config for Helidon 2.0 (DO NOT MERGE) Nov 15, 2019
@tomas-langer
Copy link
Member Author

Also resolves #1113
Added MP Config implementation in Helidon SE, as this required the changes in previous commit.
This branch now becomes a 2.0 configuration branch.

@tomas-langer
Meta configuration refactoring.
2cae002 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Using meta configuration in MicroProfile Server
44d8283 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Refactored config sources to use proper builder pattern.
087b507 
Checkstyle and copyright fixes.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Copyright fixes
0428d19 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Javadoc fix.
bc76ce4 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Reverted polling strategy api change.
85a3f4d 
Should be done as a separate change.
Fixed examples to work with new API

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
And copyright fix.
eb66538 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Native image substitution removed as no longer needed.
95b5d18 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Making shortcut method public to simplify use.
364201b 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Documentation update for Meta configuration.
61ac5f4 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Checkstyle fix.
962c436 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
MP config in SE - in progress
ebf90fd 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Review fixes.
12cd9a8 
Use constants for strings.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Checkstyle - constant should be private
b44ea54 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Order system properties and environment variables as in MP
9634a1b 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Priorities utility.
4605379 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
MP config in SE - in progress.
26ca26e 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
MP config in SE.
de4f906 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Checkstyle and copyright fixes
9e7d611 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Test fix - refactored sys props source.
ddca754 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Module info fixes.
4ac3cc3 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Copyright
f1fc326 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Tracing dependency fix.
990d5cd 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Fixed config for Arquillian extension
f675d94 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Fixed example that used obsolete API.
7e40889 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Copyright...
bc77c9e 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer
Rebased on master.
fdfb94d 
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
@tomas-langer tomas-langer changed the title Config for Helidon 2.0 (DO NOT MERGE) Config for Helidon 2.0 Nov 24, 2019
tjquinno
tjquinno reviewed Dec 3, 2019
View reviewed changes
Copy link
Member

@tjquinno tjquinno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Joe asked me to look at metrics-related changes in the PR. I found three such files (all metrics tests), and those changes LGTM.

ljnelson
ljnelson approved these changes Dec 4, 2019
View reviewed changes
Copy link
Member

@ljnelson ljnelson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left some comments but probably this should just go in so we can see how it goes in practice.

common/service-loader/src/main/java/io/helidon/common/serviceloader/Priorities.java Show resolved Hide resolved
config/config/src/main/java/io/helidon/config/AbstractConfigImpl.java Show resolved Hide resolved
config/config/src/main/java/io/helidon/config/AbstractConfigImpl.java Show resolved Hide resolved
config/config/src/main/java/io/helidon/config/BuilderImpl.java Show resolved Hide resolved
config/config/src/main/java/io/helidon/config/BuilderImpl.java Show resolved Hide resolved
config/config/src/main/java/io/helidon/config/internal/FileOverrideSource.java Show resolved Hide resolved
config/config/src/main/java/io/helidon/config/spi/AbstractMpSource.java Show resolved Hide resolved
config/config/src/main/java/io/helidon/config/spi/MetaConfigurableProvider.java Show resolved Hide resolved
config/config/src/test/java/io/helidon/config/MpConfigTest.java Show resolved Hide resolved
...object-mapping/src/main/java/io/helidon/config/objectmapping/ObjectConfigMapperProvider.java Show resolved Hide resolved
@tomas-langer tomas-langer merged commit 1893efc into helidon-io:master Dec 5, 2019
@tomas-langer tomas-langer deleted the meta-config-update branch December 5, 2019 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ljnelson ljnelson ljnelson approved these changes

@tjquinno tjquinno tjquinno left review comments

@Verdent Verdent Verdent approved these changes

@romain-grecourt romain-grecourt Awaiting requested review from romain-grecourt

Assignees

@tomas-langer tomas-langer

Labels
api-change config P1 SE
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.

Config meta configuration refactoring
4 participants
@tomas-langer @ljnelson @Verdent @tjquinno