Fix for code smells (#215)

* Fixed code smells * Fixed CSVFormat deprecations * Switching to ci.jenkins.io
jenkinsci · Feb 9, 2023 · fe1eaf1 · fe1eaf1
1 parent 0f63142
commit fe1eaf1
Show file tree

Hide file tree

Showing 20 changed files with 181 additions and 170 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,24 +1,27 @@
 properties([
-    buildDiscarder(logRotator(numToKeepStr: '10')),
+    buildDiscarder(logRotator(numToKeepStr: '5')),
     disableConcurrentBuilds(abortPrevious: true)
 ])
 
-node('maven-11') {
+node('linux-amd64') {
     stage('Checkout') {
         infra.checkoutSCM()
     }
 
     stage('Build') {
-        timeout(30) {
-            def args = ['clean', 'install', '-Dmaven.test.skip=true', '-Dmaven.javadoc.skip=true', '-Dset.changelist']
+        withEnv(['PATH+LOCAL=/home/jenkins/.local/bin']) {
+            sh 'pip install --upgrade pip'
+            sh 'pip install -r requirements.txt'
+
+            def args = ['clean', 'install', '-Dmaven.javadoc.skip=true', '-Dset.changelist']
             infra.runMaven(args, 11)
         }
     }
 
     stage('Archive') {
-        // junit '**/target/surefire-reports/TEST-*.xml'
+        junit '**/target/surefire-reports/TEST-*.xml'
         infra.prepareToPublishIncrementals()
     }
 }
 
-infra.maybePublishIncrementals()
+infra.maybePublishIncrementals()
diff --git a/src/main/java/hudson/plugins/performance/PerformancePublisher.java b/src/main/java/hudson/plugins/performance/PerformancePublisher.java
@@ -1044,7 +1044,7 @@ public void evaluateInExpertMode(Run<?, ?> run, FilePath workspace, TaskListener
       /*
        * Create Report of evaluated constraints
        */
-        ConstraintReport cr = new ConstraintReport(ceList, run.getParent().getBuilds().get(0), persistConstraintLog);
+        ConstraintReport cr = new ConstraintReport(ceList, run.getParent().getBuilds().iterator().next(), persistConstraintLog);
         logger.print(cr.getLoggerMsg());
       /*
        * Determine build result

diff --git a/src/main/java/hudson/plugins/performance/PerformanceReportMap.java b/src/main/java/hudson/plugins/performance/PerformanceReportMap.java
@@ -20,6 +20,7 @@
 import hudson.util.ChartUtil;
 import hudson.util.ChartUtil.NumberOnlyBuildLabel;
 import hudson.util.DataSetBuilder;
+import hudson.util.Graph;
 
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.category.CategoryDataset;
@@ -124,8 +125,8 @@ protected PerformancePublisher getPublisher() {
             if (build != null) {
                 Job<?, ?> job = build.getParent();
                 if (job instanceof AbstractProject) {
-                    AbstractProject project = (AbstractProject) job;
-                    Describable describable = project.getPublishersList().get(PerformancePublisher.class);
+                    AbstractProject<?, ?> project = (AbstractProject<?, ?>) job;
+                    Describable<?> describable = project.getPublishersList().get(PerformancePublisher.class);
                     return (describable != null) ? (PerformancePublisher) describable : null;
                 }
             }
@@ -251,8 +252,12 @@ public void doRespondingTimeGraph(StaplerRequest request,
         }
         String legendLimit = request.getParameter("legendLimit");
         int limit = (legendLimit != null && !legendLimit.isEmpty()) ? Integer.parseInt(legendLimit) : Integer.MAX_VALUE;
-        ChartUtil.generateGraph(request, response,
-                createRespondingTimeChart(dataSetBuilder.build(), limit), 400, 200);
+        new Graph(-1, 400, 200) {
+            @Override
+            protected JFreeChart createGraph() {
+                return createRespondingTimeChart(dataSetBuilder.build(), limit);
+            }
+        }.doPng(request, response);
     }
 
     public void doThroughputGraph(StaplerRequest request, StaplerResponse response) throws IOException {
@@ -287,8 +292,12 @@ public void doThroughputGraph(StaplerRequest request, StaplerResponse response)
                 dataSetBuilder.add(throughputReport.get(), Messages.ProjectAction_RequestsPerSeconds(), label);
         }
 
-        ChartUtil.generateGraph(request, response,
-                createThroughputChart((dataSetBuilder.build())), 400, 200);
+        new Graph(-1, 400, 200) {
+            @Override
+            protected JFreeChart createGraph() {
+                return createThroughputChart((dataSetBuilder.build()));
+            }
+        }.doPng(request, response);
     }
 
     protected JFreeChart createThroughputChart(CategoryDataset dataset) {
@@ -337,8 +346,12 @@ public void doRespondingTimeGraphPerTestCaseMode(
 
         String legendLimit = request.getParameter("legendLimit");
         int limit = (legendLimit != null && !legendLimit.isEmpty()) ? Integer.parseInt(legendLimit) : Integer.MAX_VALUE;
-        ChartUtil.generateGraph(request, response,
-                createRespondingTimeChart(dataSetBuilder.build(), limit), 600, 200);
+        new Graph(-1, 600, 200) {
+            @Override
+            protected JFreeChart createGraph() {
+                return createRespondingTimeChart(dataSetBuilder.build(), limit);
+            }
+        }.doPng(request, response);
     }
 
     public void doErrorsGraph(StaplerRequest request, StaplerResponse response)
@@ -374,8 +387,12 @@ public void doErrorsGraph(StaplerRequest request, StaplerResponse response)
                 dataSetBuilderErrors.add(performanceReport.errorPercent(),
                         Messages.ProjectAction_Errors(), label);
         }
-        ChartUtil.generateGraph(request, response,
-                createErrorsChart(dataSetBuilderErrors.build()), 400, 200);
+        new Graph(-1, 400, 200) {
+            @Override
+            protected JFreeChart createGraph() {
+                return createErrorsChart(dataSetBuilderErrors.build());
+            }
+        }.doPng(request, response);
     }
 
     protected JFreeChart createErrorsChart(CategoryDataset dataset) {
@@ -437,10 +454,13 @@ public void doSummarizerGraph(StaplerRequest request, StaplerResponse response)
             }
 
         }
-        ChartUtil.generateGraph(
-                request,
-                response,
-                createSummarizerChart(dataSetBuilderSummarizer.build()), 400, 200);
+
+        new Graph(-1, 400, 200) {
+            @Override
+            protected JFreeChart createGraph() {
+                return createSummarizerChart(dataSetBuilderSummarizer.build());
+            }
+        }.doPng(request, response);
     }
 
     protected JFreeChart createSummarizerChart(CategoryDataset dataset) {
@@ -504,14 +524,6 @@ public boolean accept(File dir, String name) {
         //addPreviousBuildReports();
     }
 
-    private void loadPreviousBuilds() {
-        Run<?, ?> prev = getBuild().getPreviousCompletedBuild();
-        while (prev != null) {
-            getReportMap(prev);
-            prev = prev.getPreviousCompletedBuild();
-        }
-    }
-
     private void addPreviousBuildReports() {
         for (Map.Entry<String, PerformanceReport> item : getPerformanceReportMap().entrySet()) {
             PerformanceReport curReport = item.getValue();