diff --git a/WHATSNEW b/WHATSNEW index f93d0af2b..096cd341d 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -6,6 +6,8 @@ Other changes: * generatekey task now supports SubjectAlternativeName during key generation. + * the selector has a new built-in algorithm 'lastmodified' + which computes a value based upon the lastmodified time of the file. Changes from Ant 1.10.4 TO Ant 1.10.5 ===================================== @@ -62,7 +64,7 @@ Fixed bugs: * died with a NullPointerException since Ant 1.10.2. Bugzilla Report 62335 - * The task would fail with + * The task would fail with "java.lang.ClassFormatError: Invalid Constant Pool entry Type 19" while parsing a module-info.class. The task is compatible with Java bytecode version 53 now. diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html index ca2213a71..93d87f050 100644 --- a/manual/Types/selectors.html +++ b/manual/Types/selectors.html @@ -633,6 +633,7 @@
  • hashvalue—HashvalueAlgorithm
  • digest—DigestAlgorithm
  • checksum—ChecksumAlgorithm
  • +
  • lastmodified—LastModifiedAlgorithm
  • No; defaults to digest @@ -747,6 +748,10 @@ + + lastmodified + Uses the lastModified property of a file. No additional configuration is required. +
    cache

    Same as cache attribute, with the following additional values:

    diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/LastModifiedAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/LastModifiedAlgorithm.java new file mode 100644 index 000000000..af8358a64 --- /dev/null +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/LastModifiedAlgorithm.java @@ -0,0 +1,53 @@ +/* + * 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.tools.ant.types.selectors.modifiedselector; + +import java.io.File; + +/** + * Computes a 'timestamp' of file based on the lastModified time of that file. + * + * @version 2018-07-25 + * @since Ant 1.10.6 and 1.9.14 + */ +public class LastModifiedAlgorithm implements Algorithm { + + /** + * This algorithm doesn't need any configuration. + * Therefore it's always valid. + * @return always true + */ + public boolean isValid() { + return true; + } + + /** + * Computes a 'timestamp' for a file based on the lastModified time. + * @param file The file for which the value should be computed + * @return the timestamp or null if the timestamp couldn't be computed + */ + public String getValue(File file) { + long lastModified = file.lastModified(); + if (lastModified == 0L) { + return null; + } + + return Long.toString(lastModified); + } +} diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java index 30c28ec06..181642c14 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java @@ -325,6 +325,8 @@ public class ModifiedSelector extends BaseExtendSelector algorithm = new DigestAlgorithm(); } else if ("checksum".equals(algoName.getValue())) { algorithm = new ChecksumAlgorithm(); + } else if ("lastmodified".equals(algoName.getValue())) { + algorithm = new LastModifiedAlgorithm(); } } else if (algorithmClass != null) { // use Algorithm specified by classname @@ -913,7 +915,7 @@ public class ModifiedSelector extends BaseExtendSelector /** * The enumerated type for algorithm. - * The values are "hashValue", "digest" and "checksum". + * The values are "hashValue", "digest", "checksum" and "lastmodified". */ public static class AlgorithmName extends EnumeratedAttribute { /** @@ -922,7 +924,7 @@ public class ModifiedSelector extends BaseExtendSelector */ @Override public String[] getValues() { - return new String[] {"hashvalue", "digest", "checksum"}; + return new String[] {"hashvalue", "digest", "checksum", "lastmodified"}; } }