From 5190fa2a29692f8200eb971b6819c38cdeae5d38 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 12 May 2017 15:49:47 +0200
Subject: [PATCH] Do not use FileInputStream

https://www.cloudbees.com/blog/fileinputstream-fileoutputstream-considered-harmful

Change-Id: Ic3c9fab4ba21ac9da05d96e9a83597426f67331a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../yang/model/repo/api/YangTextFileSchemaSource.java       | 6 +++---
 .../yang/model/repo/util/FilesystemSchemaSourceCache.java   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextFileSchemaSource.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextFileSchemaSource.java
index 37a7e98f71..29d10580f2 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextFileSchemaSource.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextFileSchemaSource.java
@@ -10,9 +10,9 @@ package org.opendaylight.yangtools.yang.model.repo.api;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Preconditions;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Optional;
 import org.opendaylight.yangtools.concepts.Delegator;
 
@@ -36,7 +36,7 @@ final class YangTextFileSchemaSource extends YangTextSchemaSource implements Del
 
     @Override
     public InputStream openStream() throws IOException {
-        return new FileInputStream(file);
+        return Files.newInputStream(file.toPath());
     }
 
     @Override
@@ -48,4 +48,4 @@ final class YangTextFileSchemaSource extends YangTextSchemaSource implements Del
     public Optional<String> getSymbolicName() {
         return Optional.of(file.toString());
     }
-}
\ No newline at end of file
+}
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java
index e2d7d5d2b7..0eb7fc0013 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java
@@ -15,7 +15,6 @@ import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -261,7 +260,7 @@ public final class FilesystemSchemaSourceCache<T extends SchemaSourceRepresentat
 
                 @Override
                 public InputStream openStream() throws IOException {
-                    return new FileInputStream(cachedSource);
+                    return Files.newInputStream(cachedSource.toPath());
                 }
             };
         }
-- 
2.36.6