diff --git a/CREDITS.txt b/NOTICE.txt
similarity index 100%
rename from CREDITS.txt
rename to NOTICE.txt
diff --git a/build.gradle b/build.gradle
index 0311bf1..c750a0b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ wrapper {
}
ext {
- user = 'xbib'
+ user = 'jprante'
name = 'time'
description = 'A bundle of Chronic, Prettytime, and org.joda.time.format optimized for Java 8 Time API'
inceptionYear = '2016'
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
deleted file mode 100644
index 52fe33c..0000000
--- a/config/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,323 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gradle.properties b/gradle.properties
index 05b4867..529a10f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,8 @@
group = org.xbib
name = time
-version = 2.1.1
+version = 2.2.0
-gradle.wrapper.version = 6.6.1
+org.gradle.warning.mode = ALL
+gradle.wrapper.version = 7.3
quartz.version = 2.3.2
caliper.version = 1.0-beta-2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 33682bb..fbce071 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=`expr $i + 1`
- done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/src/main/java/org/xbib/time/chronic/Options.java b/src/main/java/org/xbib/time/chronic/Options.java
index 6945431..156c0bf 100644
--- a/src/main/java/org/xbib/time/chronic/Options.java
+++ b/src/main/java/org/xbib/time/chronic/Options.java
@@ -1,6 +1,6 @@
package org.xbib.time.chronic;
-import org.xbib.time.chronic.tags.Pointer;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZoneId;
import java.time.ZonedDateTime;
@@ -9,15 +9,21 @@ import java.time.ZonedDateTime;
*
*/
public class Options {
+
private ZonedDateTime now;
+
private ZoneId zoneId;
- private Pointer.PointerType context;
+
+ private PointerType context;
+
private boolean guess;
+
private int ambiguousTimeRange;
+
private boolean compatibilityMode;
public Options() {
- setContext(Pointer.PointerType.FUTURE);
+ setContext(PointerType.FUTURE);
setNow(ZonedDateTime.now());
setZoneId(ZoneId.of("GMT"));
setGuess(true);
@@ -33,11 +39,11 @@ public class Options {
return this;
}
- public Pointer.PointerType getContext() {
+ public PointerType getContext() {
return context;
}
- public Options setContext(Pointer.PointerType context) {
+ public Options setContext(PointerType context) {
this.context = context;
return this;
}
diff --git a/src/main/java/org/xbib/time/chronic/Range.java b/src/main/java/org/xbib/time/chronic/Range.java
index 0bd6239..e626c8f 100644
--- a/src/main/java/org/xbib/time/chronic/Range.java
+++ b/src/main/java/org/xbib/time/chronic/Range.java
@@ -4,8 +4,10 @@ package org.xbib.time.chronic;
*
*/
public class Range {
- private Long begin;
- private Long end;
+
+ private final Long begin;
+
+ private final Long end;
public Range(long begin, long end) {
this.begin = begin;
diff --git a/src/main/java/org/xbib/time/chronic/Tick.java b/src/main/java/org/xbib/time/chronic/Tick.java
index 4bb12d8..a5f7c7c 100644
--- a/src/main/java/org/xbib/time/chronic/Tick.java
+++ b/src/main/java/org/xbib/time/chronic/Tick.java
@@ -4,8 +4,10 @@ package org.xbib.time.chronic;
*
*/
public class Tick {
+
private int time;
- private boolean ambiguous;
+
+ private final boolean ambiguous;
public Tick(int time, boolean ambiguous) {
this.time = time;
diff --git a/src/main/java/org/xbib/time/chronic/Token.java b/src/main/java/org/xbib/time/chronic/Token.java
index c202cb8..9bce09f 100644
--- a/src/main/java/org/xbib/time/chronic/Token.java
+++ b/src/main/java/org/xbib/time/chronic/Token.java
@@ -10,8 +10,10 @@ import java.util.List;
*
*/
public class Token {
- private String word;
- private List> tags;
+
+ private final String word;
+
+ private final List> tags;
public Token(String word) {
this.word = word;
@@ -35,13 +37,7 @@ public class Token {
* @param tagClass tag class
*/
public void untag(Class> tagClass) {
- Iterator> tagIter = tags.iterator();
- while (tagIter.hasNext()) {
- Tag> tag = tagIter.next();
- if (tagClass.isInstance(tag)) {
- tagIter.remove();
- }
- }
+ tags.removeIf(tagClass::isInstance);
}
/**
@@ -58,7 +54,6 @@ public class Token {
* @param type parameter
* @return tag
*/
- @SuppressWarnings("unchecked")
public > T getTag(Class tagClass) {
List matches = getTags(tagClass);
T matchingTag = null;
diff --git a/src/main/java/org/xbib/time/chronic/handlers/Handler.java b/src/main/java/org/xbib/time/chronic/handlers/Handler.java
index 9876fc1..f6a2996 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/Handler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/Handler.java
@@ -3,6 +3,7 @@ package org.xbib.time.chronic.handlers;
import org.xbib.time.chronic.Options;
import org.xbib.time.chronic.Span;
import org.xbib.time.chronic.Token;
+import org.xbib.time.chronic.repeaters.DayPortion;
import org.xbib.time.chronic.repeaters.EnumRepeaterDayPortion;
import org.xbib.time.chronic.repeaters.IntegerRepeaterDayPortion;
import org.xbib.time.chronic.repeaters.Repeater;
@@ -14,7 +15,8 @@ import org.xbib.time.chronic.tags.Grabber;
import org.xbib.time.chronic.tags.Ordinal;
import org.xbib.time.chronic.tags.OrdinalDay;
import org.xbib.time.chronic.tags.Pointer;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
+import org.xbib.time.chronic.tags.Relative;
import org.xbib.time.chronic.tags.Scalar;
import org.xbib.time.chronic.tags.ScalarDay;
import org.xbib.time.chronic.tags.ScalarMonth;
@@ -202,7 +204,7 @@ public class Handler {
}
public static Span getAnchor(List tokens, Options options) {
- Grabber grabber = new Grabber(Grabber.Relative.THIS);
+ Grabber grabber = new Grabber(Relative.THIS);
PointerType pointer = PointerType.FUTURE;
List> repeaters = getRepeaters(tokens);
@@ -219,16 +221,16 @@ public class Handler {
head.setNow(options.getNow());
Span outerSpan;
- Grabber.Relative grabberType = grabber.getType();
- if (grabberType == Grabber.Relative.LAST) {
+ Relative grabberType = grabber.getType();
+ if (grabberType == Relative.LAST) {
outerSpan = head.nextSpan(PointerType.PAST);
- } else if (grabberType == Grabber.Relative.THIS) {
+ } else if (grabberType == Relative.THIS) {
if (!repeaters.isEmpty()) {
outerSpan = head.thisSpan(PointerType.NONE);
} else {
outerSpan = head.thisSpan(options.getContext());
}
- } else if (grabberType == Grabber.Relative.NEXT) {
+ } else if (grabberType == Relative.NEXT) {
outerSpan = head.nextSpan(PointerType.FUTURE);
} else {
throw new IllegalArgumentException("Invalid grabber type " + grabberType + ".");
@@ -296,14 +298,14 @@ public class Handler {
Tag> t1Tag = t1.getTag(RepeaterDayPortion.class);
Object t1TagType = t1Tag.getType();
- if (RepeaterDayPortion.DayPortion.MORNING.equals(t1TagType)) {
+ if (DayPortion.MORNING.equals(t1TagType)) {
t1.untag(RepeaterDayPortion.class);
- t1.tag(new EnumRepeaterDayPortion(RepeaterDayPortion.DayPortion.AM));
- } else if (RepeaterDayPortion.DayPortion.AFTERNOON.equals(t1TagType) ||
- RepeaterDayPortion.DayPortion.EVENING.equals(t1TagType) ||
- RepeaterDayPortion.DayPortion.NIGHT.equals(t1TagType)) {
+ t1.tag(new EnumRepeaterDayPortion(DayPortion.AM));
+ } else if (DayPortion.AFTERNOON.equals(t1TagType) ||
+ DayPortion.EVENING.equals(t1TagType) ||
+ DayPortion.NIGHT.equals(t1TagType)) {
t1.untag(RepeaterDayPortion.class);
- t1.tag(new EnumRepeaterDayPortion(RepeaterDayPortion.DayPortion.PM));
+ t1.tag(new EnumRepeaterDayPortion(DayPortion.PM));
}
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/HandlerPattern.java b/src/main/java/org/xbib/time/chronic/handlers/HandlerPattern.java
index 1aa1584..3700e5a 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/HandlerPattern.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/HandlerPattern.java
@@ -4,7 +4,8 @@ package org.xbib.time.chronic.handlers;
*
*/
public class HandlerPattern {
- private boolean optional;
+
+ private final boolean optional;
public HandlerPattern(boolean optional) {
this.optional = optional;
diff --git a/src/main/java/org/xbib/time/chronic/handlers/HandlerTypePattern.java b/src/main/java/org/xbib/time/chronic/handlers/HandlerTypePattern.java
index 0778db6..51ed90e 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/HandlerTypePattern.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/HandlerTypePattern.java
@@ -4,7 +4,8 @@ package org.xbib.time.chronic.handlers;
*
*/
public class HandlerTypePattern extends HandlerPattern {
- private Handler.HandlerType type;
+
+ private final Handler.HandlerType type;
public HandlerTypePattern(Handler.HandlerType type) {
this(type, false);
diff --git a/src/main/java/org/xbib/time/chronic/handlers/IHandler.java b/src/main/java/org/xbib/time/chronic/handlers/IHandler.java
index bdbc990..5e1070a 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/IHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/IHandler.java
@@ -11,5 +11,6 @@ import java.util.List;
*/
@FunctionalInterface
public interface IHandler {
+
Span handle(List tokens, Options options);
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/ORGRHandler.java b/src/main/java/org/xbib/time/chronic/handlers/ORGRHandler.java
index 52a8e86..76c8249 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/ORGRHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/ORGRHandler.java
@@ -16,5 +16,4 @@ public class ORGRHandler extends ORRHandler {
Span outerSpan = Handler.getAnchor(tokens.subList(2, 4), options);
return handle(tokens.subList(0, 2), outerSpan, options);
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/ORRHandler.java b/src/main/java/org/xbib/time/chronic/handlers/ORRHandler.java
index cd59cb9..c36a454 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/ORRHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/ORRHandler.java
@@ -5,7 +5,7 @@ import org.xbib.time.chronic.Span;
import org.xbib.time.chronic.Token;
import org.xbib.time.chronic.repeaters.Repeater;
import org.xbib.time.chronic.tags.Ordinal;
-import org.xbib.time.chronic.tags.Pointer;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.temporal.ChronoUnit;
import java.util.List;
@@ -21,7 +21,7 @@ public abstract class ORRHandler implements IHandler {
Integer ordinalValue = tokens.get(0).getTag(Ordinal.class).getType();
Span span = null;
for (int i = 0; i < ordinalValue; i++) {
- span = repeater.nextSpan(Pointer.PointerType.FUTURE);
+ span = repeater.nextSpan(PointerType.FUTURE);
if (span.getBegin() > outerSpan.getEnd()) {
span = null;
break;
diff --git a/src/main/java/org/xbib/time/chronic/handlers/ORSRHandler.java b/src/main/java/org/xbib/time/chronic/handlers/ORSRHandler.java
index cf48eb6..a502fa9 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/ORSRHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/ORSRHandler.java
@@ -16,5 +16,4 @@ public class ORSRHandler extends ORRHandler {
Span outerSpan = Handler.getAnchor(tokens.subList(3, 4), options);
return handle(tokens.subList(0, 2), outerSpan, options);
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/RHandler.java b/src/main/java/org/xbib/time/chronic/handlers/RHandler.java
index 25f8cbc..2f5da94 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/RHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/RHandler.java
@@ -16,5 +16,4 @@ public class RHandler implements IHandler {
List ddTokens = Handler.dealiasAndDisambiguateTimes(tokens, options);
return Handler.getAnchor(ddTokens, options);
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/RmnSdSyHandler.java b/src/main/java/org/xbib/time/chronic/handlers/RmnSdSyHandler.java
index 9b23d01..ab9c675 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/RmnSdSyHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/RmnSdSyHandler.java
@@ -30,5 +30,4 @@ public class RmnSdSyHandler implements IHandler {
}
return span;
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/RmnSyHandler.java b/src/main/java/org/xbib/time/chronic/handlers/RmnSyHandler.java
index f9a164f..9670479 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/RmnSyHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/RmnSyHandler.java
@@ -29,5 +29,4 @@ public class RmnSyHandler implements IHandler {
}
return span;
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/SRPAHandler.java b/src/main/java/org/xbib/time/chronic/handlers/SRPAHandler.java
index b373a77..30104b5 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/SRPAHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/SRPAHandler.java
@@ -16,5 +16,4 @@ public class SRPAHandler extends SRPHandler {
Span anchorSpan = Handler.getAnchor(tokens.subList(3, tokens.size()), options);
return super.handle(tokens, anchorSpan, options);
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/SRPHandler.java b/src/main/java/org/xbib/time/chronic/handlers/SRPHandler.java
index 5eca74d..6acbd9b 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/SRPHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/SRPHandler.java
@@ -6,6 +6,7 @@ import org.xbib.time.chronic.Span;
import org.xbib.time.chronic.Token;
import org.xbib.time.chronic.repeaters.Repeater;
import org.xbib.time.chronic.tags.Pointer;
+import org.xbib.time.chronic.tags.PointerType;
import org.xbib.time.chronic.tags.Scalar;
import java.text.ParseException;
@@ -19,7 +20,7 @@ public class SRPHandler implements IHandler {
public Span handle(List tokens, Span span, Options options) {
int distance = tokens.get(0).getTag(Scalar.class).getType();
Repeater> repeater = tokens.get(1).getTag(Repeater.class);
- Pointer.PointerType pointer = tokens.get(2).getTag(Pointer.class).getType();
+ PointerType pointer = tokens.get(2).getTag(Pointer.class).getType();
return repeater.getOffset(span, distance, pointer);
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/SdRmnSyHandler.java b/src/main/java/org/xbib/time/chronic/handlers/SdRmnSyHandler.java
index e7c36ed..180cbf5 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/SdRmnSyHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/SdRmnSyHandler.java
@@ -21,5 +21,4 @@ public class SdRmnSyHandler extends RmnSdSyHandler {
newTokens.addAll(tokens.subList(3, tokens.size()));
return super.handle(newTokens, options);
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/SmSdHandler.java b/src/main/java/org/xbib/time/chronic/handlers/SmSdHandler.java
index 399a809..c292d80 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/SmSdHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/SmSdHandler.java
@@ -23,5 +23,4 @@ public class SmSdHandler implements IHandler {
ZonedDateTime end = start.plus(1, ChronoUnit.MONTHS);
return new Span(start, end);
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/SmSdSyHandler.java b/src/main/java/org/xbib/time/chronic/handlers/SmSdSyHandler.java
index 7ea64d2..2df38fc 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/SmSdSyHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/SmSdSyHandler.java
@@ -30,5 +30,4 @@ public class SmSdSyHandler implements IHandler {
}
return span;
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/SmSyHandler.java b/src/main/java/org/xbib/time/chronic/handlers/SmSyHandler.java
index 7144d82..d2faefa 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/SmSyHandler.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/SmSyHandler.java
@@ -29,5 +29,4 @@ public class SmSyHandler implements IHandler {
}
return span;
}
-
}
diff --git a/src/main/java/org/xbib/time/chronic/handlers/TagPattern.java b/src/main/java/org/xbib/time/chronic/handlers/TagPattern.java
index fc06b5f..51d8ab2 100644
--- a/src/main/java/org/xbib/time/chronic/handlers/TagPattern.java
+++ b/src/main/java/org/xbib/time/chronic/handlers/TagPattern.java
@@ -7,7 +7,8 @@ import org.xbib.time.chronic.tags.Tag;
*/
@SuppressWarnings("rawtypes")
public class TagPattern extends HandlerPattern {
- private Class extends Tag> tagClass;
+
+ private final Class extends Tag> tagClass;
public TagPattern(Class extends Tag> tagClass) {
this(tagClass, false);
diff --git a/src/main/java/org/xbib/time/chronic/numerizer/Numerizer.java b/src/main/java/org/xbib/time/chronic/numerizer/Numerizer.java
index 6380623..39355f0 100644
--- a/src/main/java/org/xbib/time/chronic/numerizer/Numerizer.java
+++ b/src/main/java/org/xbib/time/chronic/numerizer/Numerizer.java
@@ -48,7 +48,7 @@ public class Numerizer {
directNums.add(new DirectNum("nine(\\W|$)", "9$1"));
directNums.add(new DirectNum("ten", "10"));
directNums.add(new DirectNum("\\ba\\b", "1"));
- DIRECT_NUMS = directNums.toArray(new DirectNum[directNums.size()]);
+ DIRECT_NUMS = directNums.toArray(new DirectNum[0]);
List tenPrefixes = new LinkedList<>();
tenPrefixes.add(new TenPrefix("twenty", 20));
@@ -60,7 +60,7 @@ public class Numerizer {
tenPrefixes.add(new TenPrefix("eighty", 80));
tenPrefixes.add(new TenPrefix("ninety", 90));
tenPrefixes.add(new TenPrefix("ninty", 90));
- TEN_PREFIXES = tenPrefixes.toArray(new TenPrefix[tenPrefixes.size()]);
+ TEN_PREFIXES = tenPrefixes.toArray(new TenPrefix[0]);
List bigPrefixes = new LinkedList<>();
bigPrefixes.add(new BigPrefix("hundred", 100L));
@@ -68,7 +68,7 @@ public class Numerizer {
bigPrefixes.add(new BigPrefix("million", 1000000L));
bigPrefixes.add(new BigPrefix("billion", 1000000000L));
bigPrefixes.add(new BigPrefix("trillion", 1000000000000L));
- BIG_PREFIXES = bigPrefixes.toArray(new BigPrefix[bigPrefixes.size()]);
+ BIG_PREFIXES = bigPrefixes.toArray(new BigPrefix[0]);
}
public static String numerize(String str) {
@@ -81,7 +81,7 @@ public class Numerizer {
for (Prefix tp : Numerizer.TEN_PREFIXES) {
Matcher matcher = tp.getName().matcher(numerizedStr);
if (matcher.find()) {
- StringBuffer matcherBuffer = new StringBuffer();
+ StringBuilder matcherBuffer = new StringBuilder();
do {
if (matcher.group(1) == null) {
matcher.appendReplacement(matcherBuffer, String.valueOf(tp.getNumber()));
@@ -97,7 +97,7 @@ public class Numerizer {
for (Prefix bp : Numerizer.BIG_PREFIXES) {
Matcher matcher = bp.getName().matcher(numerizedStr);
if (matcher.find()) {
- StringBuffer matcherBuffer = new StringBuffer();
+ StringBuilder matcherBuffer = new StringBuilder();
do {
if (matcher.group(1) == null) {
matcher.appendReplacement(matcherBuffer, String.valueOf(bp.getNumber()));
@@ -113,7 +113,7 @@ public class Numerizer {
}
Matcher matcher = Numerizer.DEHAALFER.matcher(numerizedStr);
if (matcher.find()) {
- StringBuffer matcherBuffer = new StringBuffer();
+ StringBuilder matcherBuffer = new StringBuilder();
do {
matcher.appendReplacement(matcherBuffer,
String.valueOf(Float.parseFloat(matcher.group(1).trim()) + 0.5f));
@@ -142,8 +142,10 @@ public class Numerizer {
*
*/
private static class DirectNum {
- private Pattern name;
- private String number;
+
+ private final Pattern name;
+
+ private final String number;
DirectNum(String name, String number) {
this.name = Pattern.compile(name, Pattern.CASE_INSENSITIVE);
@@ -163,8 +165,10 @@ public class Numerizer {
*
*/
static class Prefix {
- private Pattern name;
- private long number;
+
+ private final Pattern name;
+
+ private final long number;
Prefix(Pattern name, long number) {
this.name = name;
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/DayName.java b/src/main/java/org/xbib/time/chronic/repeaters/DayName.java
new file mode 100644
index 0000000..75dc09e
--- /dev/null
+++ b/src/main/java/org/xbib/time/chronic/repeaters/DayName.java
@@ -0,0 +1,8 @@
+package org.xbib.time.chronic.repeaters;
+
+/**
+ *
+ */
+public enum DayName {
+ MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY
+}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/DayPortion.java b/src/main/java/org/xbib/time/chronic/repeaters/DayPortion.java
new file mode 100644
index 0000000..cf8b34f
--- /dev/null
+++ b/src/main/java/org/xbib/time/chronic/repeaters/DayPortion.java
@@ -0,0 +1,8 @@
+package org.xbib.time.chronic.repeaters;
+
+/**
+ *
+ */
+public enum DayPortion {
+ AM, PM, MORNING, AFTERNOON, EVENING, NIGHT
+}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/EnumRepeaterDayPortion.java b/src/main/java/org/xbib/time/chronic/repeaters/EnumRepeaterDayPortion.java
index 212a12e..581b8c7 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/EnumRepeaterDayPortion.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/EnumRepeaterDayPortion.java
@@ -5,12 +5,18 @@ import org.xbib.time.chronic.Range;
/**
*
*/
-public class EnumRepeaterDayPortion extends RepeaterDayPortion {
+public class EnumRepeaterDayPortion extends RepeaterDayPortion {
+
private static final Range AM_RANGE = new Range(0, 12 * 60 * 60); // 12am-12pm
+
private static final Range PM_RANGE = new Range(12 * 60 * 60, 24 * 60 * 60 - 1); // 12pm-12am
+
private static final Range MORNING_RANGE = new Range(6 * 60 * 60, 12 * 60 * 60); // 6am-12pm
+
private static final Range AFTERNOON_RANGE = new Range(13 * 60 * 60, 17 * 60 * 60); // 1pm-5pm
+
private static final Range EVENING_RANGE = new Range(17 * 60 * 60, 20 * 60 * 60); // 5pm-8pm
+
private static final Range NIGHT_RANGE = new Range(20 * 60 * 60, 24 * 60 * 60); // 8pm-12pm
public EnumRepeaterDayPortion(DayPortion type) {
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/IntegerRepeaterDayPortion.java b/src/main/java/org/xbib/time/chronic/repeaters/IntegerRepeaterDayPortion.java
index 21e1811..ef0aea0 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/IntegerRepeaterDayPortion.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/IntegerRepeaterDayPortion.java
@@ -6,6 +6,7 @@ import org.xbib.time.chronic.Range;
*
*/
public class IntegerRepeaterDayPortion extends RepeaterDayPortion {
+
public IntegerRepeaterDayPortion(Integer type) {
super(type);
}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/MonthName.java b/src/main/java/org/xbib/time/chronic/repeaters/MonthName.java
new file mode 100644
index 0000000..48143f8
--- /dev/null
+++ b/src/main/java/org/xbib/time/chronic/repeaters/MonthName.java
@@ -0,0 +1,9 @@
+package org.xbib.time.chronic.repeaters;
+
+/**
+ *
+ */
+public enum MonthName {
+ ZEROMONTH_DO_NOT_REMOVE,
+ JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER
+}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/Repeater.java b/src/main/java/org/xbib/time/chronic/repeaters/Repeater.java
index 40bb080..90baae5 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/Repeater.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/Repeater.java
@@ -3,7 +3,7 @@ package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Options;
import org.xbib.time.chronic.Span;
import org.xbib.time.chronic.Token;
-import org.xbib.time.chronic.tags.Pointer;
+import org.xbib.time.chronic.tags.PointerType;
import org.xbib.time.chronic.tags.Tag;
import java.util.List;
@@ -65,25 +65,25 @@ public abstract class Repeater extends Tag implements Comparable {
+public class RepeaterDayName extends Repeater {
+
private static final int DAY_SECONDS = 86400;
+
private static final Pattern MON_PATTERN = Pattern.compile("^m[ou]n(day)?$");
+
private static final Pattern TUE_PATTERN = Pattern.compile("^t(ue|eu|oo|u|)s(day)?$");
+
private static final Pattern TUE_PATTERN_1 = Pattern.compile("^tue$");
+
private static final Pattern WED_PATTERN_1 = Pattern.compile("^we(dnes|nds|nns)day$");
+
private static final Pattern WED_PATTERN_2 = Pattern.compile("^wed$");
+
private static final Pattern THU_PATTERN_1 = Pattern.compile("^th(urs|ers)day$");
+
private static final Pattern THU_PATTERN_2 = Pattern.compile("^thu$");
+
private static final Pattern FRI_PATTERN = Pattern.compile("^fr[iy](day)?$");
+
private static final Pattern SAT_PATTERN = Pattern.compile("^sat(t?[ue]rday)?$");
+
private static final Pattern SUN_PATTERN = Pattern.compile("^su[nm](day)?$");
+
private ZonedDateTime currentDayStart;
public RepeaterDayName(DayName type) {
@@ -106,10 +118,4 @@ public class RepeaterDayName extends Repeater {
return super.toString() + "-dayname-" + getType();
}
- /**
- *
- */
- public enum DayName {
- MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY
- }
}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterDayPortion.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterDayPortion.java
index 6054dba..18ca47e 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterDayPortion.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterDayPortion.java
@@ -3,7 +3,7 @@ package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Range;
import org.xbib.time.chronic.Span;
import org.xbib.time.chronic.Token;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -18,14 +18,21 @@ import java.util.regex.Pattern;
public abstract class RepeaterDayPortion extends Repeater {
private static final Pattern AM_PATTERN = Pattern.compile("^ams?$");
+
private static final Pattern PM_PATTERN = Pattern.compile("^pms?$");
+
private static final Pattern MORNING_PATTERN = Pattern.compile("^mornings?$");
+
private static final Pattern AFTERNOON_PATTERN = Pattern.compile("^afternoons?$");
+
private static final Pattern EVENING_PATTERN = Pattern.compile("^evenings?$");
+
private static final Pattern NIGHT_PATTERN = Pattern.compile("^(night|nite)s?$");
private static final int FULL_DAY_SECONDS = 60 * 60 * 24;
- private Range range;
+
+ private final Range range;
+
private Span currentSpan;
public RepeaterDayPortion(T type) {
@@ -149,10 +156,4 @@ public abstract class RepeaterDayPortion extends Repeater {
return super.toString() + "-dayportion-" + getType();
}
- /**
- *
- */
- public enum DayPortion {
- AM, PM, MORNING, AFTERNOON, EVENING, NIGHT
- }
}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterFortnight.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterFortnight.java
index 982905f..da9d212 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterFortnight.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterFortnight.java
@@ -1,7 +1,7 @@
package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Span;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -10,6 +10,7 @@ import java.time.temporal.ChronoUnit;
*
*/
public class RepeaterFortnight extends RepeaterUnit {
+
public static final int FORTNIGHT_SECONDS = 1209600; // (14 * 24 * 60 * 60)
private ZonedDateTime currentFortnightStart;
@@ -23,12 +24,12 @@ public class RepeaterFortnight extends RepeaterUnit {
protected Span internalNextSpan(PointerType pointer) {
if (currentFortnightStart == null) {
if (pointer == PointerType.FUTURE) {
- RepeaterDayName sundayRepeater = new RepeaterDayName(RepeaterDayName.DayName.SUNDAY);
+ RepeaterDayName sundayRepeater = new RepeaterDayName(DayName.SUNDAY);
sundayRepeater.setNow(getNow());
Span nextSundaySpan = sundayRepeater.nextSpan(PointerType.FUTURE);
currentFortnightStart = nextSundaySpan.getBeginCalendar();
} else if (pointer == PointerType.PAST) {
- RepeaterDayName sundayRepeater = new RepeaterDayName(RepeaterDayName.DayName.SUNDAY);
+ RepeaterDayName sundayRepeater = new RepeaterDayName(DayName.SUNDAY);
sundayRepeater.setNow(getNow().plus(RepeaterDay.DAY_SECONDS, ChronoUnit.SECONDS));
sundayRepeater.nextSpan(PointerType.PAST);
sundayRepeater.nextSpan(PointerType.PAST);
@@ -55,7 +56,7 @@ public class RepeaterFortnight extends RepeaterUnit {
Span span;
if (pointer == PointerType.FUTURE) {
ZonedDateTime thisFortnightStart = ymdh(getNow()).plus(RepeaterHour.HOUR_SECONDS, ChronoUnit.SECONDS);
- RepeaterDayName sundayRepeater = new RepeaterDayName(RepeaterDayName.DayName.SUNDAY);
+ RepeaterDayName sundayRepeater = new RepeaterDayName(DayName.SUNDAY);
sundayRepeater.setNow(getNow());
sundayRepeater.thisSpan(PointerType.FUTURE);
Span thisSundaySpan = sundayRepeater.thisSpan(PointerType.FUTURE);
@@ -63,7 +64,7 @@ public class RepeaterFortnight extends RepeaterUnit {
span = new Span(thisFortnightStart, thisFortnightEnd);
} else if (pointer == PointerType.PAST) {
ZonedDateTime thisFortnightEnd = ymdh(getNow());
- RepeaterDayName sundayRepeater = new RepeaterDayName(RepeaterDayName.DayName.SUNDAY);
+ RepeaterDayName sundayRepeater = new RepeaterDayName(DayName.SUNDAY);
sundayRepeater.setNow(getNow());
Span lastSundaySpan = sundayRepeater.nextSpan(PointerType.PAST);
ZonedDateTime thisFortnightStart = lastSundaySpan.getBeginCalendar();
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterHour.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterHour.java
index d44e78c..5880ad5 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterHour.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterHour.java
@@ -1,7 +1,7 @@
package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Span;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -10,6 +10,7 @@ import java.time.temporal.ChronoUnit;
*
*/
public class RepeaterHour extends RepeaterUnit {
+
public static final int HOUR_SECONDS = 3600;
private ZonedDateTime currentDayStart;
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMinute.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMinute.java
index 8e704a2..7523e4d 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMinute.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMinute.java
@@ -1,7 +1,7 @@
package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Span;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -10,6 +10,7 @@ import java.time.temporal.ChronoUnit;
*
*/
public class RepeaterMinute extends RepeaterUnit {
+
public static final int MINUTE_SECONDS = 60;
private ZonedDateTime currentMinuteStart;
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonth.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonth.java
index 608c700..a87f955 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonth.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonth.java
@@ -1,7 +1,7 @@
package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Span;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -10,6 +10,7 @@ import java.time.temporal.ChronoUnit;
*
*/
public class RepeaterMonth extends RepeaterUnit {
+
private static final int MONTH_SECONDS = 2592000; // 30 * 24 * 60 * 60
private ZonedDateTime currentMonthStart;
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonthName.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonthName.java
index 2ecb5fd..397af5c 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonthName.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterMonthName.java
@@ -2,7 +2,7 @@ package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Span;
import org.xbib.time.chronic.Token;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -13,21 +13,34 @@ import java.util.regex.Pattern;
/**
*
*/
-public class RepeaterMonthName extends Repeater {
+public class RepeaterMonthName extends Repeater {
+
private static final Pattern JAN_PATTERN = Pattern.compile("^jan\\.?(uary)?$");
+
private static final Pattern FEB_PATTERN = Pattern.compile("^feb\\.?(ruary)?$");
+
private static final Pattern MAR_PATTERN = Pattern.compile("^mar\\.?(ch)?$");
+
private static final Pattern APR_PATTERN = Pattern.compile("^apr\\.?(il)?$");
+
private static final Pattern MAY_PATTERN = Pattern.compile("^may$");
+
private static final Pattern JUN_PATTERN = Pattern.compile("^jun\\.?e?$");
+
private static final Pattern JUL_PATTERN = Pattern.compile("^jul\\.?y?$");
+
private static final Pattern AUG_PATTERN = Pattern.compile("^aug\\.?(ust)?$");
+
private static final Pattern SEP_PATTERN = Pattern.compile("^sep\\.?(t\\.?|tember)?$");
+
private static final Pattern OCT_PATTERN = Pattern.compile("^oct\\.?(ober)?$");
+
private static final Pattern NOV_PATTERN = Pattern.compile("^nov\\.?(ember)?$");
+
private static final Pattern DEC_PATTERN = Pattern.compile("^dec\\.?(ember)?$");
private static final int MONTH_SECONDS = 2592000; // 30 * 24 * 60 * 60
+
private ZonedDateTime currentMonthBegin;
public RepeaterMonthName(MonthName type) {
@@ -146,12 +159,4 @@ public class RepeaterMonthName extends Repeater {
return super.toString() + "-monthname-" + getType();
}
- /**
- *
- */
- public enum MonthName {
- ZEROMONTH_DO_NOT_REMOVE,
- JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER
- }
-
}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterSecond.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterSecond.java
index 12685d1..2b2ba81 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterSecond.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterSecond.java
@@ -1,7 +1,7 @@
package org.xbib.time.chronic.repeaters;
import org.xbib.time.chronic.Span;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -10,6 +10,7 @@ import java.time.temporal.ChronoUnit;
*
*/
public class RepeaterSecond extends RepeaterUnit {
+
private static final int SECOND_SECONDS = 1;
private ZonedDateTime secondStart;
@@ -22,7 +23,6 @@ public class RepeaterSecond extends RepeaterUnit {
} else {
secondStart = secondStart.plus(direction, ChronoUnit.SECONDS);
}
-
return new Span(secondStart, ChronoUnit.SECONDS, 1);
}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterTime.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterTime.java
index fad681d..bcf43f9 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterTime.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterTime.java
@@ -4,7 +4,7 @@ import org.xbib.time.chronic.Options;
import org.xbib.time.chronic.Span;
import org.xbib.time.chronic.Tick;
import org.xbib.time.chronic.Token;
-import org.xbib.time.chronic.tags.Pointer.PointerType;
+import org.xbib.time.chronic.tags.PointerType;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
@@ -16,13 +16,17 @@ import java.util.regex.Pattern;
*
*/
public class RepeaterTime extends Repeater {
+
private static final Pattern TIME_PATTERN = Pattern.compile("^\\d{1,2}(:?\\d{2})?([\\.:]?\\d{2})?$");
+
private ZonedDateTime currentTime;
public RepeaterTime(String time) {
super(null);
String t = time.replaceAll(":", "");
Tick type;
+ boolean ambiguous = time.contains(":") && Integer.parseInt(t.substring(0, 1)) != 0 &&
+ Integer.parseInt(t.substring(0, 2)) <= 12;
int length = t.length();
if (length <= 2) {
int hours = Integer.parseInt(t);
@@ -37,8 +41,6 @@ public class RepeaterTime extends Repeater {
int minutesInSeconds = Integer.parseInt(t.substring(1)) * 60;
type = new Tick(hoursInSeconds + minutesInSeconds, true);
} else if (length == 4) {
- boolean ambiguous = time.contains(":") && Integer.parseInt(t.substring(0, 1)) != 0 &&
- Integer.parseInt(t.substring(0, 2)) <= 12;
int hours = Integer.parseInt(t.substring(0, 2));
int hoursInSeconds = hours * 60 * 60;
int minutesInSeconds = Integer.parseInt(t.substring(2)) * 60;
@@ -53,8 +55,6 @@ public class RepeaterTime extends Repeater {
int seconds = Integer.parseInt(t.substring(3));
type = new Tick(hoursInSeconds + minutesInSeconds + seconds, true);
} else if (length == 6) {
- boolean ambiguous = time.contains(":") && Integer.parseInt(t.substring(0, 1)) != 0 &&
- Integer.parseInt(t.substring(0, 2)) <= 12;
int hours = Integer.parseInt(t.substring(0, 2));
int hoursInSeconds = hours * 60 * 60;
int minutesInSeconds = Integer.parseInt(t.substring(2, 4)) * 60;
@@ -84,30 +84,31 @@ public class RepeaterTime extends Repeater {
private static Integer integerValue(String str) {
if (str != null) {
String s = str.toLowerCase();
- if ("one".equals(s)) {
- return 1;
- } else if ("two".equals(s)) {
- return 2;
- } else if ("three".equals(s)) {
- return 3;
- } else if ("four".equals(s)) {
- return 4;
- } else if ("five".equals(s)) {
- return 5;
- } else if ("six".equals(s)) {
- return 6;
- } else if ("seven".equals(s)) {
- return 7;
- } else if ("eight".equals(s)) {
- return 8;
- } else if ("nine".equals(s)) {
- return 9;
- } else if ("ten".equals(s)) {
- return 10;
- } else if ("eleven".equals(s)) {
- return 11;
- } else if ("twelve".equals(s)) {
- return 12;
+ switch (s) {
+ case "one":
+ return 1;
+ case "two":
+ return 2;
+ case "three":
+ return 3;
+ case "four":
+ return 4;
+ case "five":
+ return 5;
+ case "six":
+ return 6;
+ case "seven":
+ return 7;
+ case "eight":
+ return 8;
+ case "nine":
+ return 9;
+ case "ten":
+ return 10;
+ case "eleven":
+ return 11;
+ case "twelve":
+ return 12;
}
}
return null;
@@ -158,8 +159,8 @@ public class RepeaterTime extends Repeater {
}
}
} else {
+ List pastDates = new LinkedList<>();
if (tick.isAmbiguous()) {
- List pastDates = new LinkedList<>();
pastDates.add(midnight.plus(halfDay + (long) tick.intValue(), ChronoUnit.SECONDS));
pastDates.add(midnight.plus(tick.intValue(), ChronoUnit.SECONDS));
pastDates.add(yesterdayMidnight.plus(tick.intValue() * 2L, ChronoUnit.SECONDS));
@@ -171,7 +172,6 @@ public class RepeaterTime extends Repeater {
}
}
} else {
- List pastDates = new LinkedList<>();
pastDates.add(midnight.plus(tick.intValue(), ChronoUnit.SECONDS));
pastDates.add(yesterdayMidnight.plus(tick.intValue(), ChronoUnit.SECONDS));
for (ZonedDateTime pastDate : pastDates) {
@@ -183,18 +183,15 @@ public class RepeaterTime extends Repeater {
}
}
}
-
if (!done && currentTime == null) {
throw new IllegalStateException("Current time cannot be null at this point.");
}
}
-
if (!first) {
int increment = tick.isAmbiguous() ? halfDay : fullDay;
long direction = pointer == PointerType.FUTURE ? 1L : -1L;
currentTime = currentTime.plus(direction * increment, ChronoUnit.SECONDS);
}
-
return new Span(currentTime, currentTime.plus(getWidth(), ChronoUnit.SECONDS));
}
diff --git a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterUnit.java b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterUnit.java
index d758ce5..d32e08f 100644
--- a/src/main/java/org/xbib/time/chronic/repeaters/RepeaterUnit.java
+++ b/src/main/java/org/xbib/time/chronic/repeaters/RepeaterUnit.java
@@ -10,14 +10,23 @@ import java.util.regex.Pattern;
*
*/
public abstract class RepeaterUnit extends Repeater