optimising porgress calculation code

Author: nevingeorgesunny

src/main/java/com/cloudbees/jenkins/support/SupportPlugin.java

@@ -362,7 +362,8 @@ public static void writeBundle(OutputStream outputStream, final List<? extends C
                 components,
                 new ComponentVisitor() {
                     @Override
-                    public <T extends Component> void visit(Container container, T component, double progress) {
+
+                    public <T extends Component> void visit(Container container, T component) {
                         component.addContents(container);
                     }
                 },
@@ -386,7 +387,7 @@ public static void writeBundleForSyncComponents(OutputStream outputStream, final
                 components,
                 new ComponentVisitor() {
                     @Override
-                    public <T extends Component> void visit(Container container, T component, double progress) {
+                    public <T extends Component> void visit(Container container, T component) {
                         component.addContents(container);
                     }
                 },
@@ -412,12 +413,15 @@ public static void writeBundle(
                 outputStream,
                 components,
                 new ComponentVisitor() {
+                    private final int totalComponents = components.size();
+                    private int currentIteration = 0;
+
                     @Override
-                    public <T extends Component> void visit(Container container, T component, double progress) {
+                    public <T extends Component> void visit(Container container, T component) {
                         if (component.canBeGeneratedAsync()) {
                             component.addContents(container);
                         }
-                        progressCallback.accept(progress);
+                        progressCallback.accept((currentIteration++) / (double) totalComponents);
                     }
                 },
                 outputPath,true);
@@ -683,8 +687,6 @@ private static List<Content> appendManifestContents(
 
         manifest.append("Requested components:\n\n");
         ContentContainer contentsContainer = new ContentContainer(contentFilter, components);
-        int totalComponents = components.size();
-        int currentIteration = 0;
         for (Component component : components) {
             try {
                 if (components.stream().anyMatch(c -> c.supersedes(component))) {
@@ -695,8 +697,7 @@ private static List<Content> appendManifestContents(
                 LOGGER.log(Level.FINE, "Start processing " + component.getDisplayName());
                 long startTime = System.currentTimeMillis();
                 // Calculate progress
-                double progress = (currentIteration++) / (double) totalComponents;
-                componentVisitor.visit(contentsContainer, component, progress);
+                componentVisitor.visit(contentsContainer, component);
                 LOGGER.log(
                         Level.FINE,
                         "Took " + (System.currentTimeMillis() - startTime) + "ms" + " to process component "

src/main/java/com/cloudbees/jenkins/support/actions/SupportObjectAction.java

@@ -146,7 +146,7 @@ public final void doGenerateAndDownload(StaplerRequest2 req, StaplerResponse2 rs
                         components,
                         new ComponentVisitor() {
                             @Override
-                            public <C extends Component> void visit(Container container, C component, double progress) {
+                            public <C extends Component> void visit(Container container, C component) {
                                 ((ObjectComponent<T>) component).addContents(container, object);
                             }
                         },

src/main/java/com/cloudbees/jenkins/support/api/ComponentVisitor.java

@@ -12,5 +12,5 @@ public interface ComponentVisitor {
      * @param component the {@link Component} being visited
      * @param <T> must be a subclass of {@link Component}
      */
-    <T extends Component> void visit(Container container, T component, double progress);
+    <T extends Component> void visit(Container container, T component);
 }