jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1382010 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint: Constraints.java DateConstraint.java
Date Fri, 07 Sep 2012 13:16:13 GMT
Author: mduerig
Date: Fri Sep  7 13:16:13 2012
New Revision: 1382010

URL: http://svn.apache.org/viewvc?rev=1382010&view=rev
Log:
OAK-66: JCR Node Type Management
value constraints for Date

Added:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/DateConstraint.java
  (with props)
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/Constraints.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/Constraints.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/Constraints.java?rev=1382010&r1=1382009&r2=1382010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/Constraints.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/Constraints.java
Fri Sep  7 13:16:13 2012
@@ -80,7 +80,7 @@ public class Constraints {
     }
 
     private static Predicate<Value> dateConstraint(String constraint) {
-        return Predicates.alwaysTrue(); // todo implement dateConstraint
+        return new DateConstraint(constraint);
     }
 
     private static BooleanConstraint booleanConstraint(String constraint) {

Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/DateConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/DateConstraint.java?rev=1382010&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/DateConstraint.java
(added)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/DateConstraint.java
Fri Sep  7 13:16:13 2012
@@ -0,0 +1,55 @@
+/*
+ * 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.jackrabbit.oak.plugins.type.constraint;
+
+import java.util.Calendar;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.jackrabbit.value.DateValue;
+
+public class DateConstraint extends NumericConstraint<Calendar> {
+    public DateConstraint(String definition) {
+        super(definition);
+    }
+
+    @Override
+    protected Calendar getBound(String bound) {
+        try {
+            return DateValue.valueOf(bound).getDate();
+        }
+        catch (RepositoryException e) {
+            throw (NumberFormatException) new NumberFormatException().initCause(e);
+        }
+    }
+
+    @Override
+    protected Calendar getValue(Value value) throws RepositoryException {
+        return value.getDate();
+    }
+
+    @Override
+    protected boolean less(Calendar val, Calendar bound) {
+        return val.getTimeInMillis() < bound.getTimeInMillis();
+    }
+
+    @Override
+    protected boolean equals(Calendar val, Calendar bound) {
+        return val.getTimeInMillis() == bound.getTimeInMillis();
+    }
+}

Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/DateConstraint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/constraint/DateConstraint.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL



Mime
View raw message