From bc46bac2ac587468659f5c8bb0ddf487ea30f6c0 Mon Sep 17 00:00:00 2001
From: Kai Zimmermann <kai.zimmermann@bosch-si.com>
Date: Tue, 2 Feb 2016 10:19:37 +0100
Subject: [PATCH] Fix sonar issue

---
 .../targettable/BulkUploadHandler.java        | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
index fa4022a3e..0716e6bd6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
@@ -207,39 +207,12 @@ public class BulkUploadHandler extends CustomComponent
 
         @Override
         public void run() {
-            long innerCounter = 0;
-            String line;
             if (tempFile == null) {
                 return;
             }
 
             try (InputStream tempStream = new FileInputStream(tempFile)) {
-                try (BufferedReader reader = new BufferedReader(
-                        new InputStreamReader(tempStream, Charset.defaultCharset()))) {
-                    LOG.info("Bulk file upload started");
-                    final double totalFileSize = getTotalNumberOfLines();
-
-                    /**
-                     * Once control is in upload succeeded method automatically
-                     * upload button is re-enabled. To disable the button firing
-                     * below event.
-                     */
-                    eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_PROCESS_STARTED));
-                    while ((line = reader.readLine()) != null) {
-                        innerCounter++;
-                        readEachLine(line, innerCounter, totalFileSize);
-                    }
-                    doAssignments();
-                    eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED));
-
-                    // Clearing after assignments are done
-                    managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated().clear();
-                } catch (final IOException e) {
-                    LOG.error("Error reading file {}", tempFile.getName(), e);
-                } finally {
-                    resetCounts();
-                    deleteFile();
-                }
+                readFileStream(tempStream);
             } catch (final FileNotFoundException e) {
                 LOG.error("Temporary file not found with name {}", tempFile.getName(), e);
             } catch (final IOException e) {
@@ -248,6 +221,37 @@ public class BulkUploadHandler extends CustomComponent
 
         }
 
+        private void readFileStream(final InputStream tempStream) {
+            String line;
+            try (BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(tempStream, Charset.defaultCharset()))) {
+                LOG.info("Bulk file upload started");
+                long innerCounter = 0;
+                final double totalFileSize = getTotalNumberOfLines();
+
+                /**
+                 * Once control is in upload succeeded method automatically
+                 * upload button is re-enabled. To disable the button firing
+                 * below event.
+                 */
+                eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_PROCESS_STARTED));
+                while ((line = reader.readLine()) != null) {
+                    innerCounter++;
+                    readEachLine(line, innerCounter, totalFileSize);
+                }
+                doAssignments();
+                eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED));
+
+                // Clearing after assignments are done
+                managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated().clear();
+            } catch (final IOException e) {
+                LOG.error("Error reading file {}", tempFile.getName(), e);
+            } finally {
+                resetCounts();
+                deleteFile();
+            }
+        }
+
         private void doAssignments() {
             final StringBuilder errorMessage = new StringBuilder();
             String dsAssignmentFailedMsg = null;