Explicitly check not-null oldLabel. Lowercase old label.

Fork: 0

ONS / pmd-jenkins-library

Browse code Explicitly check not-null oldLabel. Lowercase old label. add_tests master v1.0
1 parent e48c632 commit 2576a3a859f351908e8a565eb88d52d1563a3f18 Alex Tucker authored on 15 Oct 2018

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          vars/uploadTidy.groovy
         String datasetGraph = "${baseURI}/graph/${datasetPath}"
        String metadataGraph = "${datasetGraph}/metadata"
        drafter.deleteGraph(PMD, credentials, newJobDraft.id, metadataGraph)
        drafter.deleteGraph(PMD, credentials, newJobDraft.id, datasetGraph)
        if (oldLabel) {
            String oldDatasetPath = oldLabel
        if (oldLabel != null) {
            String oldDatasetPath = oldLabel.toLowerCase()
                    .replaceAll('[^\\w/]', '-')
                    .replaceAll('-+', '-')
                    .replaceAll('-\$', '')
            String oldDatasetGraph = "${baseURI}/graph/${oldDatasetPath}"
         String datasetGraph = "${baseURI}/graph/${datasetPath}"
         String metadataGraph = "${datasetGraph}/metadata"
         drafter.deleteGraph(PMD, credentials, newJobDraft.id, metadataGraph)
         drafter.deleteGraph(PMD, credentials, newJobDraft.id, datasetGraph)
+        if (oldLabel) {
+            String oldDatasetPath = oldLabel
+        if (oldLabel != null) {
+            String oldDatasetPath = oldLabel.toLowerCase()
                     .replaceAll('[^\\w/]', '-')
                     .replaceAll('-+', '-')
                     .replaceAll('-\$', '')
             String oldDatasetGraph = "${baseURI}/graph/${oldDatasetPath}"

Show line notes below