small sonar suggested fixes

Mateusdang · Nov 1, 2020 · 66cfbc5 · 66cfbc5
1 parent 4c910bc
commit 66cfbc5
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -61,6 +61,7 @@
       **/org/yamcs/protobuf/**,
       **/org/yamcs/yarch/streamsql/StreamSqlParser*,
       **/org/yamcs/ui/packetviewer/FilterParser*
+      **/org/yamcs/examples/**
     </sonar.exclusions>
   </properties>
 

diff --git a/simulator/src/main/java/org/yamcs/simulator/CfdpReceiver.java b/simulator/src/main/java/org/yamcs/simulator/CfdpReceiver.java
@@ -175,9 +175,10 @@ private void processEofPacket(EofPacket packet) {
     private void saveFile() {
         try {
             File f = File.createTempFile("cfdp", "");
-            FileOutputStream fw = new FileOutputStream(f);
-            fw.write(cfdpDataFile.getData());
-            fw.close();
+            try (FileOutputStream fw = new FileOutputStream(f)) {
+                fw.write(cfdpDataFile.getData());
+                log.info("CFDP file saved in {}", f.getAbsolutePath());
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/yamcs-client/src/main/java/org/yamcs/client/YamcsClient.java b/yamcs-client/src/main/java/org/yamcs/client/YamcsClient.java
@@ -222,7 +222,7 @@ public synchronized void pollServer() throws ClientException {
 
             if (i + 1 < connectionAttempts) {
                 try {
-                    Thread.sleep(retryDelay);
+                    this.wait(retryDelay);
                 } catch (InterruptedException e1) {
                     Thread.currentThread().interrupt();
                 }

diff --git a/yamcs-core/src/main/java/org/yamcs/TmPacket.java b/yamcs-core/src/main/java/org/yamcs/TmPacket.java
@@ -105,9 +105,7 @@ public void setInvalid() {
     }
 
     public void setInvalid(boolean invalid) {
-        if (invalid) {
-            status = invalid ? status | STATUS_MASK_INVALID : status & ~STATUS_MASK_INVALID;
-        }
+        status = invalid ? status | STATUS_MASK_INVALID : status & ~STATUS_MASK_INVALID;
     }
 
     public boolean isInvalid() {

diff --git a/yamcs-core/src/main/java/org/yamcs/http/api/CommandsApi.java b/yamcs-core/src/main/java/org/yamcs/http/api/CommandsApi.java
@@ -310,7 +310,7 @@ public void listCommands(Context ctx, ListCommandsRequest request, Observer<List
         }
 
         sqlb.descend(desc);
-        sqlb.limit(pos, limit + 1); // one more to detect hasMore
+        sqlb.limit(pos, limit + 1l); // one more to detect hasMore
 
         ListCommandsResponse.Builder responseb = ListCommandsResponse.newBuilder();
         StreamFactory.stream(instance, sqlb.toString(), sqlb.getQueryArguments(), new StreamSubscriber() {

diff --git a/yamcs-core/src/main/java/org/yamcs/utils/GlobFileFinder.java b/yamcs-core/src/main/java/org/yamcs/utils/GlobFileFinder.java
@@ -10,6 +10,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.stream.Stream;
 
 /**
  * Finds a list of files according to a glob pattern.
@@ -75,14 +76,13 @@ private void findMatchingFiles(Path current, ListIterator<Path> pitr) throws Unc
 
         if (isPattern(patterns)) {
             PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + patterns);
-            try {
-                Files.list(current)
-                        .filter(p -> incrIoCount())
-                        .map(p -> p.getFileName())
-                        .filter(p -> matcher.matches(p))
-                        .map(p -> current.resolve(p))
-                        .filter(p -> Files.isDirectory(p) == pitr.hasNext())
-                        .forEach(p -> findMatchingFiles(p, pitr));
+            try (Stream<Path> files =Files.list(current)){
+                        files.filter(p -> incrIoCount())
+                            .map(p -> p.getFileName())
+                            .filter(p -> matcher.matches(p))
+                            .map(p -> current.resolve(p))
+                            .filter(p -> Files.isDirectory(p) == pitr.hasNext())
+                            .forEach(p -> findMatchingFiles(p, pitr));
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
             }

diff --git a/yamcs-core/src/main/java/org/yamcs/yarch/rocksdb/RdbTableWalker.java b/yamcs-core/src/main/java/org/yamcs/yarch/rocksdb/RdbTableWalker.java
@@ -248,7 +248,7 @@ protected boolean bulkDeleteFromPartitions(List<Partition> partitions, IndexFilt
 
         // all partitions will have the same database, just use the same one
         RdbPartition p1 = (RdbPartition) partitions.get(0);
-        FlushOptions flushOptions = new FlushOptions();
+
         YRDB rdb;
         try {
             rdb = tablespace.getRdb(p1.dir, false);
@@ -257,22 +257,18 @@ protected boolean bulkDeleteFromPartitions(List<Partition> partitions, IndexFilt
             throw new YarchException(e);
         }
 
-        try {
+        try(FlushOptions flushOptions = new FlushOptions()) {
             for (Partition p : partitions) {
                 RdbPartition rp = (RdbPartition) p;
-
                 DbRange dbRange = getDeleteDbRange(rp.tbsIndex, tableRange);
                 rdb.getDb().deleteRange(dbRange.rangeStart, dbRange.rangeEnd);
-
-               // rdb.getDb().compactRange(dbRange.rangeStart, ByteArrayUtils.plusOne(dbRange.rangeEnd));
             }
 
             rdb.getDb().flush(flushOptions);
 
         } catch (RocksDBException e) {
             throw new YarchException(e);
         } finally {
-            flushOptions.close();
             tablespace.dispose(rdb);
         }
         return false;

diff --git a/yamcs-xtce/src/main/java/org/yamcs/xtce/xml/XtceStaxReader.java b/yamcs-xtce/src/main/java/org/yamcs/xtce/xml/XtceStaxReader.java
@@ -335,10 +335,10 @@ public XtceStaxReader() {
     public SpaceSystem readXmlDocument(String fileName) throws XMLStreamException, IOException {
         this.fileName = fileName;
         log.info("Parsing XTCE file {}", fileName);
-        xmlEventReader = initEventReader(fileName);
         xmlEvent = null;
         SpaceSystem spaceSystem = null;
-        try {
+        try (InputStream in = new FileInputStream(new File(fileName))){
+            xmlEventReader = initEventReader(in);
             while (true) {
                 xmlEvent = xmlEventReader.nextEvent();
                 int eventType = xmlEvent.getEventType();
@@ -3940,8 +3940,7 @@ private void skipToTheEnd(String sectionName) throws XMLStreamException, Illegal
      * @throws FileNotFoundException
      * @throws XMLStreamException
      */
-    private XMLEventReader initEventReader(String filename) throws FileNotFoundException, XMLStreamException {
-        InputStream in = new FileInputStream(new File(filename));
+    private XMLEventReader initEventReader(InputStream in) throws XMLStreamException {
         XMLInputFactory factory = XMLInputFactory.newInstance();
         // Merge multiple character data blocks into a single event (e.g. algorithm text)
         factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.TRUE);