Merge pull request #8 from Runabout-LLC/dev

v1.2.2

Author: ethanbond64

.gitignore

@@ -5,10 +5,10 @@ build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+.idea/
+!.idea/gradle.xml
+!.idea/misc.xml
+!.idea/vcs.xml
 *.iws
 *.iml
 *.ipr

.idea/.gitignore

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.2.2 - 2024-04-15
+### Added
+- Added support for anonymous classes as Runabout inputs. Anonymous classes will be cast to the interface/class they implement or extend.
+
+### Fixed
+- Fixed an NPE in the default JsonObject implementation.
+
 ## 1.2.1 - 2024-03-19
 ### Fixed
 - Fixed a bug in the creation of the Runabout JSON with a null parameter. Now both type and eval for a null parameter will be "null".

.idea/uiDesigner.xml

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'dev.runabout'
-version = '1.2.1'
+version = '1.2.2'
 
 repositories {
     mavenCentral()

CHANGELOG.md

@@ -120,7 +120,7 @@ private static RunaboutInput mapSerializer(final Map<?,?> map, final RunaboutSer
             // If either key/value cannot be serialized, return empty input.
             if (serialKey == null || serialKey.getEval() == null || serialKey.getEval().isEmpty() ||
                     serialValue == null || serialValue.getEval() == null || serialValue.getEval().isEmpty()) {
-                return RunaboutInput.of("", Collections.emptySet());
+                return EMPTY_INPUT;
             }
             final String entryString = "put(" + serialKey.getEval() + ", " + serialValue.getEval() + "); ";
             builder.append(entryString);

build.gradle

@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.function.Supplier;
@@ -78,7 +79,7 @@ private static String valueToString(final Object value) {
             ((List<?>) value).forEach(innerValue -> commaJoiner.add(valueToString(innerValue)));
             string = "[" + commaJoiner + "]";
         } else {
-            string = value.toString();
+            string = Optional.ofNullable(value).map(Object::toString).orElse("null");
         }
 
         return string;

src/main/java/dev/runabout/DefaultSerializer.java

@@ -167,6 +167,16 @@ private static boolean validInput(final RunaboutInput input) {
     }
 
     private static String getTypeSafe(final Object object) {
-        return object == null ? "null" : object.getClass().getCanonicalName();
+        return Optional.ofNullable(object)
+                .map(Object::getClass)
+                .map(clazz -> clazz.isAnonymousClass() ? getAnonymousImplClass(clazz) : clazz.getCanonicalName())
+                .orElse("null");
+    }
+
+    private static String getAnonymousImplClass(final Class<?> clazz) {
+        return Optional.ofNullable(clazz)
+                .map(c -> c.getInterfaces().length > 0 ? c.getInterfaces()[0] : c.getSuperclass())
+                .map(Class::getCanonicalName)
+                .orElse("null");
     }
 }

src/main/java/dev/runabout/JsonObjectImpl.java

@@ -5,6 +5,7 @@
 import java.io.OutputStream;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 
 public class Logic1 {
 
@@ -28,6 +29,11 @@ public String concatValuesLambdaLogger(final ConcreteClass1 cc1, final ConcreteC
         return concatValues(cc1, cc2);
     }
 
+    public String evaluateSupplierWrapper(SupplierWrapper supplier) {
+        logger.runaboutInfo(this, supplier);
+        return supplier.get() + " " + supplier.getOther();
+    }
+
     private String concatValues(final ConcreteClass1 cc1, final ConcreteClass2 cc2) {
         final StringBuilder builder = new StringBuilder(", ");
 

src/main/java/dev/runabout/RunaboutServiceImpl.java

@@ -0,0 +1,11 @@
+package dev.runabout.fixtures;
+
+import java.util.function.Supplier;
+
+public interface SupplierWrapper extends Supplier<String> {
+
+    @Override
+    String get();
+
+    String getOther();
+}