From f757ea148b544bcbcc6233032b75e1c458aac566 Mon Sep 17 00:00:00 2001
From: fedoreno <fedoreno>
Date: Thu, 3 Mar 2016 09:45:44 +0000
Subject: [PATCH] SSDM-2780: js-ignoring fetchOptionsToString components
SVN: 35798
---
.../cisd/openbis/jstest/report/V3APIReport.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
index cf3e902bded..e5e09a80cee 100644
--- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
+++ b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
@@ -26,6 +26,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.TreeSet;
+import org.apache.commons.lang.ArrayUtils;
import org.reflections.ReflectionUtils;
import org.reflections.Reflections;
import org.reflections.scanners.ResourcesScanner;
@@ -35,6 +36,8 @@ import org.reflections.util.ConfigurationBuilder;
import org.reflections.util.FilterBuilder;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.common.collection.CollectionUtils;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -53,6 +56,10 @@ public class V3APIReport
"ch.ethz.sis.openbis.generic.dssapi.v3",
"ch.ethz.sis.openbis.generic.asapi.v3"
};
+
+ private static final String[] IGNORE_CLASSES = {
+ "ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptionsToStringBuilder"
+ };
@Test
public void test() throws Exception
@@ -92,16 +99,16 @@ public class V3APIReport
Multimap<String, String> map = reflections.getStore().get(SubTypesScanner.class);
- Collection<String> nonInnerClassNames = Collections2.filter(map.values(), new Predicate<String>()
+ Collection<String> nonInnerAndNonIgnoredClassNames = Collections2.filter(map.values(), new Predicate<String>()
{
@Override
public boolean apply(String item)
{
- return false == item.contains("$");
+ return false == item.contains("$") && false == ArrayUtils.contains(IGNORE_CLASSES, item);
}
});
- Collection<String> uniqueClassNames = new TreeSet<String>(nonInnerClassNames);
+ Collection<String> uniqueClassNames = new TreeSet<String>(nonInnerAndNonIgnoredClassNames);
Collection<Class<?>> uniqueClasses = ImmutableSet.copyOf(ReflectionUtils.forNames(uniqueClassNames));
for (Class<?> uniqueClass : uniqueClasses)
--
GitLab