You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2013/08/19 09:21:14 UTC
svn commit: r1515292 - in /sling/trunk/contrib/extensions/healthcheck:
api/src/main/java/org/apache/sling/hc/util/
api/src/test/java/org/apache/sling/hc/util/
healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/
healthchecks/src/main/java/...
Author: cziegeler
Date: Mon Aug 19 07:21:14 2013
New Revision: 1515292
URL: http://svn.apache.org/r1515292
Log:
SLING-3024 : Move SimpleConstraintChecker to healthchecks bundle
Added:
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java
- copied, changed from r1515281, sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java
- copied, changed from r1515279, sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java
Removed:
sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java
sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java
Modified:
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java
Modified: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java?rev=1515292&r1=1515291&r2=1515292&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java Mon Aug 19 07:21:14 2013
@@ -31,7 +31,7 @@ import org.apache.sling.commons.osgi.Pro
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.healthchecks.util.FormattingResultLog;
-import org.apache.sling.hc.util.SimpleConstraintChecker;
+import org.apache.sling.hc.healthchecks.util.SimpleConstraintChecker;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java (from r1515281, sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java&p1=sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java&r1=1515281&r2=1515292&rev=1515292&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/SimpleConstraintChecker.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintChecker.java Mon Aug 19 07:21:14 2013
@@ -15,17 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.hc.util;
+package org.apache.sling.hc.healthchecks.util;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
-import org.slf4j.helpers.MessageFormatter;
/** Simple check of numeric values against expressions
* like < N, > N, between two values etc.
* See {@link SimpleConstraintCheckerTest} for examples.
- *
- * TODO - should we move this to the healthchecks bundle?
*/
public class SimpleConstraintChecker {
@@ -67,20 +64,17 @@ public class SimpleConstraintChecker {
} catch(NumberFormatException nfe) {
resultLog.add(new ResultLog.Entry(
Result.Status.WARN,
- MessageFormatter.format(
- "Invalid numeric value [{}] while evaluating {}", inputValue, constraint).getMessage()));
+ "Invalid numeric value [" + inputValue + "] while evaluating " + constraint));
}
if(matches) {
resultLog.add(new ResultLog.Entry(
Result.Status.DEBUG,
- MessageFormatter.format(
- "Value [{}] matches constraint [{}]", stringValue, constraint).getMessage()));
+ "Value [" + inputValue + "] matches constraint [" + constraint + "]"));
} else {
resultLog.add(new ResultLog.Entry(
Result.Status.WARN,
- MessageFormatter.format(
- "Value [{}] does not match constraint [{}]", stringValue, constraint).getMessage()));
+ "Value [" + inputValue + "] does not match constraint [" + constraint + "]"));
}
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java (from r1515279, sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java?p2=sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java&p1=sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java&r1=1515279&r2=1515292&rev=1515292&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/api/src/test/java/org/apache/sling/hc/util/SimpleConstraintCheckerTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/test/java/org/apache/sling/hc/healthchecks/util/SimpleConstraintCheckerTest.java Mon Aug 19 07:21:14 2013
@@ -15,13 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.hc.util;
+package org.apache.sling.hc.healthchecks.util;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
+import org.apache.sling.hc.healthchecks.util.SimpleConstraintChecker;
import org.junit.Before;
import org.junit.Test;
Modified: sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml?rev=1515292&r1=1515291&r2=1515292&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml Mon Aug 19 07:21:14 2013
@@ -81,28 +81,29 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.api</artifactId>
- <version>${project.version}</version>
+ <version>0.0.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.2</version>
- <scope>provided</scope>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.healthchecks</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java?rev=1515292&r1=1515291&r2=1515292&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java (original)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java Mon Aug 19 07:21:14 2013
@@ -28,8 +28,8 @@ import javax.management.ObjectName;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.ResultLog;
+import org.apache.sling.hc.healthchecks.util.SimpleConstraintChecker;
import org.apache.sling.hc.jmx.impl.HealthCheckMBean;
-import org.apache.sling.hc.util.SimpleConstraintChecker;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;