tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [incubator-tamaya-sandbox] branch master updated (f799e04 -> d216cae)
Date Tue, 14 May 2019 14:58:04 GMT
This is an automated email from the ASF dual-hosted git repository.

anatole pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git.


    from f799e04  TAMAYA-277: Properly fix XXE config, hopefully
     new c6a81da  Removed deprecated API usage of ConfigurationInjection.
     new d73cf62  Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox
     new 5c0cd94  Adapted to latest API changes.
     new 1f9f59a  Adapted to latest API changes.
     new 3cb96a1  Implemented meta-config module using hocon format. Moved hjson format to
extensions. Adapted code to SPI changes as needed.
     new 9e69c7c  M;inor improvements on sandbox modules, especially doc.
     new d216cae  Fixed checkstyle config, test.

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                                        |  34 +--
 README.md                                          |   3 -
 configjsr/pom.xml                                  |   2 +-
 .../apache/tamaya/jsr382/JavaConfigAdapter.java    |   5 +-
 .../tamaya/jsr382/JavaConfigAdapterFactory.java    |  16 +-
 .../JavaConfigDefaultPropertiesPropertySource.java |   3 +-
 .../apache/tamaya/jsr382/TamayaConfigAccessor.java | 162 +++++++-------
 .../tamaya/jsr382/TamayaPropertySourceAdapter.java |   4 +-
 .../tamaya/jsr382/JavaConfigAdapterTest.java       |   4 +-
 .../org/apache/tamaya/jsr382/SmokeExamples.java    |  19 +-
 hjson/pom.xml                                      |  88 --------
 .../org/apache/tamaya/hjson/HJSONDataBuilder.java  | 116 ----------
 .../java/org/apache/tamaya/hjson/HJSONFormat.java  |  61 ------
 .../apache/tamaya/hjson/HJSONPropertySource.java   | 130 -----------
 .../PathBasedHJSONPropertySourceProvider.java      |  58 -----
 .../org.apache.tamaya.format.ConfigurationFormat   |  19 --
 .../hjson/CommonHJSONTestCaseCollection.java       | 201 -----------------
 .../org/apache/tamaya/hjson/HJSONFormatIT.java     |  47 ----
 .../org/apache/tamaya/hjson/HJSONFormatTest.java   |  74 -------
 .../tamaya/hjson/HJSONPropertySourceTest.java      |  53 -----
 .../org/apache/tamaya/hjson/HJSONVisitorTest.java  |  92 --------
 .../PathBasedHJSONPropertySourceProviderTest.java  |  61 ------
 .../META-INF/javaconfiguration.properties          |  22 --
 .../src/test/resources/configs/invalid/array.hjson |  21 --
 .../resources/configs/invalid/empty-file.hjson     |  18 --
 .../configs/invalid/only-opening-bracket.hjson     |  19 --
 .../resources/configs/invalid/with-array.hjson     |  27 ---
 .../test/resources/configs/valid/cyrillic.hjson    |  22 --
 .../configs/valid/empty-object-config.hjson        |  20 --
 hjson/src/test/resources/configs/valid/kanji.hjson |  21 --
 .../valid/simple-flat-string-only-config.hjson     |  23 --
 .../valid/simple-nested-string-only-config-1.hjson |  27 ---
 .../valid/simple-nested-string-only-config-2.hjson |  26 ---
 .../configs/valid/with-explicit-priority.hjson     |  25 ---
 metamodel/pom.xml                                  |   5 +
 .../org/apache/tamaya/metamodel/CachedFilter.java  |   2 +-
 .../tamaya/metamodel/EnabledPropertySource.java    |   8 +-
 .../org/apache/tamaya/metamodel/HideFilter.java    |   2 +-
 .../apache/tamaya/metamodel/ImmutableFilter.java   |   4 +-
 .../org/apache/tamaya/metamodel/MapFilter.java     |   4 +-
 .../org/apache/tamaya/metamodel/MaskFilter.java    |  39 ++--
 .../apache/tamaya/metamodel/MetaConfiguration.java |  50 +++--
 .../org/apache/tamaya/metamodel/MetaContext.java   | 244 ++++++++-------------
 .../org/apache/tamaya/metamodel/SecuredFilter.java |   2 +-
 .../ext/EnabledPropertySourceProvider.java         |  19 +-
 .../metamodel/ext/RefreshablePropertySource.java   |  26 +--
 .../ext/RefreshablePropertySourceProvider.java     |  21 +-
 .../metamodel/internal/ComponentConfigurator.java  |  40 +---
 .../metamodel/internal/ComponentFactory.java       |  40 ++--
 .../metamodel/internal/MetaContextReader.java      | 189 ----------------
 .../internal/PropertyConverterReader.java          |  44 ++--
 .../internal/PropertyFilterOrderingReader.java     |  40 ++--
 .../metamodel/internal/PropertyFilterReader.java   |  59 ++---
 .../internal/PropertySourceOrderingReader.java     |  39 ++--
 .../metamodel/internal/PropertySourceReader.java   | 160 +++++++-------
 .../internal/factories/CLIArgumentsFactory.java    |   2 +-
 ...ry.java => ClasspathPropertySourceFactory.java} |  14 +-
 ...ctory.java => EnvironmentVariablesFactory.java} |   4 +-
 .../factories/FilePropertySourceFactory.java       |   8 +-
 .../factories/ResourcePropertySourceFactory.java   |   8 +-
 .../ResourcePropertySourceProviderFactory.java     |   9 +-
 ...esFactory.java => SystemPropertiesFactory.java} |   4 +-
 .../factories/URLPropertySourceFactory.java        |   8 +-
 .../metamodel/internal/resolver/JavaResolver.java  |  29 +--
 .../internal/resolver/PropertiesResolver.java      |   9 +-
 ...SimpleResolver.java => ContextInitializer.java} |  13 +-
 .../tamaya/metamodel/spi/ItemFactoryManager.java   |  22 ++
 .../metamodel/spi/MetaConfigurationReader.java     |   8 +-
 ...apache.tamaya.metamodel.spi.ContextInitializer} |   1 -
 .../org.apache.tamaya.metamodel.spi.ItemFactory    |   3 +
 ...he.tamaya.metamodel.spi.MetaConfigurationReader |   1 -
 .../org.apache.tamaya.metamodel.spi.SimpleResolver |  20 --
 .../tamaya/metamodel/ImmutableFilterTest.java      |  19 +-
 .../apache/tamaya/metamodel/MaskFilterTest.java    |  96 ++++++++
 .../tamaya/metamodel/ext/IntegrationTest.java      |  40 +---
 .../factories/CLIArgumentsFactoryTest.java         |   2 +-
 .../internal/resolver/JavaResolverTest.java        |  12 +-
 .../metamodel/internal/resolver/LoggingReader.java |  76 -------
 ...st.xml => default-propertyconverters-test.conf} |  13 +-
 ...-test.xml => default-propertyfilters-test.conf} |  13 +-
 ...-test.xml => default-propertysources-test.conf} |  11 +-
 ...-propertyfilters-test.xml => empty-config.conf} |   9 +-
 ...test.xml => propertyconverter-config-test.conf} |  25 ++-
 .../propertyconverter-config-test.xml              |  32 ---
 ...pty-config.xml => propertyconverters-test.conf} |  12 +-
 .../IntegrationTests/propertyconverters-test.xml   |  30 ---
 ...es-test.xml => propertyfilter-config-test.conf} |  23 +-
 .../propertyfilter-config-test.xml                 |  30 ---
 ...yfilters-test.xml => propertyfilters-test.conf} |  17 +-
 .../propertysource-config-test.xml                 |  31 ---
 ...verters-test.xml => propertysources-test.hocon} |  25 +--
 ...he.tamaya.metamodel.spi.MetaConfigurationReader |   1 -
 metamodel/src/test/resources/tamaya-config.conf    | 124 +++++++++++
 metamodel/src/test/resources/tamaya-config.xml     |  23 +-
 pom.xml                                            |   1 -
 .../tamaya/remote/BaseRemotePropertySource.java    |   2 +-
 .../org/apache/tamaya/model/ConfigUsageTest.java   |   4 +-
 .../ConfigValidationDocumentationReader.java       |   2 +-
 vertx/pom.xml                                      |   2 +-
 .../tamaya/vertx/AbstractConfiguredVerticle.java   |   6 +-
 ...Factory.java => ConfiguredVerticleFactory.java} |   7 +-
 .../tamaya/vertx/TamayaConfigurationProducer.java  |   3 +-
 .../services/io.vertx.core.spi.VerticleFactory     |   2 +-
 .../apache/tamaya/vertx/ConfigVerticleTest.java    |   1 -
 104 files changed, 928 insertions(+), 2489 deletions(-)
 delete mode 100644 hjson/pom.xml
 delete mode 100644 hjson/src/main/java/org/apache/tamaya/hjson/HJSONDataBuilder.java
 delete mode 100644 hjson/src/main/java/org/apache/tamaya/hjson/HJSONFormat.java
 delete mode 100644 hjson/src/main/java/org/apache/tamaya/hjson/HJSONPropertySource.java
 delete mode 100644 hjson/src/main/java/org/apache/tamaya/hjson/PathBasedHJSONPropertySourceProvider.java
 delete mode 100644 hjson/src/main/resources/META-INF/services/org.apache.tamaya.format.ConfigurationFormat
 delete mode 100644 hjson/src/test/java/org/apache/tamaya/hjson/CommonHJSONTestCaseCollection.java
 delete mode 100644 hjson/src/test/java/org/apache/tamaya/hjson/HJSONFormatIT.java
 delete mode 100644 hjson/src/test/java/org/apache/tamaya/hjson/HJSONFormatTest.java
 delete mode 100644 hjson/src/test/java/org/apache/tamaya/hjson/HJSONPropertySourceTest.java
 delete mode 100644 hjson/src/test/java/org/apache/tamaya/hjson/HJSONVisitorTest.java
 delete mode 100644 hjson/src/test/java/org/apache/tamaya/hjson/PathBasedHJSONPropertySourceProviderTest.java
 delete mode 100644 hjson/src/test/resources/META-INF/javaconfiguration.properties
 delete mode 100644 hjson/src/test/resources/configs/invalid/array.hjson
 delete mode 100644 hjson/src/test/resources/configs/invalid/empty-file.hjson
 delete mode 100644 hjson/src/test/resources/configs/invalid/only-opening-bracket.hjson
 delete mode 100644 hjson/src/test/resources/configs/invalid/with-array.hjson
 delete mode 100644 hjson/src/test/resources/configs/valid/cyrillic.hjson
 delete mode 100644 hjson/src/test/resources/configs/valid/empty-object-config.hjson
 delete mode 100644 hjson/src/test/resources/configs/valid/kanji.hjson
 delete mode 100644 hjson/src/test/resources/configs/valid/simple-flat-string-only-config.hjson
 delete mode 100644 hjson/src/test/resources/configs/valid/simple-nested-string-only-config-1.hjson
 delete mode 100644 hjson/src/test/resources/configs/valid/simple-nested-string-only-config-2.hjson
 delete mode 100644 hjson/src/test/resources/configs/valid/with-explicit-priority.hjson
 delete mode 100644 metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java
 copy metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/{ResourcePropertySourceFactory.java
=> ClasspathPropertySourceFactory.java} (76%)
 copy metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/{EnvPropertiesFactory.java
=> EnvironmentVariablesFactory.java} (92%)
 copy metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/{SysPropertiesFactory.java
=> SystemPropertiesFactory.java} (92%)
 rename metamodel/src/main/java/org/apache/tamaya/metamodel/spi/{SimpleResolver.java =>
ContextInitializer.java} (84%)
 copy metamodel/src/{test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
=> main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.ContextInitializer}
(94%)
 delete mode 100644 metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.SimpleResolver
 copy configured-sysprops/src/test/java/org/apache/tamaya/sysprops/ConfiguredSystemPropertiesTest.java
