Encapsulation (#243)

* initial change

* checkstyle

* checkstyle

* make config access safer

Author: richardelms

bugsnag/src/main/java/com/bugsnag/Bugsnag.java

@@ -151,7 +151,7 @@ public void addCallback(Callback callback) {
      * @see Delivery
      */
     public Delivery getDelivery() {
-        return config.delivery;
+        return config.getDelivery();
     }
 
     /**
@@ -161,17 +161,16 @@ public Delivery getDelivery() {
      * @see Delivery
      */
     public Delivery getSessionDelivery() {
-        return config.sessionDelivery;
+        return config.getSessionDelivery();
     }
 
-
     /**
      * Set the application type sent to Bugsnag.
      *
      * @param appType the app type to send, eg. spring, gradleTask
      */
     public void setAppType(String appType) {
-        config.appType = appType;
+        config.setAppType(appType);
     }
 
     /**
@@ -180,7 +179,7 @@ public void setAppType(String appType) {
      * @param appVersion the app version to send
      */
     public void setAppVersion(String appVersion) {
-        config.appVersion = appVersion;
+        config.setAppVersion(appVersion);
     }
 
     /**
@@ -194,10 +193,9 @@ public void setAppVersion(String appVersion) {
      * @see Delivery
      */
     public void setDelivery(Delivery delivery) {
-        config.delivery = delivery;
+        config.setDelivery(delivery);
     }
 
-
     /**
      * Set the method of delivery for Bugsnag sessions. By default we'll
      * send sessions asynchronously using a thread pool to
@@ -209,7 +207,7 @@ public void setDelivery(Delivery delivery) {
      * @see Delivery
      */
     public void setSessionDelivery(Delivery delivery) {
-        config.sessionDelivery = delivery;
+        config.setSessionDelivery(delivery);
     }
 
     /**
@@ -222,8 +220,9 @@ public void setSessionDelivery(Delivery delivery) {
      */
     @Deprecated
     public void setEndpoint(String endpoint) {
-        if (config.delivery instanceof HttpDelivery) {
-            ((HttpDelivery) config.delivery).setEndpoint(endpoint);
+        Delivery delivery = config.getDelivery();
+        if (delivery instanceof HttpDelivery) {
+            ((HttpDelivery) delivery).setEndpoint(endpoint);
         }
     }
 
@@ -237,7 +236,7 @@ public void setEndpoint(String endpoint) {
      * @param redactedKeys a list of String keys to redact from metadata
      */
     public void setRedactedKeys(String... redactedKeys) {
-        config.redactedKeys = redactedKeys;
+        config.setRedactedKeys(redactedKeys);
     }
 
     /**
@@ -246,7 +245,7 @@ public void setRedactedKeys(String... redactedKeys) {
      * @param discardClasses a list of exception classes to ignore
      */
     public void setDiscardClasses(String... discardClasses) {
-        config.discardClasses = discardClasses;
+        config.setDiscardClasses(discardClasses);
     }
 
     /**
@@ -258,9 +257,9 @@ public void setDiscardClasses(String... discardClasses) {
      */
     public void setEnabledReleaseStages(String... enabledReleaseStages) {
         if (enabledReleaseStages == null || enabledReleaseStages.length == 0) {
-            config.enabledReleaseStages = Collections.emptySet();
+            config.setEnabledReleaseStages(Collections.emptySet());
         } else {
-            config.enabledReleaseStages = Set.of(enabledReleaseStages);
+            config.setEnabledReleaseStages(Set.of(enabledReleaseStages));
         }
     }
 
@@ -271,21 +270,25 @@ public void setEnabledReleaseStages(String... enabledReleaseStages) {
      * @param projectPackages a list of package names
      */
     public void setProjectPackages(String... projectPackages) {
-        config.projectPackages = projectPackages;
+        config.setProjectPackages(projectPackages);
     }
 
     /**
-     * Set a proxy to use when delivering Bugsnag error reports and sessions. This is a convenient
+     * Set a proxy to use when delivering Bugsnag error reports and sessions. This
+     * is a convenient
      * shorthand for bugsnag.getDelivery().setProxy();
      *
      * @param proxy the proxy to use to send reports
      */
     public void setProxy(Proxy proxy) {
-        if (config.delivery instanceof HttpDelivery) {
-            ((HttpDelivery) config.delivery).setProxy(proxy);
+        Delivery delivery = config.getDelivery();
+        if (delivery instanceof HttpDelivery) {
+            ((HttpDelivery) delivery).setProxy(proxy);
         }
-        if (config.sessionDelivery instanceof HttpDelivery) {
-            ((HttpDelivery) config.sessionDelivery).setProxy(proxy);
+
+        Delivery sessionDelivery = config.getSessionDelivery();
+        if (sessionDelivery instanceof HttpDelivery) {
+            ((HttpDelivery) sessionDelivery).setProxy(proxy);
         }
     }
 
@@ -296,7 +299,7 @@ public void setProxy(Proxy proxy) {
      * @see #setEnabledReleaseStages
      */
     public void setReleaseStage(String releaseStage) {
-        config.releaseStage = releaseStage;
+        config.setReleaseStage(releaseStage);
     }
 
     /**
@@ -309,7 +312,7 @@ public void setReleaseStage(String releaseStage) {
      * @see #setEnabledReleaseStages
      */
     public void setSendThreads(boolean sendThreads) {
-        config.sendThreads = sendThreads;
+        config.setSendThreads(sendThreads);
     }
 
     /**
@@ -321,15 +324,17 @@ public void setSendThreads(boolean sendThreads) {
      * @see #setDelivery
      */
     public void setTimeout(int timeout) {
-        if (config.delivery instanceof HttpDelivery) {
-            ((HttpDelivery) config.delivery).setTimeout(timeout);
+        Delivery delivery = config.getDelivery();
+        if (delivery instanceof HttpDelivery) {
+            ((HttpDelivery) delivery).setTimeout(timeout);
         }
-        if (config.sessionDelivery instanceof HttpDelivery) {
-            ((HttpDelivery) config.sessionDelivery).setTimeout(timeout);
+
+        Delivery sessionDelivery = config.getSessionDelivery();
+        if (sessionDelivery instanceof HttpDelivery) {
+            ((HttpDelivery) sessionDelivery).setTimeout(timeout);
         }
     }
 
-
     //
     // Notification
     //
@@ -416,7 +421,6 @@ public boolean notify(Report report) {
         return notify(report, null);
     }
 
-
     boolean notify(Throwable throwable, HandledState handledState, Thread currentThread) {
         Report report = new Report(config, throwable, handledState, currentThread);
         return notify(report, null);
@@ -448,7 +452,7 @@ public boolean notify(Report report, Callback reportCallback) {
         // Don't notify unless releaseStage is in enabledReleaseStages
         if (!config.shouldNotifyForReleaseStage()) {
             LOGGER.debug("Error not reported to Bugsnag - {} is not in 'enabledReleaseStages'",
-                    config.releaseStage);
+                    config.getReleaseStage());
             return false;
         }
 
@@ -481,7 +485,8 @@ public boolean notify(Report report, Callback reportCallback) {
             }
         }
 
-        if (config.delivery == null) {
+        Delivery delivery = config.getDelivery();
+        if (delivery == null) {
             LOGGER.debug("Error not reported to Bugsnag - no delivery is set");
             return false;
         }
@@ -504,7 +509,7 @@ public boolean notify(Report report, Callback reportCallback) {
         // Deliver the notification
         LOGGER.debug("Reporting error to Bugsnag");
 
-        config.delivery.deliver(config.serializer, notification, config.getErrorApiHeaders());
+        delivery.deliver(config.getSerializer(), notification, config.getErrorApiHeaders());
 
         return true;
     }
@@ -556,8 +561,9 @@ public boolean shouldAutoCaptureSessions() {
      */
     @Deprecated
     public void setSessionEndpoint(String endpoint) {
-        if (config.sessionDelivery instanceof HttpDelivery) {
-            ((HttpDelivery) config.sessionDelivery).setEndpoint(endpoint);
+        Delivery sessionDelivery = config.getSessionDelivery();
+        if (sessionDelivery instanceof HttpDelivery) {
+            ((HttpDelivery) sessionDelivery).setEndpoint(endpoint);
         }
     }
 
@@ -595,14 +601,16 @@ public void close() {
         LOGGER.debug("Closing connection to Bugsnag");
         ExceptionHandler.disable(this);
 
-        // runs periodic checks, should shut down immediately as don't need to send any sessions
+        // runs periodic checks, should shut down immediately as don't need to send any
+        // sessions
         sessionExecutorService.shutdownNow();
 
         // flush remaining sessions
         sessionTracker.shutdown();
 
-        if (config.delivery != null) {
-            config.delivery.close();
+        Delivery delivery = config.getDelivery();
+        if (delivery != null) {
+            delivery.close();
         }
     }
 
@@ -616,7 +624,7 @@ public void close() {
      * @param value   the metadata value to add
      */
     public static void addThreadMetadata(String tabName, String key, Object value) {
-        THREAD_METADATA.get().addToTab(tabName, key, value);
+        THREAD_METADATA.get().addMetadata(tabName, key, value);
     }
 
     /**
@@ -632,7 +640,7 @@ public static void clearThreadMetadata() {
      * @param tabName the name of the tab to remove
      */
     public static void clearThreadMetadata(String tabName) {
-        THREAD_METADATA.get().clearTab(tabName);
+        THREAD_METADATA.get().clearMetadata(tabName);
     }
 
     /**
@@ -642,7 +650,7 @@ public static void clearThreadMetadata(String tabName) {
      * @param key     the key of the metadata to remove
      */
     public static void clearThreadMetadata(String tabName, String key) {
-        THREAD_METADATA.get().clearKey(tabName, key);
+        THREAD_METADATA.get().clearMetadata(tabName, key);
     }
 
     Configuration getConfig() {