[geode] 01/01: Omit extensions in check of bundled jars

[jc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jchen21 pushed a commit to branch exclude-extensions-in-jar-check
in repository https://gitbox.apache.org/repos/asf/geode.git

commit a8941fb088b59c4bf51cf8d64e85821e989047b5
Author: Bradford Boyle <bb...@pivotal.io>
AuthorDate: Tue Apr 17 15:20:27 2018 -0700

    Omit extensions in check of bundled jars
    
    [GEODE-5099]
    
    Signed-off-by Jianxia Chen <jc...@pivotal.io>
---
 .../java/org/apache/geode/BundledJarsJUnitTest.java     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
index 8e99a7a..d17f5c6 100644
--- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -42,6 +43,7 @@ public class BundledJarsJUnitTest {
 
   private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$";
   private static final String GEODE_HOME = System.getenv("GEODE_HOME");
+  private static final String EXTENSIONS_SUBDIR = "extensions";
   private Set<String> expectedJars;
 
   @Before
@@ -54,7 +56,7 @@ public class BundledJarsJUnitTest {
 
   @Test
   public void verifyBundledJarsHaveNotChanged() throws IOException {
-    TreeMap<String, String> sortedJars = getBundledJars();
+    TreeMap<String, String> sortedJars = removeExtensionJars(getBundledJars());
     Stream<String> lines =
         sortedJars.entrySet().stream().map(entry -> removeVersion(entry.getKey()));
     Set<String> bundledJarNames = new TreeSet<>(lines.collect(Collectors.toSet()));
@@ -101,6 +103,19 @@ public class BundledJarsJUnitTest {
     return sortedJars;
   }
 
+  private TreeMap<String, String> removeExtensionJars(final TreeMap<String, String> bundledJars) {
+    File geodeHomeDirectory = new File(GEODE_HOME);
+    File extensionsDirectory = new File(geodeHomeDirectory, EXTENSIONS_SUBDIR);
+    final String extensionsPath = extensionsDirectory.getPath();
+
+    final Map<String, String> filteredJars = bundledJars.entrySet()
+        .stream()
+        .filter(entry -> !entry.getValue().startsWith(extensionsPath))
+        .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()));
+
+    return new TreeMap<>(filteredJars);
+  }
+
   private String removeVersion(String name) {
     return name.replaceAll(VERSION_PATTERN, "");
   }

-- 
To stop receiving notification emails like this one, please contact
jchen21@apache.org.