Minor refactoring

Jenkinsfile

@@ -0,0 +1,4 @@
+#!/usr/bin/env groovy
+
+/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
+buildPlugin()

pom.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jenkins-ci.plugins</groupId>
-    <artifactId>plugin</artifactId>
-    <version>1.580.3</version>
-  </parent>
+    <parent>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>plugin</artifactId>
+        <version>2.29</version>
+    </parent>
+
+    <artifactId>disk-usage</artifactId>
+    <packaging>hpi</packaging>
+    <name>Jenkins disk-usage plugin</name>
+    <version>0.29-SNAPSHOT</version>
+    <url>http://wiki.jenkins-ci.org/display/JENKINS/Disk+Usage+Plugin</url>
+
+    <properties>
+        <jenkins.version>1.650</jenkins.version>
+    </properties>
 
-  <artifactId>disk-usage</artifactId>
-  <packaging>hpi</packaging>
-  <name>Jenkins disk-usage plugin</name>
-  <version>0.29-SNAPSHOT</version>
-  <url>http://wiki.jenkins-ci.org/display/JENKINS/Disk+Usage+Plugin</url>
 
-  <developers>
-    <developer>
-      <id>lvotypko</id>
-      <name>Lucie Votypkova</name>
-    </developer>
-  </developers>
+  <developers/>
 
   <scm>
     <connection>scm:git:git://github.com/jenkinsci/disk-usage-plugin.git</connection>
@@ -46,6 +46,18 @@
         <artifactId>mailer</artifactId>
         <version>1.8</version>
     </dependency>
+    <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>matrix-project</artifactId>
+        <version>1.6</version>
+        <scope>test</scope>
+    </dependency>
+     <!-- <dependency>
+          <groupId>org.jenkins-ci.plugins</groupId>
+          <artifactId>jobConfigHistory</artifactId>
+          <version>2.16</version>
+          <scope>test</scope>
+      </dependency>-->
    <!-- <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>maven-plugin</artifactId>
@@ -64,6 +76,18 @@
       <version>1.4.12</version>
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>org.jenkins-ci.plugins</groupId>
+          <artifactId>promoted-builds</artifactId>
+          <version>2.28</version>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>com.github.olivergondza.dumpling</groupId>
+          <artifactId>dumpling</artifactId>
+          <version>2.2</version>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
 
     <repositories>

src/main/java/hudson/plugins/disk_usage/BuildDiskUsageAction.java

@@ -1,5 +1,7 @@
 package hudson.plugins.disk_usage;
 
+import hudson.FilePath;
+import hudson.XmlFile;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
@@ -9,12 +11,14 @@
 import hudson.model.ProminentProjectAction;
 import hudson.model.Run;
 import hudson.model.TopLevelItem;
+import java.io.File;
 import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.RunAction2;
-import org.apache.commons.io.FileUtils;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
@@ -33,14 +37,18 @@ public class BuildDiskUsageAction implements ProminentProjectAction, BuildBadgeA
 
     public BuildDiskUsageAction(AbstractBuild build) {
         this.build = build;       
-        DiskUsageProperty property = (DiskUsageProperty) build.getProject().getProperty(DiskUsageProperty.class);
-        if(property==null){
-            DiskUsageUtil.addProperty(build.getProject());
-            property = (DiskUsageProperty) build.getProject().getProperty(DiskUsageProperty.class);
-        }
-        DiskUsageBuildInformation information = property.getDiskUsageBuildInformation(build.getId());
-    }        
-
+      //  DiskUsageProperty property = (DiskUsageProperty) build.getProject().getProperty(DiskUsageProperty.class);
+      //  if(property==null){
+       //     try {
+        //        property = DiskUsageUtil.addProperty(build.getProject());
+       //     }
+       //     catch(Exception e){
+       //         Logger.getLogger(this.getClass().getName()).log(Level.WARNING, null, e);
+      //      }
+      //  }
+        //DiskUsageBuildInformation information = property.getDiskUsageBuildInformation(build.getId());
+    }  
+
         public String getIconFileName() {
         return null;
     }
