← Back to branch summary

~ubuntu-branches/ubuntu/trusty/jenkins/trusty

« back to all changes in this revision

Viewing changes to core/src/main/java/jenkins/util/TimeDuration.java

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - Fixes the following security vulnerabilities:
    CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
* De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
  (Closes: #701163):
  - d/control: Add dependency between jenkins-external-job-monitor ->
    libjenkins-java.
  - d/rules: 
    Drop installation of jenkins-core in jenkins-external-job-monitor.
  - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
    in /usr/share/java instead of included version.
* Wait longer for jenkins to stop during restarts (Closes: #704848):
  - d/jenkins.init: Re-sync init script from upstream codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/java/jenkins/util/TimeDuration.java
 
1
package jenkins.util;
 
2
 
 
3
import org.apache.commons.beanutils.Converter;
 
4
import org.kohsuke.stapler.QueryParameter;
 
5
 
 
6
import java.util.concurrent.TimeUnit;
 
7
 
 
8
/**
 
9
 * Represents a length of something, like "3 seconds"
 
10
 *
 
11
 * This supports parameter injection, such as via {@link QueryParameter}.
 
12
 *
 
13
 * @author Kohsuke Kawaguchi
 
14
 * @since 1.489
 
15
 */
 
16
public class TimeDuration {
 
17
    private final long millis;
 
18
 
 
19
    public TimeDuration(long millis) {
 
20
        this.millis = millis;
 
21
    }
 
22
 
 
23
    public int getTime() {
 
24
        return (int)millis;
 
25
    }
 
26
 
 
27
    public long getTimeInMillis() {
 
28
        return millis;
 
29
    }
 
30
 
 
31
    public long as(TimeUnit t) {
 
32
        return t.convert(millis,TimeUnit.MILLISECONDS);
 
33
    }
 
34
 
 
35
    public static TimeDuration fromString(String delay) {
 
36
        if (delay==null)
 
37
            return null;
 
38
 
 
39
        try {
 
40
            // TODO: more unit handling
 
41
            if(delay.endsWith("sec"))   delay=delay.substring(0,delay.length()-3);
 
42
            if(delay.endsWith("secs"))  delay=delay.substring(0,delay.length()-4);
 
43
            return new TimeDuration(Long.parseLong(delay));
 
44
        } catch (NumberFormatException e) {
 
45
            throw new IllegalArgumentException("Invalid time duration value: "+delay);
 
46
        }
 
47
    }
 
48
 
 
49
    public static class StaplerConverterImpl implements Converter {
 
50
        public Object convert(Class type, Object value) {
 
51
            if (value==null)
 
52
                return null;
 
53
            if (value instanceof String) {
 
54
                return fromString((String) value);
 
55
            }
 
56
            throw new UnsupportedOperationException();
 
57
        }
 
58
    }
 
59
}