svn commit: r1659954 - in /oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions: LastModifiedCheckComparator.java ProductNameCheckComparator.java

[ma...@apache.org]

Author: mattmann
Date: Sun Feb 15 17:35:25 2015
New Revision: 1659954

URL: http://svn.apache.org/r1659954
Log:
Fix for OODT-810 Metadata PreCondition Comparators based on FileName and LastModified time contributed by Luca Cinquini.

Added:
    oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java
    oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java

Added: oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java
URL: http://svn.apache.org/viewvc/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java?rev=1659954&view=auto
==============================================================================
--- oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java (added)
+++ oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/LastModifiedCheckComparator.java Sun Feb 15 17:35:25 2015
@@ -0,0 +1,72 @@
+/*
+ * 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.oodt.cas.metadata.preconditions;
+
+//JDK imports
+import java.io.File;
+import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+//OODT imports
+import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
+import org.apache.oodt.cas.metadata.preconditions.ExistanceCheckComparator;
+import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator;
+
+/**
+ * Precondition class that checks on the last modification time of a product, 
+ * requiring the product to be no older than a given time (in seconds).
+ * 
+ * @author Luca Cinquini
+ *
+ */
+public class LastModifiedCheckComparator extends PreConditionComparator<Boolean> {
+	
+	private static final Logger LOG = Logger.getLogger(ExistanceCheckComparator.class.getName());
+	
+	private long maxAgeInSeconds = Long.MAX_VALUE;
+
+	public void setMaxAgeInSeconds(long maxAgeInSeconds) {
+		this.maxAgeInSeconds = maxAgeInSeconds;
+	}
+	
+
+	@Override
+	protected int performCheck(File product, Boolean compareItem) throws PreconditionComparatorException {
+		
+		// check product last modification time
+		long now = System.currentTimeMillis();
+		long lastModTime = product.lastModified();
+		long deltaInSecs = (now-lastModTime)/1000;
+		
+		// reject this product
+		if (deltaInSecs>maxAgeInSeconds) {
+			LOG.log(Level.FINEST, "Product: "+product.getAbsolutePath()+" fails 'Last Modified' check: "+new Date(lastModTime));
+			return new Boolean(false).compareTo(compareItem);
+			
+		// accept this product
+		} else {
+			LOG.log(Level.FINEST, "Product: "+product.getAbsolutePath()+" passes 'Last Modified' check: "+new Date(lastModTime));
+			return new Boolean(true).compareTo(compareItem);
+			
+		}
+		
+	}
+
+}

Added: oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java
URL: http://svn.apache.org/viewvc/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java?rev=1659954&view=auto
==============================================================================
--- oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java (added)
+++ oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ProductNameCheckComparator.java Sun Feb 15 17:35:25 2015
@@ -0,0 +1,78 @@
+/*
+ * 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.oodt.cas.metadata.preconditions;
+
+//JDK imports
+import java.io.File;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+//OODT imports
+import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
+import org.apache.oodt.cas.metadata.preconditions.ExistanceCheckComparator;
+import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator;
+
+//Spring imports
+import org.springframework.util.StringUtils;
+
+/**
+ * Precondition class that checks the product name (i.e. the directory name)
+ * versus the regular expression defined by the environmental variable "PNC_REGEX".
+ * 
+ * @author Luca Cinquini
+ *
+ */
+public class ProductNameCheckComparator extends PreConditionComparator<Boolean> {
+	
+	private static final Logger LOG = Logger.getLogger(ExistanceCheckComparator.class.getName());
+	
+	private final static String PNC_REGEX = "PNC_REGEX";
+	
+	private final Pattern pattern;
+	
+	public ProductNameCheckComparator() {
+		
+		String regex = System.getenv(PNC_REGEX);
+		if (!StringUtils.hasText(regex)) {
+			regex = ".*"; // default regular expression matches everything
+		}
+		pattern = Pattern.compile(regex);
+	}
+	
+
+	@Override
+	protected int performCheck(File product, Boolean compareItem) throws PreconditionComparatorException {
+		
+		LOG.log(Level.FINEST, "Comparing product: "+product.getName()+" versus regex: "+pattern.toString());
+		
+		Matcher matcher = pattern.matcher(product.getName());
+		if (matcher.matches()) {
+			LOG.log(Level.FINEST, "Product: "+product.getName()+" passes 'regex' check: "+pattern.toString());
+			return new Boolean(true).compareTo(compareItem);
+		} else {
+
+			LOG.log(Level.FINEST, "Product: "+product.getName()+" failed 'regex' check: "+pattern.toString());
+			return new Boolean(false).compareTo(compareItem);
+		}
+
+	}
+
+}