You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/01/14 03:37:50 UTC
git commit: DELTASPIKE-36 pickup Gerhards idea with the defaultOrdinal
Updated Branches:
refs/heads/master d88b1a208 -> f6b229b0a
DELTASPIKE-36 pickup Gerhards idea with the defaultOrdinal
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/f6b229b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/f6b229b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/f6b229b0
Branch: refs/heads/master
Commit: f6b229b0a5ca2acf22b30a1f3e3bf967822b7d5e
Parents: d88b1a2
Author: Mark Struberg <st...@apache.org>
Authored: Sat Jan 14 03:36:46 2012 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Jan 14 03:36:46 2012 +0100
----------------------------------------------------------------------
.../core/impl/config/BaseConfigSource.java | 66 +++++++++++++++
.../config/EnvironmentPropertyConfigSource.java | 25 +-----
.../core/impl/config/LocalJndiConfigSource.java | 20 +----
.../core/impl/config/PropertyFileConfigSource.java | 21 +----
.../impl/config/SystemPropertyConfigSource.java | 23 +----
5 files changed, 82 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/f6b229b0/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java
new file mode 100644
index 0000000..01a97fe
--- /dev/null
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.impl.config;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.deltaspike.core.spi.config.ConfigSource;
+
+/**
+ * Base class for all our ConfigSources
+ */
+public abstract class BaseConfigSource implements ConfigSource
+{
+ protected Logger LOG = Logger.getLogger(getClass().getName());
+
+ private int ordinal = 1000; // default
+
+ @Override
+ public int getOrdinal()
+ {
+ return ordinal;
+ }
+
+ /**
+ * Init method e.g. for initializing the ordinal.
+ * This method can be used from a subclass to determine
+ * the ordinal value
+ * @param defaultOrdinal the default value for the ordinal if not set via configuration
+ */
+ protected void initOrdinal(int defaultOrdinal)
+ {
+ this.ordinal = defaultOrdinal;
+
+ String configuredOrdinalString = getPropertyValue(ConfigSource.DELTASPIKE_ORDINAL);
+ try
+ {
+ if(configuredOrdinalString != null)
+ {
+ ordinal = Integer.parseInt(configuredOrdinalString.trim());
+ }
+ }
+ catch (NumberFormatException e)
+ {
+ LOG.log(Level.WARNING,
+ "The configured config-ordinal isn't a valid integer. Invalid value: " + configuredOrdinalString);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/f6b229b0/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
index 8cef999..fb95681 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
@@ -18,32 +18,17 @@
*/
package org.apache.deltaspike.core.impl.config;
-import org.apache.deltaspike.core.spi.config.ConfigSource;
/**
- * {@link ConfigSource} which uses System#getenv
+ * {@link org.apache.deltaspike.core.spi.config.ConfigSource}
+ * which uses System#getenv
*/
-class EnvironmentPropertyConfigSource implements ConfigSource
+class EnvironmentPropertyConfigSource extends BaseConfigSource
{
- private int ordinal = 300;
-
+
public EnvironmentPropertyConfigSource()
{
- // try to load the ordinal from the environment
- String envOrdinal = System.getenv(ConfigSource.DELTASPIKE_ORDINAL);
- if (envOrdinal != null && envOrdinal.length() > 0)
- {
- ordinal = Integer.parseInt(envOrdinal);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getOrdinal()
- {
- return ordinal;
+ initOrdinal(300);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/f6b229b0/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
index 85d007a..023bbbd 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
@@ -19,33 +19,21 @@
package org.apache.deltaspike.core.impl.config;
import org.apache.deltaspike.core.impl.util.JndiUtils;
-import org.apache.deltaspike.core.spi.config.ConfigSource;
import javax.enterprise.inject.Typed;
/**
- * {@link ConfigSource} which uses JNDI for the lookup
+ * {@link org.apache.deltaspike.core.spi.config.ConfigSource}
+ * which uses JNDI for the lookup
*/
@Typed()
-class LocalJndiConfigSource implements ConfigSource
+class LocalJndiConfigSource extends BaseConfigSource
{
private static final String BASE_NAME = "java:comp/env/deltaspike/";
- private Integer ordinal = Integer.valueOf(100);
-
public LocalJndiConfigSource()
{
- String ordinalVal = getPropertyValue(ConfigSource.DELTASPIKE_ORDINAL);
- if (ordinalVal != null && ordinalVal.length() > 0)
- {
- ordinal = Integer.valueOf(ordinalVal);
- }
- }
-
- @Override
- public int getOrdinal()
- {
- return ordinal;
+ initOrdinal(300);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/f6b229b0/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
index cacb3ef..a9a0f93 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
@@ -18,18 +18,16 @@
*/
package org.apache.deltaspike.core.impl.config;
-import org.apache.deltaspike.core.spi.config.ConfigSource;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Properties;
/**
- * {@link ConfigSource} which uses
+ * {@link org.apache.deltaspike.core.spi.config.ConfigSource} which uses
* <i>META-INF/apache-deltaspike.properties</i> for the lookup
*/
-class PropertyFileConfigSource implements ConfigSource
+class PropertyFileConfigSource extends BaseConfigSource
{
private Properties properties;
private String fileName;
@@ -38,20 +36,7 @@ class PropertyFileConfigSource implements ConfigSource
{
fileName = propertyFileUrl.toExternalForm();
properties = loadProperties(propertyFileUrl);
-
- String ordinalVal = getPropertyValue(ConfigSource.DELTASPIKE_ORDINAL);
- if (ordinalVal != null && ordinalVal.length() > 0)
- {
- ordinal = Integer.valueOf(ordinalVal);
- }
- }
-
- private int ordinal = 100;
-
- @Override
- public int getOrdinal()
- {
- return ordinal;
+ initOrdinal(100);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/f6b229b0/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/SystemPropertyConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/SystemPropertyConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/SystemPropertyConfigSource.java
index b38f390..01ff095 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/SystemPropertyConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/SystemPropertyConfigSource.java
@@ -18,31 +18,16 @@
*/
package org.apache.deltaspike.core.impl.config;
-import org.apache.deltaspike.core.spi.config.ConfigSource;
/**
- * {@link ConfigSource} which uses System#getProperty
+ * {@link org.apache.deltaspike.core.spi.config.ConfigSource}
+ * which uses System#getProperty
*/
-class SystemPropertyConfigSource implements ConfigSource
+class SystemPropertyConfigSource extends BaseConfigSource
{
- private int ordinal = 400;
-
SystemPropertyConfigSource()
{
- String envOrdinal = getPropertyValue(ConfigSource.DELTASPIKE_ORDINAL);
- if (envOrdinal != null && envOrdinal.length() > 0)
- {
- ordinal = Integer.parseInt(envOrdinal);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getOrdinal()
- {
- return ordinal;
+ initOrdinal(400);
}
/**