Nits and small fixes

Author: pc9795

samples/example-app/pom.xml

@@ -8,5 +8,25 @@
     <artifactId>example-app</artifactId>
     <version>1.0</version>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.exceptionless</groupId>
+            <artifactId>exceptionless-client</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

samples/example-app/src/main/java/com/exceptionless/sample/app/Main.java

@@ -0,0 +1,22 @@
+package com.exceptionless.sample.app;
+
+import com.exceptionless.exceptionlessclient.ExceptionlessClient;
+
+public class Main {
+  public static void main(String[] args) {
+    ExceptionlessClient client =
+        ExceptionlessClient.from(
+            System.getenv("EXCEPTIONLESS_SAMPLE_APP_API_KEY"),
+            System.getenv("EXCEPTIONLESS_SAMPLE_APP_SERVER_URL"));
+
+    client.submitSessionStart();
+
+    client.submitException(new RuntimeException("Test exception"));
+    client.submitUnhandledException(new RuntimeException("Test exception"),"Test submission method");
+    client.submitFeatureUsage("Test feature");
+    client.submitLog("Test log");
+    client.submitNotFound("Test resource");
+
+    client.submitSessionEnd("Test user id");
+  }
+}

src/main/java/com/exceptionless/exceptionlessclient/ExceptionlessClient.java

@@ -11,6 +11,7 @@
 import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginRunner;
 import lombok.Builder;
+import lombok.Getter;
 
 import java.time.LocalDate;
 import java.util.Timer;