@@ -53,34 +61,40 @@ public String getUrlName() {
         return Messages.UrlName();
     }
 
-    public void setDiskUsage(Long size) throws IOException{
+    public void setDiskUsage(Long size) throws Exception{
         AbstractProject project = build.getProject();
-        DiskUsageProperty property = (DiskUsageProperty) project.getProperty(DiskUsageProperty.class);
-        if(property==null){
-            DiskUsageUtil.addProperty(project);
-            property = (DiskUsageProperty) project.getProperty(DiskUsageProperty.class);
-        }
+        DiskUsageProperty property = DiskUsageUtil.getDiskUsageProperty(project);
         DiskUsageBuildInformation information = property.getDiskUsageBuildInformation(build.getId());
+        if(information==null){
+            information = property.getDiskUsageBuildInformation(build.getNumber());
+        }
         if(information!=null){
             information.setSize(size);
         }
         else{    
-            property.getDiskUsage().addBuildInformation(new DiskUsageBuildInformation(build.getId(), build.getTimeInMillis(), build.getNumber(), size), build);
+            property.getDiskUsage().addBuildInformation(new DiskUsageBuildInformation(build.getId(), build.getTimeInMillis(), build.getNumber(), size, build.isKeepLog()), build);
         }
         property.saveDiskUsage(); 
+        ProjectDiskUsageAction action = project.getAction(ProjectDiskUsageAction.class);
+        if(action!=null){
+            action.actualizeCashedBuildsData();
+        }
     }
 
     /**
      * @return Disk usage of the build (included child builds)
      */
     public Long getDiskUsage() {
         AbstractProject project = build.getProject();
-        DiskUsageProperty property = (DiskUsageProperty) project.getProperty(DiskUsageProperty.class);
-        if(property==null){
-            DiskUsageUtil.addProperty(project);
-            property = (DiskUsageProperty) project.getProperty(DiskUsageProperty.class);
+        DiskUsageProperty property = DiskUsageUtil.getDiskUsageProperty(project);
+        Long size = property.getDiskUsageOfBuild(build.getId());
+        if(size==null || !(size>0)) {
+            size = property.getDiskUsageOfBuild(build.getNumber());
+        }
+        if(size==null || !(size>0)) {
+            size = property.getDiskUsageOfBuild(String.valueOf(build.getNumber()));
         }
-        return property.getDiskUsageOfBuild(build.getId());
+        return size;
     }
 
     public Long getAllDiskUsage(){
@@ -105,11 +119,7 @@ private Long getBuildsDiskUsageAllSubItems(ItemGroup group){
             else{
                 if(item instanceof AbstractProject){
                     AbstractProject project = (AbstractProject) item;
-                    DiskUsageProperty property = (DiskUsageProperty) project.getProperty(DiskUsageProperty.class);
-                    if(property==null){
-                        DiskUsageUtil.addProperty(project);
-                        property = (DiskUsageProperty) project.getProperty(DiskUsageProperty.class);
-                    }
+                    DiskUsageProperty property = DiskUsageUtil.getDiskUsageProperty(project);
                     Set<DiskUsageBuildInformation> informations = property.getDiskUsageOfBuilds();
                     for(DiskUsageBuildInformation information :  informations){
                         if(information.getNumber() == build.getNumber()){
@@ -128,10 +138,27 @@ public Object readResolve() {
             buildDiskUsage = diskUsage.buildUsage;
             Node node = build.getBuiltOn();
             if(node!=null && diskUsage.wsUsage!=null && diskUsage.wsUsage > 0){
-                DiskUsageProperty property = (DiskUsageProperty) build.getProject().getProperty(DiskUsageProperty.class);
+                DiskUsageProperty property = DiskUsageUtil.getDiskUsageProperty(build.getProject());
                 AbstractProject project = build.getProject().getRootProject();
-                if(property!=null && (project instanceof TopLevelItem))
-                    property.putSlaveWorkspaceSize(node, node.getWorkspaceFor((TopLevelItem)project).getRemote(), diskUsage.wsUsage);
+                if(property!=null && (project instanceof TopLevelItem)){
+                    FilePath workspace = build.getWorkspace();
+                    if(workspace==null){
+                        workspace = node.getWorkspaceFor((TopLevelItem)project);
+                    }
+                    Map<String,Long> paths = property.getSlaveWorkspaceUsage().get(node.getDisplayName());
+                    Long size = null;
+                    if(paths!=null){
+                        size = paths.get(workspace.getRemote());
+                    }
+                    try {
+                        //previous data about workspace was quite tricky, so check if there is such workspace and size were not recounted
+                        if(workspace.exists() && size!=null && size>0){
+                            property.putSlaveWorkspaceSize(node, node.getWorkspaceFor((TopLevelItem)project).getRemote(), diskUsage.wsUsage);
+                        }
+                    } catch (IOException | InterruptedException ex) {
+                        Logger.getLogger(BuildDiskUsageAction.class.getName()).log(Level.WARNING, null, ex);
+                    }
+                }
             }
             diskUsage=null;
         }
@@ -145,34 +172,59 @@ public void onAttached(Run<?, ?> r) {
 
     @Override
     public void onLoad(Run<?, ?> r) {
-        DiskUsageProperty property = (DiskUsageProperty) build.getProject().getProperty(DiskUsageProperty.class);
+        DiskUsageProperty property = DiskUsageUtil.getDiskUsageProperty(build.getProject());
         long size = 0L;
+        if(buildDiskUsage != null){
+            size = buildDiskUsage;
+        }
         if(property==null){
             return;
         }
         //backward compatibility
             BuildDiskUsageAction action = null;
             for(Action a : build.getActions()){
+
                 if(a instanceof BuildDiskUsageAction){
                     action = (BuildDiskUsageAction) a;
                     if(action.buildDiskUsage != null){
+
                         size=action.buildDiskUsage;
                     }            
                 }
             }
-            if(action!=null){
-                //remove old action, now it is added by transition action factory
+            DiskUsageBuildInformation information = property.getDiskUsageBuildInformation(build.getNumber());
+            //Transient actions can be created even during deletion of job
+            Boolean isLocked = DiskUsageUtil.isKeepLog(build);
+            if(information==null && build.getRootDir().exists()){
+                if(isLocked==null){
+                    isLocked=false;
+                }
+                property.getDiskUsage().addBuildInformation(new DiskUsageBuildInformation(build.getId(),build.getTimeInMillis(), build.getNumber(), size, isLocked), build);
+            }
+            else{
+                if(information!=null && !(build.getProject() instanceof ItemGroup)){
+                    //check if lock is still valide
+                    //not for ItemGroup, because MatrixProject causes recursion
+
+                    if(isLocked!=null && information.isLocked()!= isLocked){
+                       information.setLockState(isLocked);
+                       property.getDiskUsage().save();
+                    }
+                }
+
+            }
+
+            if(action!=null || buildDiskUsage!=null){
+                property.getDiskUsageBuildInformation(build.getNumber()).setSize(buildDiskUsage);
+                buildDiskUsage=null;
+                //remove old action, now it is added by transition action factor
                 build.getActions().remove(action);
                 try {
                     build.save();
                 } catch (IOException ex) {
                     Logger.getLogger(BuildDiskUsageAction.class.getName()).log(Level.SEVERE, null, ex);
                 }
             }
-            //Transient actions can be created even during deletion of job
-            if(property.getDiskUsageBuildInformation(build.getNumber())==null && build.getRootDir().exists()){
-                property.getDiskUsage().addBuildInformation(new DiskUsageBuildInformation(build.getId(),build.getTimeInMillis(), build.getNumber(), size), build);
-            }
     }
 
 }