You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2013/11/22 11:06:21 UTC
svn commit: r1544462 - in /incubator/sirona/trunk:
core/src/main/java/org/apache/sirona/configuration/
core/src/test/java/org/apache/sirona/configuration/ core/src/test/resources/
plugins/ehcache/agent/src/main/java/org/apache/sirona/agent/ehcache/
Author: olamy
Date: Fri Nov 22 10:06:20 2013
New Revision: 1544462
URL: http://svn.apache.org/r1544462
Log:
users can be able to add their own cache Statistics to add in counter
Added:
incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/
incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/ConfigurationTest.java (with props)
Modified:
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
incubator/sirona/trunk/core/src/test/resources/sirona.properties
incubator/sirona/trunk/plugins/ehcache/agent/src/main/java/org/apache/sirona/agent/ehcache/EhCacheGaugeFactory.java
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java?rev=1544462&r1=1544461&r2=1544462&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java Fri Nov 22 10:06:20 2013
@@ -67,6 +67,14 @@ public final class Configuration {
return PROPERTIES.getProperty(key, defaultValue);
}
+ public static String[] getArray(final String key, final String[] defaultValue) {
+ String property = PROPERTIES.getProperty( key );
+ if (property == null){
+ return defaultValue;
+ }
+ return property.split( ";" );
+ }
+
private Configuration() {
// no-op
}
Added: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/ConfigurationTest.java?rev=1544462&view=auto
==============================================================================
--- incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/ConfigurationTest.java (added)
+++ incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/ConfigurationTest.java Fri Nov 22 10:06:20 2013
@@ -0,0 +1,46 @@
+/*
+ * 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.sirona.configuration;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Olivier Lamy
+ */
+public class ConfigurationTest {
+
+ @Test
+ public void isTrue(){
+ Assert.assertEquals( true, Configuration.is( "org.apache.sirona.goodbeer", false ) );
+ }
+
+ @Test
+ public void isFalse(){
+ Assert.assertEquals( false, Configuration.is( "org.apache.sirona.badbeer", false ) );
+ }
+
+ @Test
+ public void getArray(){
+ //foo;bar;beer
+ String[] array = Configuration.getArray( "org.apache.sirona.ehcache.methods", null );
+ Assert.assertEquals( 3, array.length );
+ Assert.assertEquals( "foo", array[0] );
+ Assert.assertEquals( "bar", array[1] );
+ Assert.assertEquals( "beer", array[2] );
+ }
+}
Propchange: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/ConfigurationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/configuration/ConfigurationTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/core/src/test/resources/sirona.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/test/resources/sirona.properties?rev=1544462&r1=1544461&r2=1544462&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/test/resources/sirona.properties (original)
+++ incubator/sirona/trunk/core/src/test/resources/sirona.properties Fri Nov 22 10:06:20 2013
@@ -15,3 +15,7 @@
# specific language governing permissions and limitations
# under the License.
org.apache.sirona.spi.SPI = org.apache.sirona.spi.SpiTestImpl
+
+org.apache.sirona.ehcache.methods=foo;bar;beer
+
+org.apache.sirona.goodbeer=true
Modified: incubator/sirona/trunk/plugins/ehcache/agent/src/main/java/org/apache/sirona/agent/ehcache/EhCacheGaugeFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/plugins/ehcache/agent/src/main/java/org/apache/sirona/agent/ehcache/EhCacheGaugeFactory.java?rev=1544462&r1=1544461&r2=1544462&view=diff
==============================================================================
--- incubator/sirona/trunk/plugins/ehcache/agent/src/main/java/org/apache/sirona/agent/ehcache/EhCacheGaugeFactory.java (original)
+++ incubator/sirona/trunk/plugins/ehcache/agent/src/main/java/org/apache/sirona/agent/ehcache/EhCacheGaugeFactory.java Fri Nov 22 10:06:20 2013
@@ -55,7 +55,7 @@ public class EhCacheGaugeFactory impleme
for (String name:manager.getCacheNames()){
Cache cache = manager.getCache( name );
if (cache!=null){
- gauges.addAll(register( cache ));
+ gauges.addAll( register( cache ) );
}
}
}
@@ -72,11 +72,18 @@ public class EhCacheGaugeFactory impleme
*/
public static Collection<Gauge> register(Cache cache){
+ List<String> methodNames = new ArrayList<String>( Arrays.asList( DEFAULT_EHCACHE_METHOD_NAMES ) );
+ String[] userMethodNames= Configuration.getArray( "org.apache.sirona.ehcache.methods", new String[0] );
+
+ if (userMethodNames!=null && userMethodNames.length>0){
+ methodNames.addAll( Arrays.asList( userMethodNames ) );
+ }
+
try {
- Collection<Gauge> gauges = new ArrayList<Gauge>( DEFAULT_EHCACHE_METHOD_NAMES.length );
+ Collection<Gauge> gauges = new ArrayList<Gauge>( methodNames.size() );
- for (String methodNames:DEFAULT_EHCACHE_METHOD_NAMES) {
- Method method = FlatStatistics.class.getMethod( methodNames, null );
+ for (String methodName:methodNames) {
+ Method method = FlatStatistics.class.getMethod( methodName, null );
gauges.add( new EhCacheCacheGauge(method, cache) );
}
return gauges;