=> metamodel/src/test/java/org/apache/tamaya/metamodel/ImmutableFilterTest.java (61%)
 create mode 100644 metamodel/src/test/java/org/apache/tamaya/metamodel/MaskFilterTest.java
 delete mode 100644 metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java
 rename metamodel/src/test/resources/IntegrationTests/{propertysources-test.xml => default-propertyconverters-test.conf}
(81%)
 copy metamodel/src/test/resources/IntegrationTests/{default-propertyfilters-test.xml =>
default-propertyfilters-test.conf} (87%)
 copy metamodel/src/test/resources/IntegrationTests/{default-propertyfilters-test.xml =>
default-propertysources-test.conf} (87%)
 rename metamodel/src/test/resources/IntegrationTests/{default-propertyfilters-test.xml =>
empty-config.conf} (87%)
 rename metamodel/src/test/resources/IntegrationTests/{context-test.xml => propertyconverter-config-test.conf}
(68%)
 delete mode 100644 metamodel/src/test/resources/IntegrationTests/propertyconverter-config-test.xml
 rename metamodel/src/test/resources/IntegrationTests/{empty-config.xml => propertyconverters-test.conf}
(85%)
 delete mode 100644 metamodel/src/test/resources/IntegrationTests/propertyconverters-test.xml
 rename metamodel/src/test/resources/IntegrationTests/{default-propertysources-test.xml =>
propertyfilter-config-test.conf} (70%)
 delete mode 100644 metamodel/src/test/resources/IntegrationTests/propertyfilter-config-test.xml
 rename metamodel/src/test/resources/IntegrationTests/{propertyfilters-test.xml => propertyfilters-test.conf}
(83%)
 delete mode 100644 metamodel/src/test/resources/IntegrationTests/propertysource-config-test.xml
 rename metamodel/src/test/resources/IntegrationTests/{default-propertyconverters-test.xml
=> propertysources-test.hocon} (72%)
 create mode 100644 metamodel/src/test/resources/tamaya-config.conf
 rename vertx/src/main/java/org/apache/tamaya/vertx/{ConfiguredJavaVerticleFactory.java =>
ConfiguredVerticleFactory.java} (87%)


Mime
View raw message