json-serialiser

added class ignoring

7/9/2019 9:41:23 AM

Details

diff --git a/src/main/java/br/ufrgs/inf/prosoft/jsonserialiser/JSONSerialiser.java b/src/main/java/br/ufrgs/inf/prosoft/jsonserialiser/JSONSerialiser.java
index f29eff2..f228b1b 100644
--- a/src/main/java/br/ufrgs/inf/prosoft/jsonserialiser/JSONSerialiser.java
+++ b/src/main/java/br/ufrgs/inf/prosoft/jsonserialiser/JSONSerialiser.java
@@ -136,8 +136,7 @@ public class JSONSerialiser {
                 return new StringBuilder().append("\"").append(String.valueOf(date.getTime())).append("\"");
             }
             if (!TRACER_SERIALISE_INTERNALS) {
-                Package objectPackage = object.getClass().getPackage();
-                String objectPackageName = objectPackage != null ? objectPackage.getName() : "";
+                String className = object.getClass().getName();
                 List<String> ignoredPackages;
                 try {
                     ignoredPackages = Files.readAllLines(Paths.get(TRACER_IGNORED_PACKAGES));
@@ -146,13 +145,13 @@ public class JSONSerialiser {
                 }
                 String[] internals = {"java.", "org.ietf.", "org.omg.", "org.w3c.", "org.xml."};
                 ignoredPackages.addAll(Arrays.asList(internals));
-                if (ignoredPackages.stream().anyMatch(ignoredPackage -> objectPackageName.startsWith(ignoredPackage))) {
+                if (ignoredPackages.stream().anyMatch(ignoredPackage -> className.startsWith(ignoredPackage))) {
                     return getReference(object);
                 }
                 try {
                     List<String> whiteList = Files.readAllLines(Paths.get(TRACER_WHITELIST));
-                    if (!objectPackageName.isEmpty() && whiteList.stream().noneMatch(ignoredPackage -> objectPackageName.startsWith(ignoredPackage))) {
-                        log(System.currentTimeMillis() + " [JSONSerialiser] proceeding " + objectPackageName);
+                    if (whiteList.stream().noneMatch(ignoredPackage -> className.startsWith(ignoredPackage))) {
+                        log(System.currentTimeMillis() + " [JSONSerialiser] proceeding " + className);
                     }
                 } catch (IOException ex) {
                 }