diff --git a/README.adoc b/README.adoc index 2415fe0..c31d8a1 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +// Copyright (c) 2016-2019 Contributors to the Eclipse Foundation // // See the NOTICE file(s) distributed with this work for additional // information regarding copyright ownership. diff --git a/api/src/main/java/javax/config/inject/ConfigProperty.java b/api/src/main/java/javax/config/inject/ConfigProperty.java index c97a02a..41e8101 100644 --- a/api/src/main/java/javax/config/inject/ConfigProperty.java +++ b/api/src/main/java/javax/config/inject/ConfigProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/api/src/main/java/javax/config/inject/package-info.java b/api/src/main/java/javax/config/inject/package-info.java index a349044..bbeb242 100644 --- a/api/src/main/java/javax/config/inject/package-info.java +++ b/api/src/main/java/javax/config/inject/package-info.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/api/src/main/java/javax/config/package-info.java b/api/src/main/java/javax/config/package-info.java index cdab713..b1e7c7f 100644 --- a/api/src/main/java/javax/config/package-info.java +++ b/api/src/main/java/javax/config/package-info.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/api/src/main/java/javax/config/spi/ConfigBuilder.java b/api/src/main/java/javax/config/spi/ConfigBuilder.java index 8a9df5b..735e887 100644 --- a/api/src/main/java/javax/config/spi/ConfigBuilder.java +++ b/api/src/main/java/javax/config/spi/ConfigBuilder.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/api/src/main/java/javax/config/spi/ConfigProviderResolver.java b/api/src/main/java/javax/config/spi/ConfigProviderResolver.java index 3fe73d5..a6e8d18 100644 --- a/api/src/main/java/javax/config/spi/ConfigProviderResolver.java +++ b/api/src/main/java/javax/config/spi/ConfigProviderResolver.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/api/src/main/java/javax/config/spi/package-info.java b/api/src/main/java/javax/config/spi/package-info.java index a2c18de..32de65b 100644 --- a/api/src/main/java/javax/config/spi/package-info.java +++ b/api/src/main/java/javax/config/spi/package-info.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/site.yaml b/site.yaml index e63048c..f5c692c 100644 --- a/site.yaml +++ b/site.yaml @@ -1,5 +1,5 @@ ####################################################################### -## Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +## Copyright (c) 2016-2019 Contributors to the Eclipse Foundation ## ## See the NOTICE file(s) distributed with this work for additional ## information regarding copyright ownership. diff --git a/spec/src/main/asciidoc/architecture.asciidoc b/spec/src/main/asciidoc/architecture.asciidoc index 4059a4a..eedc9a3 100644 --- a/spec/src/main/asciidoc/architecture.asciidoc +++ b/spec/src/main/asciidoc/architecture.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Eclipse ConfigJSR Contributors: +// Copyright (c) 2016-2019 Eclipse ConfigJSR Contributors: // Mark Struberg // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/src/main/asciidoc/configaccessor.asciidoc b/spec/src/main/asciidoc/configaccessor.asciidoc index 1ed4b81..1767d4f 100644 --- a/spec/src/main/asciidoc/configaccessor.asciidoc +++ b/spec/src/main/asciidoc/configaccessor.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +// Copyright (c) 2016-2019 Contributors to the Eclipse Foundation // // See the NOTICE file(s) distributed with this work for additional // information regarding copyright ownership. @@ -32,17 +32,15 @@ This can also be handled via `ConfigAccessor` as shown in the following example: .Simple example of ConfigAccessor [source,java] ----------------------------------------------------------------- -String userName = config.access("user.name").getValue(); +String userName = config.access("user.name", String.class).build().getValue(); ----------------------------------------------------------------- Additional to this the `ConfigAccessor` also allows for far more complex control over the access to configured values. -The call to `config.access(..)` returns a `ConfigAccessor`. +The call to `config.access(..)` returns a `ConfigAccessor.Builder`. This is basically a builder which has methods to refine the resolution, including the following: -* `as(Class clazz)` -- defines the return type of the property -* `asList()` -- Declare the ConfigAccessor to return a List of the given Type. -* `evaluateVariables(boolean evaluateVariables)` +* `evaluateVariables(boolean evaluateVariables)` -- Allows variable parts in configured values. * `useConverter(Converter converter)` -- Defines a specific {@link Converter} to be used instead of applying the default Converter resolving logic. * `addLookupSuffix(String postfixName)` -- sets a parameter for the resolution of a 'postfix' for the resolution * `addLookupSuffix(ConfigAccessor)` -- you can also use a `ConfigAccessor` to determine the 'postfix' for the resolution @@ -55,11 +53,12 @@ This is basically a builder which has methods to refine the resolution, includin Config config = ConfigProvider.getConfig(); ConfigAccessor dbPortCfg - = config.access("db.port") - .as(Integer.class) - .withProjectStage(true) - .withLookupChain("ยง{database.vendor}") - .withDefault(3306); + = config.access("db.port", Integer.class) + .addLookupSuffix(config.access("project.projectStage") + .cacheFor(Duration.ofHours(12L)) + .addLookupSuffix("database.vendor") + .withDefault(3306) + .build(); ... Integer port = dbPortCfg.getValue(); ----------------------------------------------------------------- diff --git a/spec/src/main/asciidoc/configexamples.asciidoc b/spec/src/main/asciidoc/configexamples.asciidoc index ef9c91f..27cfe7f 100644 --- a/spec/src/main/asciidoc/configexamples.asciidoc +++ b/spec/src/main/asciidoc/configexamples.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +// Copyright (c) 2016-2019 Contributors to the Eclipse Foundation // // See the NOTICE file(s) distributed with this work for additional // information regarding copyright ownership. @@ -54,6 +54,14 @@ $> java -Dacme.myprj.some.url=http://other.server/other/endpoint -jar some.jar Note that this is only one example how to possibly configure your application. Another example is to register <> to e.g. pick up values from a database table, etc. +If a config value is a comma(`,`) separated string, this value can be automatically converted to a multiple element array with `\` as the escape character. +When specifying the property `myPets=dog,cat,dog\\,cat` in a config source, the following code snippet can be used to obtain an array. +---- + String[] myPets = config.getValue("myPets", String[].class); + //myPets = {"dog", "cat", "dog,cat"} +---- + + === Simple Dependency Injection Example JavaConfig also provides ways to inject configured values into your beans using the `@Inject` and the `@ConfigProperty` qualifier. @@ -87,6 +95,11 @@ public class InjectedConfigUsageSample { @Inject @ConfigProperty(name="myprj.some.dynamic.timeout", defaultValue="100") private javax.inject.Provider timeout; + //The following code injects an Array, List or Set for the `myPets` property, + //where its value is a comma separated value ( myPets=dog,cat,dog\\,cat) + @Inject @ConfigProperty(name="myPets") private String[] myArrayPets; + @Inject @ConfigProperty(name="myPets") private List myListPets; + @Inject @ConfigProperty(name="myPets") private Set mySetPets; } ---- diff --git a/spec/src/main/asciidoc/configprovider.asciidoc b/spec/src/main/asciidoc/configprovider.asciidoc index a07f947..c4feb05 100644 --- a/spec/src/main/asciidoc/configprovider.asciidoc +++ b/spec/src/main/asciidoc/configprovider.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +// Copyright (c) 2016-2019 Contributors to the Eclipse Foundation // // See the NOTICE file(s) distributed with this work for additional // information regarding copyright ownership. diff --git a/spec/src/main/asciidoc/configsources.asciidoc b/spec/src/main/asciidoc/configsources.asciidoc index b16d83c..67142eb 100644 --- a/spec/src/main/asciidoc/configsources.asciidoc +++ b/spec/src/main/asciidoc/configsources.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +// Copyright (c) 2016-2019 Contributors to the Eclipse Foundation // // See the NOTICE file(s) distributed with this work for additional // information regarding copyright ownership. diff --git a/spec/src/main/asciidoc/converters.asciidoc b/spec/src/main/asciidoc/converters.asciidoc index fbe0a83..510626f 100644 --- a/spec/src/main/asciidoc/converters.asciidoc +++ b/spec/src/main/asciidoc/converters.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +// Copyright (c) 2016-2019 Contributors to the Eclipse Foundation // // See the NOTICE file(s) distributed with this work for additional // information regarding copyright ownership. @@ -36,7 +36,7 @@ The following `Converter` s are provided by JavaConfig by default: * `long` and `Long` * `float` and `Float` , a dot '.' is used to separate the fractional digits * `double` and `Double` , a dot '.' is used to separate the fractional digits -* `URL` +* `URL` as defined by `java.net.URL#URL(java.lang.String)` All built-in `Converter` have the `@Priority` of `1`. @@ -52,6 +52,9 @@ The `Config` will use the `Converter` with the highest `Priority` for each targe A custom `Converter` for a target type of any of the built-in Converters will overwrite the default Converter. +Converters can be added to the `ConfigBuilder` programmatically via `ConfigBuilder#withConverters(Converter... converters)` +where the type of the converters can be obtained via reflection. However, this is not possible for a lambda converter. +In this case, use the method `ConfigBuilder#withConverter(Class type, int priority, Converter converter)`. === Implicit Converters @@ -84,7 +87,8 @@ Array as a class type is supported in the programmatic lookup. [source, java] ---- -String[] myPets = ConfigProvider.getConfig().getValue("myPet", String[].class); +Config = ConfigProvider.getConfig(); +String[] myPets = config.getValue("myPets", String[].class); ---- myPets will be "dog", "cat", "dog,cat" as an array diff --git a/spec/src/main/asciidoc/javaconfig-spec.asciidoc b/spec/src/main/asciidoc/javaconfig-spec.asciidoc index d58993a..a6a6925 100644 --- a/spec/src/main/asciidoc/javaconfig-spec.asciidoc +++ b/spec/src/main/asciidoc/javaconfig-spec.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Eclipse ConfigJSR Contributors: +// Copyright (c) 2016-2019 Eclipse ConfigJSR Contributors: // Mark Struberg // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,10 +16,10 @@ // = Configuration API for Java, v1.0 -:authors: Mark Struberg, Emily Jiang, John D. Ament +:authors: Mark Struberg, Emily Jiang, John D. Ament, et al :email: struberg@apache.org, emijiang@uk.ibm.com, john.d.ament@gmail.com :revnumber: 1.0-Draft -:revdate: 2018-07-05 +:revdate: 2019-03-13 :revremark: Draft :version-label!: :sectanchors: diff --git a/spec/src/main/asciidoc/license-alv2.asciidoc b/spec/src/main/asciidoc/license-alv2.asciidoc index 7f6f7b6..fa9a14f 100644 --- a/spec/src/main/asciidoc/license-alv2.asciidoc +++ b/spec/src/main/asciidoc/license-alv2.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Eclipse ConfigJSR Contributors: +// Copyright (c) 2016-2019 Eclipse ConfigJSR Contributors: // Mark Struberg // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,7 +26,7 @@ Status: {revremark} Release: {revdate} -Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +Copyright (c) 2016-2019 Contributors to the Eclipse Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tck/running_the_tck.asciidoc b/tck/running_the_tck.asciidoc index d9a7196..68754ba 100644 --- a/tck/running_the_tck.asciidoc +++ b/tck/running_the_tck.asciidoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +// Copyright (c) 2016-2019 Contributors to the Eclipse Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/tck/src/main/java/org/eclipse/configjsr/ArrayConverterTest.java b/tck/src/main/java/org/eclipse/configjsr/ArrayConverterTest.java index 1dcc52e..0c0f967 100644 --- a/tck/src/main/java/org/eclipse/configjsr/ArrayConverterTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/ArrayConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/AutoDiscoveredConfigSourceTest.java b/tck/src/main/java/org/eclipse/configjsr/AutoDiscoveredConfigSourceTest.java index 6d55555..be2fc24 100644 --- a/tck/src/main/java/org/eclipse/configjsr/AutoDiscoveredConfigSourceTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/AutoDiscoveredConfigSourceTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/CDIPlainInjectionTest.java b/tck/src/main/java/org/eclipse/configjsr/CDIPlainInjectionTest.java index cd70429..4aed84d 100644 --- a/tck/src/main/java/org/eclipse/configjsr/CDIPlainInjectionTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/CDIPlainInjectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/CDIPropertyNameMatchingTest.java b/tck/src/main/java/org/eclipse/configjsr/CDIPropertyNameMatchingTest.java index b7dc5eb..83555f5 100644 --- a/tck/src/main/java/org/eclipse/configjsr/CDIPropertyNameMatchingTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/CDIPropertyNameMatchingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/CdiOptionalInjectionTest.java b/tck/src/main/java/org/eclipse/configjsr/CdiOptionalInjectionTest.java index 24848f3..afb3f57 100644 --- a/tck/src/main/java/org/eclipse/configjsr/CdiOptionalInjectionTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/CdiOptionalInjectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/ConfigAccessorTest.java b/tck/src/main/java/org/eclipse/configjsr/ConfigAccessorTest.java index 3c0a3e9..38a433a 100644 --- a/tck/src/main/java/org/eclipse/configjsr/ConfigAccessorTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/ConfigAccessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/ConfigProviderTest.java b/tck/src/main/java/org/eclipse/configjsr/ConfigProviderTest.java index c6d59a7..9ee35ce 100644 --- a/tck/src/main/java/org/eclipse/configjsr/ConfigProviderTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/ConfigProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/ConverterTest.java b/tck/src/main/java/org/eclipse/configjsr/ConverterTest.java index c02eda1..6186555 100644 --- a/tck/src/main/java/org/eclipse/configjsr/ConverterTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/ConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/CustomConfigSourceTest.java b/tck/src/main/java/org/eclipse/configjsr/CustomConfigSourceTest.java index 39b5f82..4aa0387 100644 --- a/tck/src/main/java/org/eclipse/configjsr/CustomConfigSourceTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/CustomConfigSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/DynamicConfigSourceTest.java b/tck/src/main/java/org/eclipse/configjsr/DynamicConfigSourceTest.java index 16fb577..2f705b5 100644 --- a/tck/src/main/java/org/eclipse/configjsr/DynamicConfigSourceTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/DynamicConfigSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/EmptyValuesBean.java b/tck/src/main/java/org/eclipse/configjsr/EmptyValuesBean.java index 7788b12..161b07b 100644 --- a/tck/src/main/java/org/eclipse/configjsr/EmptyValuesBean.java +++ b/tck/src/main/java/org/eclipse/configjsr/EmptyValuesBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/EmptyValuesTest.java b/tck/src/main/java/org/eclipse/configjsr/EmptyValuesTest.java index 22415e5..757dc57 100644 --- a/tck/src/main/java/org/eclipse/configjsr/EmptyValuesTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/EmptyValuesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/ImplicitConverterTest.java b/tck/src/main/java/org/eclipse/configjsr/ImplicitConverterTest.java index 42d4d0f..4c15c91 100644 --- a/tck/src/main/java/org/eclipse/configjsr/ImplicitConverterTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/ImplicitConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/OptionalValuesBean.java b/tck/src/main/java/org/eclipse/configjsr/OptionalValuesBean.java index 4a2ea75..23b159e 100644 --- a/tck/src/main/java/org/eclipse/configjsr/OptionalValuesBean.java +++ b/tck/src/main/java/org/eclipse/configjsr/OptionalValuesBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/base/AbstractTest.java b/tck/src/main/java/org/eclipse/configjsr/base/AbstractTest.java index 6d73d1d..5c2f3fb 100644 --- a/tck/src/main/java/org/eclipse/configjsr/base/AbstractTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/base/AbstractTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/broken/ConfigOwner.java b/tck/src/main/java/org/eclipse/configjsr/broken/ConfigOwner.java index a217866..2884108 100644 --- a/tck/src/main/java/org/eclipse/configjsr/broken/ConfigOwner.java +++ b/tck/src/main/java/org/eclipse/configjsr/broken/ConfigOwner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/broken/CustomConverterBean.java b/tck/src/main/java/org/eclipse/configjsr/broken/CustomConverterBean.java index 71a35af..3375a85 100644 --- a/tck/src/main/java/org/eclipse/configjsr/broken/CustomConverterBean.java +++ b/tck/src/main/java/org/eclipse/configjsr/broken/CustomConverterBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/broken/MissingConverterOnInstanceInjectionTest.java b/tck/src/main/java/org/eclipse/configjsr/broken/MissingConverterOnInstanceInjectionTest.java index eb37ba4..be386e4 100644 --- a/tck/src/main/java/org/eclipse/configjsr/broken/MissingConverterOnInstanceInjectionTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/broken/MissingConverterOnInstanceInjectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/broken/MissingValueOnInstanceInjectionTest.java b/tck/src/main/java/org/eclipse/configjsr/broken/MissingValueOnInstanceInjectionTest.java index 808244a..a1bab2d 100644 --- a/tck/src/main/java/org/eclipse/configjsr/broken/MissingValueOnInstanceInjectionTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/broken/MissingValueOnInstanceInjectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/broken/WrongConverterOnInstanceInjectionTest.java b/tck/src/main/java/org/eclipse/configjsr/broken/WrongConverterOnInstanceInjectionTest.java index 09a4c73..df92068 100644 --- a/tck/src/main/java/org/eclipse/configjsr/broken/WrongConverterOnInstanceInjectionTest.java +++ b/tck/src/main/java/org/eclipse/configjsr/broken/WrongConverterOnInstanceInjectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/configsources/ConfigurableConfigSource.java b/tck/src/main/java/org/eclipse/configjsr/configsources/ConfigurableConfigSource.java index d02922b..7e39302 100644 --- a/tck/src/main/java/org/eclipse/configjsr/configsources/ConfigurableConfigSource.java +++ b/tck/src/main/java/org/eclipse/configjsr/configsources/ConfigurableConfigSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/configsources/CustomConfigSourceProvider.java b/tck/src/main/java/org/eclipse/configjsr/configsources/CustomConfigSourceProvider.java index f76ae55..e5261c2 100644 --- a/tck/src/main/java/org/eclipse/configjsr/configsources/CustomConfigSourceProvider.java +++ b/tck/src/main/java/org/eclipse/configjsr/configsources/CustomConfigSourceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/configsources/CustomDbConfigSource.java b/tck/src/main/java/org/eclipse/configjsr/configsources/CustomDbConfigSource.java index 86159be..94e1c5d 100644 --- a/tck/src/main/java/org/eclipse/configjsr/configsources/CustomDbConfigSource.java +++ b/tck/src/main/java/org/eclipse/configjsr/configsources/CustomDbConfigSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/configsources/SampleYamlConfigSource.java b/tck/src/main/java/org/eclipse/configjsr/configsources/SampleYamlConfigSource.java index 1b2fa60..6f1bf29 100644 --- a/tck/src/main/java/org/eclipse/configjsr/configsources/SampleYamlConfigSource.java +++ b/tck/src/main/java/org/eclipse/configjsr/configsources/SampleYamlConfigSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/Donald.java b/tck/src/main/java/org/eclipse/configjsr/converters/Donald.java index 034a042..de69c20 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/Donald.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/Donald.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/Duck.java b/tck/src/main/java/org/eclipse/configjsr/converters/Duck.java index 268c448..1729c8d 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/Duck.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/Duck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/DuckConverter.java b/tck/src/main/java/org/eclipse/configjsr/converters/DuckConverter.java index beeb577..c84a793 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/DuckConverter.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/DuckConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/Pizza.java b/tck/src/main/java/org/eclipse/configjsr/converters/Pizza.java index dd0ebf6..6e64d11 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/Pizza.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/Pizza.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/PizzaConverter.java b/tck/src/main/java/org/eclipse/configjsr/converters/PizzaConverter.java index 14a4216..11f92f9 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/PizzaConverter.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/PizzaConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/SomeEnumToConvert.java b/tck/src/main/java/org/eclipse/configjsr/converters/SomeEnumToConvert.java index 10e5c3a..89f1ea0 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/SomeEnumToConvert.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/SomeEnumToConvert.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/UpperCaseDuckConverter.java b/tck/src/main/java/org/eclipse/configjsr/converters/UpperCaseDuckConverter.java index 17d6a6b..40fa182 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/UpperCaseDuckConverter.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/UpperCaseDuckConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceCt.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceCt.java index 62a32b7..2f1157a 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceCt.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceCt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceOf.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceOf.java index d510525..7eb902d 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceOf.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceOf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceParse.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceParse.java index 6dfde40..93fee34 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceParse.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceParse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceValueOf.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceValueOf.java index 80b3d36..e5f1d0d 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceValueOf.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWCharSequenceValueOf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringCt.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringCt.java index e6a1b4c..217b342 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringCt.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringCt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringOf.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringOf.java index bf6ca19..321bf99 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringOf.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringOf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringParse.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringParse.java index e506d3a..5e8b825 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringParse.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringParse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringValueOf.java b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringValueOf.java index e4bfea6..c6ffc58 100644 --- a/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringValueOf.java +++ b/tck/src/main/java/org/eclipse/configjsr/converters/implicit/ConvTestTypeWStringValueOf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/configjsr/matchers/AdditionalMatchers.java b/tck/src/main/java/org/eclipse/configjsr/matchers/AdditionalMatchers.java index 820cd01..2912843 100644 --- a/tck/src/main/java/org/eclipse/configjsr/matchers/AdditionalMatchers.java +++ b/tck/src/main/java/org/eclipse/configjsr/matchers/AdditionalMatchers.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation + * Copyright (c) 2016-2019 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/resources/internal/META-INF/javaconfig.properties b/tck/src/main/resources/internal/META-INF/javaconfig.properties index cc9a924..d8f5848 100644 --- a/tck/src/main/resources/internal/META-INF/javaconfig.properties +++ b/tck/src/main/resources/internal/META-INF/javaconfig.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +# Copyright (c) 2016-2019 Contributors to the Eclipse Foundation # # See the NOTICES file(s) distributed with this work for additional # information regarding copyright ownership. @@ -137,4 +137,4 @@ tck.config.test.javaconfig.converter.urlvalues=http://microprofile.io,http://ope # variable replacement rests tck.config.variable.baseHost = some.host.name tck.config.variable.firstEndpoint = http://${tck.config.variable.baseHost}/endpointOne -tck.config.variable.secondEndpoint = http://${tck.config.variable.baseHost}/endpointTwo \ No newline at end of file +tck.config.variable.secondEndpoint = http://${tck.config.variable.baseHost}/endpointTwo diff --git a/tck/src/main/resources/internal/META-INF/services/javax.config.spi.ConfigSource b/tck/src/main/resources/internal/META-INF/services/javax.config.spi.ConfigSource index 0c87568..1b9a323 100644 --- a/tck/src/main/resources/internal/META-INF/services/javax.config.spi.ConfigSource +++ b/tck/src/main/resources/internal/META-INF/services/javax.config.spi.ConfigSource @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +# Copyright (c) 2016-2019 Contributors to the Eclipse Foundation # # See the NOTICES file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/tck/src/main/resources/internal/sampleconfig.yaml b/tck/src/main/resources/internal/sampleconfig.yaml index e92b1e2..c6ba36f 100644 --- a/tck/src/main/resources/internal/sampleconfig.yaml +++ b/tck/src/main/resources/internal/sampleconfig.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2018 Contributors to the Eclipse Foundation +# Copyright (c) 2016-2019 Contributors to the Eclipse Foundation # # See the NOTICES file(s) distributed with this work for additional # information regarding copyright ownership.