Changed file opening access mode in C# and updated data directory searching for Java and C#

Author: barrycaceres

csharp/runner/SnippetRunner/InstallLocations.cs

@@ -302,6 +302,22 @@ private static bool IsDirectory(string path)
             }
             else
             {
+                switch (Environment.OSVersion.Platform)
+                {
+                    case PlatformID.Win32NT:
+                        defaultSupportPath = Path.Combine(installDir.FullName, "data");
+                    break;
+                    case PlatformID.MacOSX:
+                        defaultSupportPath = Path.Combine(installDir.FullName, "data");
+                        break;
+                    case PlatformID.Unix:
+                        break;
+                    default:
+                       throw new NotSupportedException(
+                            "Unsupported Operating System: "
+                            + Environment.OSVersion.Platform);
+                }
+
                 // no explicit path, try the default support path
                 supportDir = new DirectoryInfo(defaultSupportPath);
             }

csharp/snippets/deleting/DeleteViaFutures/Program.cs

@@ -159,6 +159,8 @@ TaskScheduler taskScheduler
 }
 finally
 {
+    fs.Close();
+    
     // IMPORTANT: make sure to destroy the environment
     env.Destroy();
 

csharp/snippets/deleting/DeleteViaLoop/Program.cs

@@ -130,6 +130,8 @@
 }
 finally
 {
+    fs.Close();
+    
     // IMPORTANT: make sure to destroy the environment
     env.Destroy();
 

csharp/snippets/deleting/DeleteWithInfoViaFutures/Program.cs

@@ -160,6 +160,8 @@ TaskScheduler taskScheduler
 }
 finally
 {
+    fs.Close();
+    
     // IMPORTANT: make sure to destroy the environment
     env.Destroy();
 

csharp/snippets/loading/LoadViaFutures/Program.cs

@@ -49,7 +49,7 @@ TaskScheduler taskScheduler
 // keep track of the pending tasks and don't backlog too many for memory's sake
 IList<(Task, Record)> pendingFutures = new List<(Task, Record)>(MaximumBacklog);
 
-FileStream fs = new FileStream(filePath, FileMode.Open);
+FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
 try
 {
     // create a reader
@@ -159,6 +159,9 @@ TaskScheduler taskScheduler
 }
 finally
 {
+    // close the file stream
+    fs.Close();
+
     // IMPORTANT: make sure to destroy the environment
     env.Destroy();
 

csharp/snippets/loading/LoadViaLoop/Program.cs

@@ -31,7 +31,7 @@
 
 string filePath = (args.Length > 0) ? args[0] : DefaultFilePath;
 
-FileStream fs = new FileStream(filePath, FileMode.Open);
+FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
 try
 {
     // create a reader
@@ -131,7 +131,7 @@
 finally
 {
     fs.Close();
-    
+
     // IMPORTANT: make sure to destroy the environment
     env.Destroy();
 

csharp/snippets/loading/LoadViaQueue/Program.cs

@@ -32,10 +32,9 @@
 
 string filePath = (args.Length > 0) ? args[0] : DefaultFilePath;
 
-FileStream fs = new FileStream(filePath, FileMode.Open);
 Thread producer = new Thread(() =>
 {
-    FileStream fs = new FileStream(filePath, FileMode.Open);
+    FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
     try
     {
         StreamReader rdr = new StreamReader(fs, Encoding.UTF8);
@@ -71,6 +70,7 @@
     }
     finally
     {
+        fs.Close();
         recordQueue.CompleteAdding();
     }
 });

csharp/snippets/loading/LoadWithInfoViaFutures/Program.cs

@@ -50,7 +50,7 @@ TaskScheduler taskScheduler
 IList<(Task<string>, Record)> pendingFutures
     = new List<(Task<string>, Record)>(MaximumBacklog);
 
-FileStream fs = new FileStream(filePath, FileMode.Open);
+FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
 try
 {
     // create a reader
@@ -161,6 +161,8 @@ TaskScheduler taskScheduler
 }
 finally
 {
+    fs.Close();
+    
     // IMPORTANT: make sure to destroy the environment
     env.Destroy();
 

csharp/snippets/loading/LoadWithStatsViaLoop/Program.cs

@@ -31,7 +31,7 @@
 
 string filePath = (args.Length > 0) ? args[0] : DefaultFilePath;
 
-FileStream fs = new FileStream(filePath, FileMode.Open);
+FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
 try
 {
     // create a reader
@@ -151,6 +151,8 @@
 }
 finally
 {
+    fs.Close();
+    
     // IMPORTANT: make sure to destroy the environment
     env.Destroy();
 

java/runner/java/com/senzing/runner/InstallLocations.java

@@ -256,9 +256,11 @@ public static InstallLocations findLocations() {
                 if ("dist".equals(installDir.getName())) {
                     // use the "data" sub-directory of the dev build
                     supportDir = new File(installDir, "data");
+                } else if (windows || macOS) {
+                    supportDir = new File(installDir, "data");
                 } else {
                     // no explicit path, try the default support path
-                    supportDir = new File(defaultSupportPath);
+                     supportDir = new File(defaultSupportPath);
                 }
 
             } else {