TAMAYA-182: Streamlined/unified builder API and impl: Adapted examples to new API.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/a82a44af Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/a82a44af Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/a82a44af Branch: refs/heads/master Commit: a82a44affe3a19c81aa3ac3505a43a51d8e593c7 Parents: 32a1616 36b437a Author: anatole <anat...@apache.org> Authored: Sun Oct 23 15:50:37 2016 +0200 Committer: anatole <anat...@apache.org> Committed: Sun Oct 23 15:50:37 2016 +0200 ---------------------------------------------------------------------- attic/java8/api/pom.xml | 43 - .../java/org/apache/tamaya/ConfigException.java | 46 - .../java/org/apache/tamaya/ConfigOperator.java | 38 - .../java/org/apache/tamaya/ConfigQuery.java | 38 - .../java/org/apache/tamaya/Configuration.java | 232 ----- .../apache/tamaya/ConfigurationProvider.java | 87 -- .../java/org/apache/tamaya/TypeLiteral.java | 202 ----- .../apache/tamaya/spi/ConfigurationContext.java | 152 ---- .../tamaya/spi/ConfigurationContextBuilder.java | 193 ---- .../tamaya/spi/ConfigurationProviderSpi.java | 77 -- .../apache/tamaya/spi/PropertyConverter.java | 49 - .../org/apache/tamaya/spi/PropertyFilter.java | 49 - .../org/apache/tamaya/spi/PropertySource.java | 153 ---- .../tamaya/spi/PropertySourceProvider.java | 43 - .../spi/PropertyValueCombinationPolicy.java | 61 -- .../org/apache/tamaya/spi/ServiceContext.java | 66 -- .../tamaya/spi/ServiceContextManager.java | 115 --- .../org/apache/tamaya/ConfigExceptionTest.java | 47 - .../tamaya/ConfigurationProviderTest.java | 63 -- .../org/apache/tamaya/ConfigurationTest.java | 75 -- .../org/apache/tamaya/TestConfiguration.java | 80 -- .../tamaya/TestConfigurationProvider.java | 47 - .../java/org/apache/tamaya/TypeLiteralTest.java | 61 -- .../tamaya/spi/ServiceContextManagerTest.java | 131 --- .../apache/tamaya/spi/ServiceContextTest.java | 91 -- .../apache/tamaya/spi/TestServiceContext.java | 83 -- ...g.apache.tamaya.spi.ConfigurationProviderSpi | 19 - .../org.apache.tamaya.spi.ServiceContext | 19 - .../test/resources/ServiceContextWithOrdinal | 25 - attic/java8/core/pom.xml | 87 -- .../core/internal/DefaultConfiguration.java | 235 ----- .../internal/DefaultConfigurationContext.java | 239 ----- .../DefaultConfigurationContextBuilder.java | 145 --- .../internal/DefaultConfigurationProvider.java | 62 -- .../core/internal/DefaultServiceContext.java | 148 --- .../core/internal/PropertyConverterManager.java | 390 -------- .../converters/BigDecimalConverter.java | 60 -- .../converters/BigIntegerConverter.java | 92 -- .../internal/converters/BooleanConverter.java | 65 -- .../core/internal/converters/ByteConverter.java | 60 -- .../core/internal/converters/CharConverter.java | 66 -- .../internal/converters/ClassConverter.java | 58 -- .../internal/converters/CurrencyConverter.java | 87 -- .../internal/converters/DoubleConverter.java | 70 -- .../core/internal/converters/EnumConverter.java | 67 -- .../internal/converters/FloatConverter.java | 78 -- .../internal/converters/IntegerConverter.java | 70 -- .../internal/converters/LocalDateConverter.java | 36 - .../converters/LocalDateTimeConverter.java | 36 - .../internal/converters/LocalTimeConverter.java | 42 - .../core/internal/converters/LongConverter.java | 68 -- .../internal/converters/NumberConverter.java | 72 -- .../internal/converters/ShortConverter.java | 70 -- .../core/internal/converters/URIConverter.java | 45 - .../core/internal/converters/URLConverter.java | 45 - .../internal/converters/ZoneIdConverter.java | 47 - .../core/propertysource/BasePropertySource.java | 55 -- .../EnvironmentPropertySource.java | 54 -- .../propertysource/SimplePropertySource.java | 118 --- .../propertysource/SystemPropertySource.java | 87 -- .../provider/JavaConfigurationProvider.java | 58 -- ...pache.tamaya.spi.ConfigurationContextBuilder | 19 - ...g.apache.tamaya.spi.ConfigurationProviderSpi | 19 - .../org.apache.tamaya.spi.PropertyConverter | 37 - .../org.apache.tamaya.spi.PropertySource | 20 - ...org.apache.tamaya.spi.PropertySourceProvider | 19 - .../org.apache.tamaya.spi.ServiceContext | 19 - .../apache/tamaya/core/ConfigurationTest.java | 58 -- .../org/apache/tamaya/core/NotMockedAnswer.java | 55 -- .../java/org/apache/tamaya/core/internal/A.java | 29 - .../java/org/apache/tamaya/core/internal/B.java | 29 - .../java/org/apache/tamaya/core/internal/C.java | 56 -- .../tamaya/core/internal/CTestConverter.java | 31 - .../core/internal/DefaultConfigurationTest.java | 204 ----- .../internal/DefaultServiceContextTest.java | 128 --- .../internal/PropertyConverterManagerTest.java | 162 ---- .../converters/BigDecimalConverterTest.java | 104 --- .../converters/BooleanConverterTest.java | 131 --- .../internal/converters/ByteConverterTest.java | 113 --- .../internal/converters/CharConverterTest.java | 90 -- .../ConverterTestsPropertySource.java | 252 ------ .../converters/CurrencyConverterTest.java | 155 ---- .../converters/DoubleConverterTest.java | 176 ---- .../internal/converters/EnumConverterTest.java | 53 -- .../internal/converters/FloatConverterTest.java | 178 ---- .../converters/IntegerConverterTest.java | 113 --- .../converters/LocalDateConverterTest.java | 41 - .../internal/converters/LongConverterTest.java | 113 --- .../converters/NumberConverterTest.java | 104 --- .../internal/converters/ShortConverterTest.java | 113 --- .../propertysource/BasePropertySourceTest.java | 104 --- .../EnvironmentPropertySourceTest.java | 62 -- .../PropertiesFilePropertySourceTest.java | 64 -- .../SystemPropertySourceTest.java | 101 --- .../provider/JavaConfigurationProviderTest.java | 60 -- .../testdata/TestPropertyDefaultSource.java | 51 -- .../core/testdata/TestPropertyFilter.java | 37 - .../testdata/TestPropertySourceProvider.java | 73 -- .../testdata/TestRemovingPropertyFilter.java | 41 - .../META-INF/javaconfiguration.properties | 22 - ...tServiceContextTest$InvalidPriorityInterface | 19 - ...efaultServiceContextTest$MultiImplsInterface | 20 - .../org.apache.tamaya.spi.PropertyConverter | 19 - .../org.apache.tamaya.spi.PropertyFilter | 20 - .../org.apache.tamaya.spi.PropertySource | 22 - ...org.apache.tamaya.spi.PropertySourceProvider | 20 - .../core/src/test/resources/arquillian.xml | 30 - .../test/resources/javaconfiguration.properties | 22 - .../test/resources/overrideOrdinal.properties | 25 - .../core/src/test/resources/testfile.properties | 22 - .../core/src/test/resources/x34.properties | 19 - attic/pom.xml | 109 --- distribution/pom.xml | 490 ---------- .../src/main/assembly/distribution-bin.xml | 371 -------- examples/1-minimal-example/pom.xml | 50 - .../tamaya/examples/resolver/ExampleMain.java | 58 -- .../META-INF/javaconfiguration.properties | 26 - .../tamaya/examples/minimal/MinimalTests.java | 99 -- .../org/tamaya/examples/minimal/TestEnum.java | 26 - .../META-INF/javaconfiguration.properties | 27 - .../2-simple-propertysource-example/pom.xml | 46 - .../tamaya/examples/simple/ExampleMain.java | 63 -- .../examples/simple/SimplePropertySource.java | 62 -- .../simple/SimplePropertySourceProvider.java | 48 - .../META-INF/MyOtherConfigProperties.properties | 21 - .../META-INF/javaconfiguration.properties | 25 - .../org.apache.tamaya.spi.PropertySource | 20 - ...org.apache.tamaya.spi.PropertySourceProvider | 19 - .../src/main/resources/cfgOther/a.properties | 19 - .../src/main/resources/cfgOther/b.properties | 19 - .../src/main/resources/cfgOther/c.properties | 20 - examples/3-resources-example/pom.xml | 52 -- .../tamaya/examples/resources/ExampleMain.java | 63 -- .../resources/MyPathPropertySourceProvider.java | 42 - .../META-INF/MyOtherConfigProperties.properties | 21 - .../META-INF/javaconfiguration.properties | 25 - ...org.apache.tamaya.spi.PropertySourceProvider | 19 - .../main/resources/cfgOther/subs/a.properties | 19 - .../main/resources/cfgOther/subs/b.properties | 19 - .../main/resources/cfgOther/subs/c.properties | 19 - examples/4-resolver-example/pom.xml | 55 -- .../tamaya/examples/resolver/ExampleMain.java | 63 -- .../META-INF/javaconfiguration.properties | 32 - .../src/main/resources/buildata | 19 - .../tamaya/examples/minimal/MinimalTests.java | 98 -- .../org/tamaya/examples/minimal/TestEnum.java | 26 - .../META-INF/javaconfiguration.properties | 24 - examples/5-injection-example/pom.xml | 71 -- .../tamaya/examples/injection/Example.java | 48 - .../tamaya/examples/injection/ExampleMain.java | 51 -- .../examples/injection/ExampleTemplate.java | 40 - .../META-INF/javaconfiguration.properties | 27 - .../tamaya/examples/minimal/MinimalTests.java | 98 -- .../org/tamaya/examples/minimal/TestEnum.java | 26 - .../META-INF/javaconfiguration.properties | 25 - examples/6-fileobserver-example/pom.xml | 67 -- .../fileobserver/ObservedConfigExampleTest.java | 139 --- .../examples/fileobserver/TestConfigView.java | 153 ---- .../fileobserver/TestObservingProvider.java | 38 - ...org.apache.tamaya.spi.PropertySourceProvider | 20 - .../src/test/resources/test.properties | 21 - examples/7-builder-example/pom.xml | 65 -- .../examples/builder/UsingABuilderExample.java | 45 - examples/8-remote-example/client/pom.xml | 80 -- .../tamaya/examples/remote/client/Client.java | 98 -- .../remote/client/PrintConfigServlet.java | 78 -- .../org.apache.tamaya.spi.PropertySource | 19 - examples/8-remote-example/pom.xml | 69 -- examples/8-remote-example/server/pom.xml | 135 --- .../server/src/main/java/ExampleServer.java | 33 - .../META-INF/javaconfiguration.properties | 31 - .../server/src/main/resources/config-server.yml | 29 - examples/pom.xml | 83 -- keys/KEYS | 57 -- modules/builder/pom.xml | 104 --- .../tamaya/builder/ConfigurationBuilder.java | 605 ------------- .../ProgrammaticConfigurationContext.java | 388 -------- .../tamaya/builder/PropertySourceBuilder.java | 118 --- .../tamaya/builder/SimplePropertySource.java | 86 -- .../org/apache/tamaya/builder/package-info.java | 28 - .../builder/ConfigurationBuilderTest.java | 907 ------------------- .../builder/TestANonSPIPropertyFilter.java | 35 - .../builder/TestBNonSPIPropertyFilter.java | 35 - .../tamaya/builder/TestPropertyFilter.java | 35 - .../tamaya/builder/TestPropertySource.java | 59 -- .../builder/TestPropertySourceProvider.java | 91 -- .../builder/TestPropertySourceProviderB.java | 91 -- .../builder/util/mockito/NotMockedAnswer.java | 57 -- .../tamaya/builder/util/types/CustomTypeA.java | 34 - .../tamaya/builder/util/types/CustomTypeB.java | 39 - .../tamaya/builder/util/types/CustomTypeC.java | 36 - .../types/CustomTypeCPropertyConverter.java | 29 - .../org.apache.tamaya.spi.PropertyConverter | 19 - .../org.apache.tamaya.spi.PropertyFilter | 19 - .../org.apache.tamaya.spi.PropertySource | 19 - ...org.apache.tamaya.spi.PropertySourceProvider | 19 - .../test/resources/configfiles/json/first.json | 4 - .../test/resources/configfiles/json/second.json | 4 - .../test/resources/configfiles/json/simple.json | 4 - .../test/resources/configfiles/json/third.json | 4 - .../test/resources/configfiles/other/simple.oml | 19 - modules/classloader-support/pom.xml | 74 -- .../AbstractClassloaderAwareItemLoader.java | 268 ------ .../clsupport/CLAwareConfigurationContext.java | 105 --- .../tamaya/clsupport/CLAwareServiceContext.java | 248 ----- .../tamaya/clsupport/ServiceContainer.java | 306 ------- .../apache/tamaya/clsupport/package-info.java | 22 - .../org.apache.tamaya.spi.ServiceContext | 19 - ...he.tamaya.environment.spi.ContextProviderSpi | 23 - ...org.apache.tamaya.environment.spi.ContextSpi | 19 - modules/collections/pom.xml | 74 -- .../internal/AdaptiveCombinationPolicy.java | 125 --- .../internal/ArrayListConverter.java | 62 -- .../internal/CollectionConverter.java | 63 -- .../internal/ConcurrentHashMapConverter.java | 63 -- .../collections/internal/HashMapConverter.java | 63 -- .../collections/internal/HashSetConverter.java | 62 -- .../collections/internal/ItemTokenizer.java | 171 ---- .../internal/LinkedListConverter.java | 63 -- .../collections/internal/ListConverter.java | 55 -- .../collections/internal/MapConverter.java | 58 -- .../collections/internal/SetConverter.java | 55 -- .../internal/SortedMapConverter.java | 36 - .../internal/SortedSetConverter.java | 36 - .../collections/internal/TreeMapConverter.java | 62 -- .../collections/internal/TreeSetConverter.java | 63 -- .../org.apache.tamaya.spi.PropertyConverter | 31 - ...he.tamaya.spi.PropertyValueCombinationPolicy | 19 - .../collections/CollectionAdvancedTests.java | 117 --- .../collections/CollectionsBaseTests.java | 227 ----- .../CollectionsTypedReadOnlyTests.java | 173 ---- .../collections/CollectionsTypedTests.java | 208 ----- .../collections/MyUpperCaseConverter.java | 33 - .../META-INF/javaconfiguration.properties | 73 -- modules/events/pom.xml | 99 -- .../org/apache/tamaya/events/ChangeType.java | 31 - .../org/apache/tamaya/events/ConfigEvent.java | 55 -- .../tamaya/events/ConfigEventListener.java | 31 - .../tamaya/events/ConfigEventManager.java | 186 ---- .../tamaya/events/ConfigurationChange.java | 218 ----- .../events/ConfigurationChangeBuilder.java | 274 ------ .../events/ConfigurationContextChange.java | 210 ----- .../ConfigurationContextChangeBuilder.java | 174 ---- .../tamaya/events/FrozenConfiguration.java | 194 ---- .../tamaya/events/FrozenPropertySource.java | 126 --- .../tamaya/events/PropertySourceChange.java | 242 ----- .../events/PropertySourceChangeBuilder.java | 263 ------ .../tamaya/events/delta/package-info.java | 23 - .../folderobserver/FileChangeListener.java | 144 --- .../folderobserver/FileChangeObserver.java | 33 - .../ObservingPropertySourceProvider.java | 209 ----- .../events/folderobserver/package-info.java | 24 - .../internal/DefaultConfigChangeObserver.java | 111 --- .../internal/DefaultConfigEventManagerSpi.java | 202 ----- ...faultConfigurationContextChangeListener.java | 74 -- .../events/internal/LoggingConfigListener.java | 40 - .../tamaya/events/internal/package-info.java | 22 - .../org/apache/tamaya/events/package-info.java | 24 - .../tamaya/events/spi/BaseConfigEvent.java | 69 -- .../events/spi/ConfigEventManagerSpi.java | 128 --- .../apache/tamaya/events/spi/package-info.java | 23 - ...org.apache.tamaya.events.ConfigEventListener | 19 - ...ache.tamaya.events.spi.ConfigEventManagerSpi | 19 - .../events/ChangeableGlobalPropertySource.java | 62 -- .../ChangeableThreadLocalPropertySource.java | 57 -- .../tamaya/events/ConfigEventManagerTest.java | 66 -- .../tamaya/events/FrozenPropertySourceTest.java | 106 --- .../tamaya/events/ObservedConfigTest.java | 69 -- .../tamaya/events/RandomPropertySource.java | 66 -- .../org/apache/tamaya/events/SimpleEvent.java | 32 - .../apache/tamaya/events/TestConfigView.java | 156 ---- .../tamaya/events/TestObservingProvider.java | 92 -- .../events/delta/ConfigurationChangeTest.java | 163 ---- .../delta/ConfigurationContextChangeTest.java | 138 --- .../events/delta/PropertySourceChangeTest.java | 209 ----- .../DefaultConfigEventManagerSpiTest.java | 66 -- ...org.apache.tamaya.events.ConfigEventListener | 19 - .../org.apache.tamaya.spi.PropertySource | 19 - ...org.apache.tamaya.spi.PropertySourceProvider | 19 - .../src/test/resources/data/test1.properties | 20 - .../src/test/resources/data/test1b.properties | 20 - .../src/test/resources/data/test2.properties | 20 - .../src/test/resources/data/test3.properties | 20 - .../events/src/test/resources/test.properties | 21 - modules/filter/pom.xml | 81 -- .../tamaya/filter/ConfigurationFilter.java | 121 --- .../tamaya/filter/ProgrammableFilter.java | 118 --- .../tamaya/filter/RegexPropertyFilter.java | 56 -- .../filter/internal/DefaultMetadataFilter.java | 43 - .../org.apache.tamaya.spi.PropertyFilter | 19 - .../tamaya/filter/ConfigurationFilterTest.java | 122 --- .../tamaya/filter/ProgrammableFilterTest.java | 141 --- .../tamaya/filter/RegexPropertyFilterTest.java | 55 -- modules/formats/pom.xml | 86 -- .../BaseFormatPropertySourceProvider.java | 154 ---- .../apache/tamaya/format/ConfigurationData.java | 206 ----- .../tamaya/format/ConfigurationDataBuilder.java | 219 ----- .../tamaya/format/ConfigurationFormat.java | 103 --- .../tamaya/format/ConfigurationFormats.java | 187 ---- .../format/FlattenedDefaultPropertySource.java | 118 --- .../tamaya/format/InputStreamFactory.java | 89 -- .../format/formats/IniConfigurationFormat.java | 95 -- .../tamaya/format/formats/PropertiesFormat.java | 71 -- .../format/formats/PropertiesXmlFormat.java | 69 -- .../tamaya/format/formats/package-info.java | 23 - .../org/apache/tamaya/format/package-info.java | 28 - ...org.apache.tamaya.format.ConfigurationFormat | 21 - .../tamaya/format/ConfigurationFormatsTest.java | 68 -- .../FlattenedDefaultPropertySourceTest.java | 98 -- .../tamaya/format/InputStreamFactoryTest.java | 145 --- modules/formats/src/test/resources/Test.ini | 26 - .../formats/src/test/resources/Test.properties | 21 - modules/functions/pom.xml | 79 -- .../tamaya/functions/CombinedConfiguration.java | 146 --- .../functions/ConfigWrappingPropertySource.java | 80 -- .../functions/ConfigurationFunctions.java | 662 -------------- .../tamaya/functions/EnrichedConfiguration.java | 159 ---- .../functions/EnrichedPropertySource.java | 97 -- .../tamaya/functions/FilteredConfiguration.java | 126 --- .../functions/FilteredPropertySource.java | 84 -- .../org/apache/tamaya/functions/KeyMapper.java | 37 - .../tamaya/functions/MappedConfiguration.java | 132 --- .../tamaya/functions/MappedPropertySource.java | 88 -- .../org/apache/tamaya/functions/Predicate.java | 42 - .../apache/tamaya/functions/PropertyMapper.java | 36 - .../tamaya/functions/PropertyMatcher.java | 38 - .../functions/PropertySourceFunctions.java | 348 ------- .../functions/ValueMappedPropertySource.java | 85 -- .../apache/tamaya/functions/package-info.java | 22 - .../functions/ConfigurationFunctionsTest.java | 143 --- .../functions/PropertySourceFunctionsTest.java | 106 --- modules/injection-api/pom.xml | 79 -- .../tamaya/inject/api/BaseDynamicValue.java | 125 --- .../org/apache/tamaya/inject/api/Config.java | 93 -- .../tamaya/inject/api/ConfigAutoInject.java | 36 - .../inject/api/ConfigDefaultSections.java | 44 - .../inject/api/ConfiguredItemSupplier.java | 41 - .../apache/tamaya/inject/api/DynamicValue.java | 161 ---- .../tamaya/inject/api/InjectionUtils.java | 130 --- .../apache/tamaya/inject/api/LoadPolicy.java | 42 - .../org/apache/tamaya/inject/api/NoConfig.java | 36 - .../apache/tamaya/inject/api/UpdatePolicy.java | 40 - .../tamaya/inject/api/WithConfigOperator.java | 45 - .../inject/api/WithPropertyConverter.java | 46 - .../apache/tamaya/inject/api/package-info.java | 22 - .../tamaya/inject/spi/ConfiguredField.java | 68 -- .../tamaya/inject/spi/ConfiguredMethod.java | 70 -- .../tamaya/inject/spi/ConfiguredType.java | 63 -- modules/injection/pom.xml | 102 --- .../tamaya/inject/ConfigurationInjection.java | 42 - .../tamaya/inject/ConfigurationInjector.java | 94 -- .../ConfigTemplateInvocationHandler.java | 73 -- .../inject/internal/ConfiguredFieldImpl.java | 170 ---- .../inject/internal/ConfiguredSetterMethod.java | 139 --- .../inject/internal/ConfiguredTypeImpl.java | 237 ----- .../internal/DefaultConfigurationInjector.java | 179 ---- .../inject/internal/DefaultDynamicValue.java | 498 ---------- .../tamaya/inject/internal/InjectionHelper.java | 244 ----- .../apache/tamaya/inject/internal/Utils.java | 128 --- .../tamaya/inject/internal/package-info.java | 22 - .../org/apache/tamaya/inject/package-info.java | 22 - ...g.apache.tamaya.inject.ConfigurationInjector | 19 - .../java/annottext/AnnotatedConfigBean.java | 78 -- .../java/annottext/AnnotatedConfigTemplate.java | 47 - .../java/annottext/NonAnnotatedConfigBean.java | 45 - .../tamaya/inject/TamayaInjectionTest.java | 87 -- .../tamaya/inject/TestPropertySource.java | 68 -- .../internal/DefaultDynamicValueTest.java | 315 ------- .../org.apache.tamaya.spi.PropertySource | 19 - modules/integration/camel/pom.xml | 100 -- .../camel/TamayaPropertiesComponent.java | 78 -- .../camel/TamayaPropertyResolver.java | 53 -- .../camel/TamayaPropertyResolverTest.java | 116 --- .../test/resources/META-INF/camelcontext.xml | 52 -- .../META-INF/javaconfiguration.properties | 19 - .../src/test/resources/META-INF/routes.xml | 39 - modules/integration/cdi-se/pom.xml | 210 ----- .../integration/cdi/CDIAwareServiceContext.java | 169 ---- .../cdi/DefaultConfigurationContext.java | 286 ------ .../cdi/DefaultConfigurationContextBuilder.java | 152 ---- .../tamaya/integration/cdi/EnumConverter.java | 71 -- .../cdi/PropertyConverterManager.java | 427 --------- .../integration/cdi/SEInjectorCDIExtension.java | 112 --- .../cdi/ServiceLoaderServiceContext.java | 151 --- .../integration/cdi/TamayaCDIIntegration.java | 52 -- .../integration/cdi/TamayaConfigProvider.java | 54 -- .../cdi/config/ConfiguredVetoExtension.java | 42 - .../src/main/resources/META-INF/beans.xml | 24 - .../javax.enterprise.inject.spi.Extension | 20 - .../org.apache.tamaya.spi.ServiceContext | 19 - .../tamaya/integration/cdi/ConfiguredClass.java | 112 --- .../tamaya/integration/cdi/ConfiguredTest.java | 83 -- .../tamaya/integration/cdi/InjectedClass.java | 62 -- .../cdi/cfg/ProvidedPropertySource.java | 67 -- .../integration/cdi/cfg/TestConfigProvider.java | 45 - .../integration/cdi/cfg/TestPropertySource.java | 79 -- .../src/test/resources/META-INF/beans.xml | 24 - .../META-INF/javaconfiguration.properties | 20 - modules/integration/cdi/pom.xml | 224 ----- .../integration/cdi/CDIConfiguredField.java | 77 -- .../integration/cdi/CDIConfiguredMethod.java | 77 -- .../integration/cdi/CDIConfiguredType.java | 94 -- .../integration/cdi/ConfigurationExtension.java | 287 ------ .../integration/cdi/ConfigurationProducer.java | 146 --- .../integration/cdi/DefaultDynamicValue.java | 499 ---------- .../cdi/src/main/resources/META-INF/beans.xml | 19 - .../javax.enterprise.inject.spi.Extension | 19 - ...onfigurationProducerFailedInjectionTest.java | 33 - .../cdi/ConfigurationProducerTest.java | 168 ---- .../cdi/ConfigurationResolverTest.java | 112 --- .../integration/cdi/EnvironmentsTest.java | 83 -- .../integration/cdi/InterpolationTest.java | 62 -- .../integration/cdi/NotFoundNoDefault.java | 78 -- .../cdi/src/test/resources/META-INF/beans.xml | 19 - .../META-INF/javaconfiguration.properties | 32 - .../cdi/src/test/resources/base.properties | 32 - .../cdi/src/test/resources/cert.properties | 20 - .../cdi/src/test/resources/dev.properties | 19 - .../cdi/src/test/resources/prod.properties | 20 - .../cdi/src/test/resources/qa.properties | 20 - .../cdi/src/test/resources/test.properties | 20 - modules/integration/consul/pom.xml | 112 --- .../apache/tamaya/consul/ConsulBackends.java | 59 -- .../tamaya/consul/ConsulPropertySource.java | 198 ---- .../org.apache.tamaya.spi.PropertySource | 19 - .../tamaya/etcd/ConsulPropertySourceTest.java | 75 -- .../org/apache/tamaya/etcd/ConsulWriteTest.java | 80 -- modules/integration/etcd/pom.xml | 110 --- .../org/apache/tamaya/etcd/EtcdAccessor.java | 520 ----------- .../org/apache/tamaya/etcd/EtcdBackends.java | 65 -- .../apache/tamaya/etcd/EtcdPropertySource.java | 209 ----- .../org.apache.tamaya.spi.PropertySource | 19 - .../apache/tamaya/etcd/EtcdAccessorTest.java | 116 --- .../tamaya/etcd/EtcdPropertySourceTest.java | 74 -- modules/integration/osgi/pom.xml | 102 --- .../tamaya/integration/osgi/Activator.java | 134 --- .../integration/osgi/OSGIConfigRootMapper.java | 36 - .../osgi/OSGIEnhancedConfiguration.java | 117 --- .../integration/osgi/TamayaConfigAdminImpl.java | 196 ---- .../osgi/TamayaConfigurationImpl.java | 127 --- .../META-INF/javaconfiguration.properties | 18 - .../osgi/src/test/resources/arquillian.xml | 27 - .../osgi/src/test/resources/felix.properties | 23 - modules/integration/pom.xml | 43 - modules/integration/spring/pom.xml | 116 --- .../SpringConfigInjectionPostProcessor.java | 42 - .../integration/spring/TamayaEnvironment.java | 33 - .../integration/spring/TamayaSpringConfig.java | 56 -- .../spring/TamayaSpringPropertySource.java | 39 - .../spring/src/main/resources/spring-config.xml | 32 - .../spring/ConfiguredSpringBean.java | 62 -- .../integration/spring/SpringConfigTest.java | 61 -- .../integration/spring/SpringConfigTest2.java | 47 - .../META-INF/javaconfiguration.properties | 20 - .../test/resources/spring-config-scanOnly.xml | 35 - .../spring/src/test/resources/spring-config.xml | 31 - modules/json/pom.xml | 147 --- .../java/org/apache/tamaya/json/JSONFormat.java | 85 -- .../apache/tamaya/json/JSONPropertySource.java | 149 --- .../org/apache/tamaya/json/JSONVisitor.java | 119 --- ...org.apache.tamaya.format.ConfigurationFormat | 19 - .../json/CommonJSONTestCaseCollection.java | 190 ---- .../org/apache/tamaya/json/JSONFormatIT.java | 48 - .../org/apache/tamaya/json/JSONFormatTest.java | 75 -- .../tamaya/json/JSONPropertySourceTest.java | 56 -- modules/json/src/test/resources/arquillian.xml | 30 - .../test/resources/configs/invalid/array.json | 21 - .../resources/configs/invalid/empty-file.json | 18 - .../configs/invalid/only-opening-bracket.json | 19 - .../resources/configs/invalid/with-array.json | 27 - .../test/resources/configs/valid/cyrillic.json | 22 - .../configs/valid/empty-object-config.json | 20 - .../valid/simple-flat-string-only-config.json | 23 - .../simple-nested-string-only-config-1.json | 27 - .../simple-nested-string-only-config-2.json | 26 - .../configs/valid/with-explicit-priority.json | 25 - modules/management/pom.xml | 81 -- .../management/ConfigManagementSupport.java | 128 --- .../apache/tamaya/management/ManagedConfig.java | 110 --- .../tamaya/management/ManagedConfigMBean.java | 119 --- .../src/main/resources/META-INF/beans.xml | 24 - .../META-INF/javaconfiguration.properties | 19 - ....apache.tamaya.management.ManagedConfigMBean | 19 - .../management/internal/ManagedConfigTest.java | 118 --- .../src/test/resources/META-INF/beans.xml | 24 - modules/model/pom.xml | 120 --- .../org/apache/tamaya/model/ConfigModel.java | 78 -- .../apache/tamaya/model/ConfigModelManager.java | 289 ------ .../apache/tamaya/model/ConfigUsageStats.java | 129 --- .../org/apache/tamaya/model/ModelTarget.java | 37 - .../java/org/apache/tamaya/model/Usage.java | 312 ------- .../org/apache/tamaya/model/Validation.java | 203 ----- .../apache/tamaya/model/ValidationResult.java | 59 -- .../model/internal/ConfigDocumentationBean.java | 197 ---- .../ConfiguredInlineModelProviderSpi.java | 69 -- .../ConfiguredPropertiesModelProviderSpi.java | 154 ---- .../ConfiguredResourcesModelProviderSpi.java | 160 ---- .../ConfiguredTypeEventsModelPopulator.java | 90 -- .../ConfiguredTypeEventsModelProvider.java | 51 -- .../model/internal/DefaultConfigUsageStats.java | 176 ---- .../model/internal/UsageTrackerFilter.java | 46 - .../tamaya/model/spi/AbstractConfigModel.java | 88 -- .../model/spi/ConfigDocumentationMBean.java | 53 -- .../tamaya/model/spi/ConfigModelReader.java | 144 --- .../tamaya/model/spi/ConfigUsageStatsSpi.java | 101 --- .../org/apache/tamaya/model/spi/GroupModel.java | 110 --- .../tamaya/model/spi/ModelProviderSpi.java | 39 - .../apache/tamaya/model/spi/ParameterModel.java | 242 ----- .../apache/tamaya/model/spi/SectionModel.java | 202 ----- .../resources/META-INF/configmodel.properties | 35 - ...org.apache.tamaya.events.ConfigEventListener | 19 - ...he.tamaya.model.spi.ConfigDocumentationMBean | 19 - ....apache.tamaya.model.spi.ConfigUsageStatsSpi | 19 - ...org.apache.tamaya.model.spi.ModelProviderSpi | 22 - .../org.apache.tamaya.spi.PropertyFilter | 19 - .../tamaya/model/ConfigModelProviderTest.java | 68 -- .../tamaya/model/ConfigUsageStatsTest.java | 114 --- .../apache/tamaya/model/ValidationTests.java | 52 -- .../internal/ConfigDocumentationBeanTest.java | 108 --- .../java/test/model/TestConfigAccessor.java | 45 - .../resources/META-INF/configmodel.properties | 96 -- .../META-INF/javaconfiguration.properties | 22 - ...org.apache.tamaya.model.spi.ModelProviderSpi | 19 - .../src/test/resources/examples/configmodel.ini | 76 -- .../test/resources/examples/configmodel.json | 108 --- .../resources/examples/configmodel.properties | 96 -- .../src/test/resources/examples/configmodel.xml | 97 -- .../test/resources/examples/configmodel.yaml | 106 --- modules/mutable-config/pom.xml | 83 -- .../mutableconfig/ChangePropagationPolicy.java | 53 -- .../mutableconfig/MutableConfiguration.java | 126 --- .../MutableConfigurationProvider.java | 239 ----- .../internal/DefaultMutableConfiguration.java | 170 ---- .../DefaultMutableConfigurationSpi.java | 38 - .../MutablePropertiesPropertySource.java | 196 ---- .../MutableXmlPropertiesPropertySource.java | 198 ---- .../mutableconfig/spi/ConfigChangeRequest.java | 176 ---- .../spi/MutableConfigurationProviderSpi.java | 42 - .../spi/MutablePropertySource.java | 47 - ...leconfig.spi.MutableConfigurationProviderSpi | 19 - .../mutableconfig/MutableConfigurationTest.java | 187 ---- .../PropertiesFileConfigBackendTest.java | 29 - .../internal/WritablePropertiesSource.java | 49 - .../internal/WritableXmlPropertiesSource.java | 49 - .../org.apache.tamaya.spi.PropertySource | 20 - modules/optional/pom.xml | 81 -- .../tamaya/optional/EvaluationPolicy.java | 33 - .../tamaya/optional/OptionalConfiguration.java | 214 ----- .../apache/tamaya/optional/ValueProvider.java | 40 - .../optional/OptionalConfigurationTest.java | 101 --- modules/pom.xml | 119 --- modules/resolver/pom.xml | 85 -- .../org/apache/tamaya/resolver/Resolver.java | 77 -- .../resolver/internal/ConfigResolver.java | 43 - .../internal/DefaultExpressionEvaluator.java | 260 ------ .../internal/EnvironmentPropertyResolver.java | 42 - .../internal/ExpressionResolutionFilter.java | 86 -- .../tamaya/resolver/internal/FileResolver.java | 120 --- .../resolver/internal/ResourceResolver.java | 151 --- .../internal/SystemPropertyResolver.java | 42 - .../tamaya/resolver/internal/URLResolver.java | 66 -- .../tamaya/resolver/internal/package-info.java | 23 - .../apache/tamaya/resolver/package-info.java | 22 - .../resolver/spi/ExpressionEvaluator.java | 66 -- .../tamaya/resolver/spi/ExpressionResolver.java | 48 - .../tamaya/resolver/spi/package-info.java | 23 - ...ache.tamaya.resolver.spi.ExpressionEvaluator | 19 - ...pache.tamaya.resolver.spi.ExpressionResolver | 24 - .../org.apache.tamaya.spi.PropertyFilter | 19 - .../tamaya/resolver/ConfigResolutionTest.java | 121 --- .../tamaya/resolver/MyTestPropertySource.java | 102 --- .../apache/tamaya/resolver/ResolverTest.java | 41 - .../org.apache.tamaya.spi.PropertySource | 19 - .../src/test/resources/Testresource.txt | 19 - .../src/test/resources/Testresource2.txt | 19 - modules/resources/README.md | 26 - modules/resources/pom.xml | 77 -- .../AbstractPathPropertySourceProvider.java | 193 ---- .../tamaya/resource/BaseResourceResolver.java | 111 --- .../apache/tamaya/resource/ConfigResources.java | 51 -- .../apache/tamaya/resource/ResourceLocator.java | 37 - .../tamaya/resource/ResourceResolver.java | 101 --- .../internal/ClassPathResourceLocator.java | 69 -- .../resource/internal/ClasspathCollector.java | 381 -------- .../internal/DefaultResourceResolver.java | 60 -- .../tamaya/resource/internal/FileCollector.java | 178 ---- .../resource/internal/FileResourceLocator.java | 69 -- .../tamaya/resource/internal/Locator.java | 155 ---- .../resource/internal/PathResourceLocator.java | 65 -- .../resource/internal/URLResourceLocator.java | 66 -- .../tamaya/resource/internal/VfsSupport.java | 252 ------ .../tamaya/resource/internal/package-info.java | 23 - .../apache/tamaya/resource/package-info.java | 22 - .../org.apache.tamaya.resource.ResourceLocator | 22 - .../org.apache.tamaya.resource.ResourceResolver | 19 - .../AbstractPathPropertySourceProviderTest.java | 133 --- .../internal/ClasspathCollectorTest.java | 89 -- .../internal/DefaultResourceResolverTest.java | 59 -- .../resource/internal/FileCollectorTest.java | 72 -- .../PathBasedPropertySourceProvider.java | 97 -- .../resources/resources_testroot/aa_a/a1_1.file | 18 - .../resources/resources_testroot/aa_a/a1_2.file | 18 - .../resources/resources_testroot/aa_a/a2.file | 18 - .../resources/resources_testroot/aa_a/a3.file | 18 - .../resources/resources_testroot/aa_a/z3.file | 18 - .../resources_testroot/bb/b1/b2/b12.file | 18 - .../resources_testroot/bb/b2/b2_1.file | 18 - .../resources_testroot/bb/b2/b2_2.datei | 18 - .../resources/resources_testroot/bb/b2/b3.foo | 18 - .../src/test/resources/test.properties | 18 - modules/server/pom.xml | 203 ----- .../apache/tamaya/server/ConfigServiceApp.java | 77 -- .../tamaya/server/ConfigurationResource.java | 310 ------- .../apache/tamaya/server/VersionProperties.java | 68 -- .../apache/tamaya/server/spi/ScopeManager.java | 84 -- .../apache/tamaya/server/spi/ScopeProvider.java | 40 - .../META-INF/tamaya-server-version.properties | 22 - modules/server/src/main/resources/banner.txt | 14 - .../server/src/main/resources/config-server.yml | 31 - .../tamaya/server/ConfigServiceAppTest.java | 32 - .../org/apache/tamaya/server/EtcdAccessor.java | 519 ----------- .../tamaya/server/VersionPropertiesTest.java | 46 - modules/spi-support/pom.xml | 75 -- .../tamaya/spisupport/BasePropertySource.java | 86 -- .../tamaya/spisupport/DefaultConfiguration.java | 228 ----- .../spisupport/DefaultConfigurationContext.java | 256 ------ .../apache/tamaya/spisupport/EnumConverter.java | 68 -- .../tamaya/spisupport/MapPropertySource.java | 147 --- .../spisupport/PriorityServiceComparator.java | 59 -- .../PropertiesResourcePropertySource.java | 78 -- .../spisupport/PropertyConverterManager.java | 437 --------- .../tamaya/spisupport/PropertyFiltering.java | 131 --- .../spisupport/PropertySourceComparator.java | 54 -- modules/yaml/pom.xml | 117 --- .../java/org/apache/tamaya/json/YAMLFormat.java | 156 ---- .../apache/tamaya/json/YAMLPropertySource.java | 100 -- ...org.apache.tamaya.format.ConfigurationFormat | 19 - .../org/apache/tamaya/json/YAMLFormatTest.java | 73 -- .../tamaya/json/YAMLPropertySourceTest.java | 54 -- .../test/resources/configs/valid/contact.yaml | 46 - .../resources/configs/valid/test-with-prio.yaml | 39 - .../src/test/resources/configs/valid/test.yaml | 35 - pom.xml | 79 +- 643 files changed, 2 insertions(+), 56426 deletions(-) ----------------------------------------------------------------------