@@ -20,9 +21,9 @@ public class ExceptionlessClient {
   private static final String UPDATE_SETTINGS_TIMER_NAME = "update-settings-timer";
   private static final int UPDATE_SETTINGS_TIMER_INITIAL_DELAY = 5000;
 
-  private ConfigurationManager configurationManager;
-  private EventPluginRunner eventPluginRunner;
-  private Timer updateSettingsTimer;
+  @Getter private final ConfigurationManager configurationManager;
+  private final EventPluginRunner eventPluginRunner;
+  private final Timer updateSettingsTimer;
 
   @Builder
   public ExceptionlessClient(ConfigurationManager configurationManager) {

src/main/java/com/exceptionless/exceptionlessclient/configuration/Configuration.java

@@ -17,7 +17,7 @@ public class Configuration {
   @Getter private Integer submissionBatchSize;
   @Getter private Integer submissionClientTimeoutInMillis;
   @Getter private Integer settingsClientTimeoutInMillis;
-  private PropertyChangeSupport propertyChangeSupport;
+  private final PropertyChangeSupport propertyChangeSupport;
 
   @Builder
   public Configuration(

src/main/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManager.java

@@ -4,7 +4,7 @@
 import com.exceptionless.exceptionlessclient.lastreferenceidmanager.DefaultLastReferenceIdManager;
 import com.exceptionless.exceptionlessclient.lastreferenceidmanager.LastReferenceIdManagerIF;
 import com.exceptionless.exceptionlessclient.logging.LogIF;
-import com.exceptionless.exceptionlessclient.logging.NullLog;
+import com.exceptionless.exceptionlessclient.logging.ConsoleLog;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.models.UserInfo;
 import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
@@ -28,24 +28,24 @@
 import java.util.function.Consumer;
 
 public class ConfigurationManager {
-  @Getter private EnvironmentInfoCollectorIF environmentInfoCollector;
-  @Getter private ErrorParserIF errorParser;
-  @Getter private LastReferenceIdManagerIF lastReferenceIdManager;
-  @Getter private LogIF log;
-  @Getter private ModuleCollectorIF moduleCollector;
-  @Getter private RequestInfoCollectorIF requestInfoCollector;
-  @Getter private SubmissionClientIF submissionClient;
-  @Getter private EventQueueIF queue;
-  @Getter private Configuration configuration;
-  @Getter private Set<String> defaultTags;
-  @Getter private Map<String, Object> defaultData;
-  private List<Consumer<ConfigurationManager>> onChangedHandlers;
-  @Getter private SettingsManager settingsManager;
-  @Getter private Set<String> userAgentBotPatterns;
-  @Getter private PrivateInformationInclusions privateInformationInclusions;
-  private Set<String> dataExclusions;
+  @Getter private final EnvironmentInfoCollectorIF environmentInfoCollector;
+  @Getter private final ErrorParserIF errorParser;
+  @Getter private final LastReferenceIdManagerIF lastReferenceIdManager;
+  @Getter private final LogIF log;
+  @Getter private final ModuleCollectorIF moduleCollector;
+  @Getter private final RequestInfoCollectorIF requestInfoCollector;
+  @Getter private final SubmissionClientIF submissionClient;
+  @Getter private final EventQueueIF queue;
+  @Getter private final Configuration configuration;
+  @Getter private final Set<String> defaultTags;
+  @Getter private final Map<String, Object> defaultData;
+  private final List<Consumer<ConfigurationManager>> onChangedHandlers;
+  @Getter private final SettingsManager settingsManager;
+  private final Set<String> userAgentBotPatterns;
+  @Getter private final PrivateInformationInclusions privateInformationInclusions;
+  private final Set<String> dataExclusions;
   private PluginManager pluginManager;
-  @Getter private StorageProviderIF storageProvider;
+  @Getter private final StorageProviderIF storageProvider;
 
   @Builder
   public ConfigurationManager(
@@ -62,7 +62,7 @@ public ConfigurationManager(
       Configuration configuration,
       Integer maxQueueItems,
       Integer processingIntervalInSecs) {
-    this.log = log == null ? NullLog.builder().build() : log;
+    this.log = log == null ? ConsoleLog.builder().build() : log;
     this.environmentInfoCollector =
         environmentInfoCollector == null
             ? DefaultEnvironmentInfoCollector.builder().log(this.log).build()
@@ -82,18 +82,18 @@ public ConfigurationManager(
         storageProvider == null
             ? InMemoryStorageProvider.builder().maxQueueItems(maxQueueItems).build()
             : storageProvider;
+    this.configuration =
+            configuration == null ? Configuration.defaultConfiguration() : configuration;
     this.settingsManager =
         SettingsManager.builder()
             .settingsClient(
                 settingsClient == null
                     ? DefaultSettingsClient.builder().configuration(this.configuration).build()
                     : settingsClient)
-            .log(log)
+            .log(this.log)
             .storageProvider(this.storageProvider)
             .build();
     this.userAgentBotPatterns = new HashSet<>();
-    this.configuration =
-        configuration == null ? Configuration.defaultConfiguration() : configuration;
     this.submissionClient =
         submissionClient == null
             ? DefaultSubmissionClient.builder()
@@ -120,6 +120,7 @@ public ConfigurationManager(
     this.privateInformationInclusions = PrivateInformationInclusions.builder().build();
     this.pluginManager = PluginManager.builder().log(this.log).build();
     checkApiKeyIsValid();
+    addPropertyChangeListeners();
   }
 
   private void addPropertyChangeListeners() {
@@ -151,6 +152,13 @@ public Set<String> getDataExclusions() {
     return combinedExclusions;
   }
 
+  public Set<String> getUserAgentBotPatterns() {
+    Set<String> combinedPatterns =
+        settingsManager.getSavedServerSettings().getUserAgentBotPatterns();
+    combinedPatterns.addAll(userAgentBotPatterns);
+    return combinedPatterns;
+  }
+
   public void submitSessionHeartbeat(String sessionOrUserId) {
     log.info(String.format("Submitting session heartbeat: %s", sessionOrUserId));
     submissionClient.sendHeartBeat(sessionOrUserId, false);

src/main/java/com/exceptionless/exceptionlessclient/configuration/PluginManager.java

@@ -14,7 +14,7 @@
 import java.util.stream.Collectors;
 
 public class PluginManager {
-  private LogIF log;
+  private final LogIF log;
   @Getter private List<EventPluginIF> plugins;
 
   @Builder

src/main/java/com/exceptionless/exceptionlessclient/configuration/PrivateInformationInclusions.java

@@ -13,7 +13,7 @@ public class PrivateInformationInclusions {
   @Getter private Boolean ipAddress;
   @Getter private Boolean machineName;
   @Getter private Boolean userName;
-  private PropertyChangeSupport propertyChangeSupport;
+  private final PropertyChangeSupport propertyChangeSupport;
 
   @Builder
   public PrivateInformationInclusions(
@@ -23,12 +23,12 @@ public PrivateInformationInclusions(
       Boolean ipAddress,
       Boolean machineName,
       Boolean userName) {
-    this.queryString = queryString == null ? true : queryString;
-    this.postData = postData == null ? true : postData;
-    this.cookies = cookies == null ? true : cookies;
-    this.ipAddress = ipAddress == null ? true : ipAddress;
-    this.machineName = machineName == null ? true : machineName;
-    this.userName = userName == null ? true : userName;
+    this.queryString = queryString == null || queryString;
+    this.postData = postData == null || postData;
+    this.cookies = cookies == null || cookies;
+    this.ipAddress = ipAddress == null || ipAddress;
+    this.machineName = machineName == null || machineName;
+    this.userName = userName == null || userName;
     this.propertyChangeSupport = new PropertyChangeSupport(this);
   }
 

src/main/java/com/exceptionless/exceptionlessclient/logging/ConsoleLog.java

@@ -0,0 +1,34 @@
+package com.exceptionless.exceptionlessclient.logging;
+
+import lombok.Builder;
+
+public class ConsoleLog implements LogIF {
+  @Builder
+  public ConsoleLog() {}
+
+  @Override
+  public void trace(String message) {
+    System.out.printf("TRACE: %s%n", message);
+  }
+
+  @Override
+  public void info(String message) {
+    System.out.printf("INFO: %s%n", message);
+  }
+
+  @Override
+  public void warn(String message) {
+    System.out.printf("WARN: %s%n", message);
+  }
+
+  @Override
+  public void error(String message) {
+    System.out.printf("ERROR: %s%n", message);
+  }
+
+  @Override
+  public void error(String message, Exception e) {
+    System.out.printf("EXCEPTION: %s%n", message);
+    e.printStackTrace();
+  }
+}

src/main/java/com/exceptionless/exceptionlessclient/logging/NullLog.java

@@ -13,7 +13,7 @@ public enum EventPropertyKey {
   VERSION("@version"),
   REQUEST_INFO("@request");
 
-  private String value;
+  private final String value;
 
   EventPropertyKey(String value) {
     this.value = value;