TAMAYA-236: improve ordinal handling.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/dd66dff3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/dd66dff3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/dd66dff3 Branch: refs/heads/master Commit: dd66dff3d2bfab1957728e8faeb5819b52587786 Parents: 3ecc1d5 Author: anatole <[email protected]> Authored: Thu Feb 23 01:03:31 2017 +0100 Committer: anatole <[email protected]> Committed: Mon Feb 27 00:05:00 2017 +0100 ---------------------------------------------------------------------- code/api/bnd.bnd | 4 ++- .../org/apache/tamaya/spi/PropertySource.java | 33 +------------------- 2 files changed, 4 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dd66dff3/code/api/bnd.bnd ---------------------------------------------------------------------- diff --git a/code/api/bnd.bnd b/code/api/bnd.bnd index fcbaaa7..4f29bfe 100644 --- a/code/api/bnd.bnd +++ b/code/api/bnd.bnd @@ -1,3 +1,5 @@ Export-Package: \ org.apache.tamaya,\ - org.apache.tamaya.spi \ No newline at end of file + org.apache.tamaya.spi +Bundle-SymbolicName: org.apache.tamaya +Bundle-Version: 0.3-INCUBATING-SNAPSHOT \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dd66dff3/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java ---------------------------------------------------------------------- diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java index 36c4059..32f5a6a 100644 --- a/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java +++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java @@ -54,7 +54,7 @@ public interface PropertySource { * A resusable instance of an empty PropertySource. */ PropertySource EMPTY = new PropertySource() { - @Override + public int getOrdinal() { return Integer.MIN_VALUE; } @@ -87,37 +87,6 @@ public interface PropertySource { /** - * Lookup order: - * TODO rethink whole default PropertySources and ordering: - * TODO introduce default values or constants for ordinals - * <ol> - * <li>System properties (ordinal 400)</li> - * <li>Environment properties (ordinal 300)</li> - * <li>JNDI values (ordinal 200)</li> - * <li>Properties file values (/META-INF/applicationConfiguration.properties) (ordinal 100)</li> - * </ol> - * - * <p><b>Important Hints for custom implementations</b>:</p> - * <p> - * If a custom implementation should be invoked <b>before</b> the default implementations, use a value > 400 - * </p> - * <p> - * If a custom implementation should be invoked <b>after</b> the default implementations, use a value < 100 - * </p> - * - * <p>Reordering of the default order of the config-sources:</p> - * <p>Example: If the properties file/s should be used <b>before</b> the other implementations, - * you have to configure an ordinal > 400. That means, you have to add e.g. deltaspike_ordinal=401 to - * /META-INF/apache-deltaspike.properties . Hint: In case of property files every file is handled as independent - * config-source, but all of them have ordinal 400 by default (and can be reordered in a fine-grained manner.</p> - * - * @return the 'importance' aka ordinal of the configured values. The higher, the more important. - * //X TODO think about making this a default method which returns default priority - */ - int getOrdinal(); - - - /** * Get the name of the property source. The name should be unique for the type of source, whereas the id is used * to ensure unique identity, either locally or remotely. * @return the configuration's name, never null.
