refactor: reorganise how runtimeVersions are appended

Author: fractalwrench

bugsnag-spring/src/main/java/com/bugsnag/BugsnagSpringConfiguration.java

@@ -32,7 +32,7 @@ Callback springVersionErrorCallback() {
         Callback callback = new Callback() {
             @Override
             public void beforeNotify(Report report) {
-                appendSpringRuntimeVersion(Diagnostics.retrieveRuntimeVersionsMap(report.getDevice()));
+                addSpringRuntimeVersion(report.getDevice());
             }
         };
         bugsnag.addCallback(callback);
@@ -44,15 +44,15 @@ BeforeSendSession springVersionSessionCallback() {
         BeforeSendSession beforeSendSession = new BeforeSendSession() {
             @Override
             public void beforeSendSession(SessionPayload payload) {
-                appendSpringRuntimeVersion(Diagnostics.retrieveRuntimeVersionsMap(payload.getDevice()));
+                addSpringRuntimeVersion(payload.getDevice());
             }
         };
         bugsnag.addBeforeSendSession(beforeSendSession);
         return beforeSendSession;
     }
 
-    private void appendSpringRuntimeVersion(Map<String, Object> runtimeVersions) {
-        runtimeVersions.put("springFramework", SpringVersion.getVersion());
+    private void addSpringRuntimeVersion(Map<String, Object> device) {
+        Diagnostics.addDeviceRuntimeVersion(device, "springFramework", SpringVersion.getVersion());
     }
 
     @Bean

bugsnag-spring/src/main/java/com/bugsnag/SpringBootConfiguration.java

@@ -31,7 +31,7 @@ Callback springBootVersionErrorCallback() {
         Callback callback = new Callback() {
             @Override
             public void beforeNotify(Report report) {
-                appendSpringBootRuntimeVersion(Diagnostics.retrieveRuntimeVersionsMap(report.getDevice()));
+                addSpringRuntimeVersion(report.getDevice());
             }
         };
         bugsnag.addCallback(callback);
@@ -43,15 +43,15 @@ BeforeSendSession springBootVersionSessionCallback() {
         BeforeSendSession beforeSendSession = new BeforeSendSession() {
             @Override
             public void beforeSendSession(SessionPayload payload) {
-                appendSpringBootRuntimeVersion(Diagnostics.retrieveRuntimeVersionsMap(payload.getDevice()));
+                addSpringRuntimeVersion(payload.getDevice());
             }
         };
         bugsnag.addBeforeSendSession(beforeSendSession);
         return beforeSendSession;
     }
 
-    private void appendSpringBootRuntimeVersion(Map<String, Object> runtimeVersions) {
-        runtimeVersions.put("springBoot", SpringBootVersion.getVersion());
+    private void addSpringRuntimeVersion(Map<String, Object> device) {
+        Diagnostics.addDeviceRuntimeVersion(device, "springBoot", SpringBootVersion.getVersion());
     }
 
     /**

bugsnag/src/main/java/com/bugsnag/Diagnostics.java

@@ -47,15 +47,16 @@ private Map<String, Object> getDefaultAppInfo(Configuration configuration) {
     }
 
     @SuppressWarnings("unchecked")
-    static Map<String, Object> retrieveRuntimeVersionsMap(Map<String, Object> device) {
+    static void addDeviceRuntimeVersion(Map<String, Object> device, String key, Object value) {
         Object obj = device.get("runtimeVersions");
+        Map<String, Object> runtimeVersions;
 
         if (obj instanceof Map) {
-            return (Map<String, Object>) obj;
+            runtimeVersions = (Map<String, Object>) obj;
         } else { // fallback to creating a new map if payload was mutated
-            Map<String, Object> map = new HashMap<String, Object>();
-            device.put("runtimeVersions", map);
-            return map;
+            runtimeVersions = new HashMap<String, Object>();
+            device.put("runtimeVersions", runtimeVersions);
         }
+        runtimeVersions.put(key, value);
     }
 }