Merge pull request #54 from exceptionless/nits

Package restructure

Author: pc9795

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

@@ -6,9 +6,9 @@
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.models.PluginContext;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.models.enums.EventType;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventType;
+import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginRunner;
 import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;
 import lombok.Builder;

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

@@ -7,7 +7,7 @@
 import com.exceptionless.exceptionlessclient.logging.NullLogCapturer;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.models.UserInfo;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
 import com.exceptionless.exceptionlessclient.plugins.preconfigured.HeartbeatPlugin;
 import com.exceptionless.exceptionlessclient.queue.DefaultEventQueue;

src/main/java/com/exceptionless/exceptionlessclient/models/enums/EnvironmentInfoPropertyKey.java renamed to src/main/java/com/exceptionless/exceptionlessclient/enums/EnvironmentInfoPropertyKey.java

@@ -1,4 +1,4 @@
-package com.exceptionless.exceptionlessclient.models.enums;
+package com.exceptionless.exceptionlessclient.enums;
 
 public enum EnvironmentInfoPropertyKey {
   LOAD_AVG("loadavg"),

src/main/java/com/exceptionless/exceptionlessclient/models/enums/EventPropertyKey.java renamed to src/main/java/com/exceptionless/exceptionlessclient/enums/EventPropertyKey.java

@@ -1,4 +1,4 @@
-package com.exceptionless.exceptionlessclient.models.enums;
+package com.exceptionless.exceptionlessclient.enums;
 
 public enum EventPropertyKey {
   REF("@ref"),

src/main/java/com/exceptionless/exceptionlessclient/models/enums/EventTag.java renamed to src/main/java/com/exceptionless/exceptionlessclient/enums/EventTag.java

@@ -1,4 +1,4 @@
-package com.exceptionless.exceptionlessclient.models.enums;
+package com.exceptionless.exceptionlessclient.enums;
 
 public enum EventTag {
   CRITICAL("Critical");

src/main/java/com/exceptionless/exceptionlessclient/models/enums/EventType.java renamed to src/main/java/com/exceptionless/exceptionlessclient/enums/EventType.java

@@ -1,4 +1,4 @@
-package com.exceptionless.exceptionlessclient.models.enums;
+package com.exceptionless.exceptionlessclient.enums;
 
 public enum EventType {
   ERROR("error"),

src/main/java/com/exceptionless/exceptionlessclient/models/enums/ServerSettingKey.java renamed to src/main/java/com/exceptionless/exceptionlessclient/enums/ServerSettingKey.java

@@ -1,4 +1,4 @@
-package com.exceptionless.exceptionlessclient.models.enums;
+package com.exceptionless.exceptionlessclient.enums;
 
 public enum ServerSettingKey {
   DATA_EXCLUSIONS("@@DataExclusions"),

src/main/java/com/exceptionless/exceptionlessclient/models/Event.java

@@ -1,8 +1,8 @@
 package com.exceptionless.exceptionlessclient.models;
 
 import com.exceptionless.exceptionlessclient.models.base.Model;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.models.enums.EventTag;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventTag;
 import com.exceptionless.exceptionlessclient.models.services.EnvironmentInfo;
 import com.exceptionless.exceptionlessclient.models.services.RequestInfo;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;

src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/ErrorPlugin.java

@@ -3,8 +3,8 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.models.enums.EventType;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventType;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
 import lombok.Builder;
 

src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/EventExclusionPlugin.java

@@ -3,7 +3,7 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
-import com.exceptionless.exceptionlessclient.models.enums.EventType;
+import com.exceptionless.exceptionlessclient.enums.EventType;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
 import com.exceptionless.exceptionlessclient.settings.ServerSettings;

src/main/java/com/exceptionless/exceptionlessclient/queue/DefaultEventQueue.java

@@ -4,7 +4,7 @@
 import com.exceptionless.exceptionlessclient.exceptions.SubmissionClientException;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.storage.StorageItem;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
+import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.storage.StorageProviderIF;
 import com.exceptionless.exceptionlessclient.submission.SubmissionClientIF;
 import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;

src/main/java/com/exceptionless/exceptionlessclient/queue/EventQueueIF.java

@@ -1,7 +1,7 @@
 package com.exceptionless.exceptionlessclient.queue;
 
 import com.exceptionless.exceptionlessclient.models.Event;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
+import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 
 import java.time.Duration;
 import java.util.List;

src/main/java/com/exceptionless/exceptionlessclient/services/DefaultEnvironmentInfoCollector.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.services;
 
-import com.exceptionless.exceptionlessclient.models.enums.EnvironmentInfoPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EnvironmentInfoPropertyKey;
 import com.exceptionless.exceptionlessclient.models.services.EnvironmentInfo;
 import com.sun.management.OperatingSystemMXBean;
 import lombok.Builder;

src/main/java/com/exceptionless/exceptionlessclient/settings/DefaultSettingsClient.java

@@ -2,7 +2,6 @@
 
 import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
-import com.exceptionless.exceptionlessclient.models.submission.SettingsResponse;
 import com.exceptionless.exceptionlessclient.utils.Utils;
 import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;
 import com.fasterxml.jackson.core.type.TypeReference;

src/main/java/com/exceptionless/exceptionlessclient/settings/ServerSettings.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.settings;
 
-import com.exceptionless.exceptionlessclient.models.enums.ServerSettingKey;
+import com.exceptionless.exceptionlessclient.enums.ServerSettingKey;
 import com.exceptionless.exceptionlessclient.utils.Utils;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;

src/main/java/com/exceptionless/exceptionlessclient/settings/SettingsClientIF.java

@@ -1,8 +1,6 @@
 package com.exceptionless.exceptionlessclient.settings;
 
 
-import com.exceptionless.exceptionlessclient.models.submission.SettingsResponse;
-
 public interface SettingsClientIF {
     SettingsResponse getSettings(long version);
 }

src/main/java/com/exceptionless/exceptionlessclient/settings/SettingsManager.java

@@ -2,7 +2,6 @@
 
 import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
 import com.exceptionless.exceptionlessclient.models.storage.StorageItem;
-import com.exceptionless.exceptionlessclient.models.submission.SettingsResponse;
 import com.exceptionless.exceptionlessclient.storage.StorageProviderIF;
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/exceptionless/exceptionlessclient/models/submission/SettingsResponse.java renamed to src/main/java/com/exceptionless/exceptionlessclient/settings/SettingsResponse.java

@@ -1,6 +1,5 @@
-package com.exceptionless.exceptionlessclient.models.submission;
+package com.exceptionless.exceptionlessclient.settings;
 
-import com.exceptionless.exceptionlessclient.settings.ServerSettings;
 import lombok.Builder;
 import lombok.Value;
 

src/main/java/com/exceptionless/exceptionlessclient/submission/DefaultSubmissionClient.java

@@ -4,7 +4,6 @@
 import com.exceptionless.exceptionlessclient.exceptions.SubmissionClientException;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.settings.SettingsManager;
 import com.exceptionless.exceptionlessclient.utils.Utils;
 import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;

src/main/java/com/exceptionless/exceptionlessclient/submission/SubmissionClientIF.java

@@ -2,7 +2,6 @@
 
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
 
 import java.util.List;
 

src/main/java/com/exceptionless/exceptionlessclient/models/submission/SubmissionResponse.java renamed to src/main/java/com/exceptionless/exceptionlessclient/submission/SubmissionResponse.java

@@ -1,4 +1,4 @@
-package com.exceptionless.exceptionlessclient.models.submission;
+package com.exceptionless.exceptionlessclient.submission;
 
 import lombok.Builder;
 import lombok.Value;

src/test/java/com/exceptionless/exceptionlessclient/ExceptionlessClientTest.java

@@ -3,10 +3,10 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.models.enums.EventType;
-import com.exceptionless.exceptionlessclient.models.submission.SettingsResponse;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventType;
+import com.exceptionless.exceptionlessclient.settings.SettingsResponse;
+import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.queue.DefaultEventQueue;
 import com.exceptionless.exceptionlessclient.settings.DefaultSettingsClient;
 import com.exceptionless.exceptionlessclient.settings.ServerSettings;

src/test/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManagerTest.java

@@ -5,7 +5,7 @@
 import com.exceptionless.exceptionlessclient.logging.LogCapturerIF;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.models.UserInfo;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.settings.ServerSettings;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorage;

src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateErrorCheckerPluginTest.java

@@ -4,10 +4,9 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;
 import com.exceptionless.exceptionlessclient.models.services.error.StackFrame;
-import com.exceptionless.exceptionlessclient.plugins.preconfigured.DuplicateErrorCheckerPlugin;
 import com.exceptionless.exceptionlessclient.queue.DefaultEventQueue;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/ErrorPluginTest.java

@@ -5,8 +5,8 @@
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.models.PluginContext;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.models.enums.EventType;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventType;
 import com.exceptionless.exceptionlessclient.models.services.error.StackFrame;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/EventExclusionPluginTest.java

@@ -4,8 +4,8 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.models.enums.EventType;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventType;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;
 import com.exceptionless.exceptionlessclient.settings.ServerSettings;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorage;

src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/ModuleInfoPluginTest.java

@@ -4,10 +4,9 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.models.services.Module;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;
-import com.exceptionless.exceptionlessclient.plugins.preconfigured.ModuleInfoPlugin;
 import com.exceptionless.exceptionlessclient.services.DefaultModuleCollector;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/RequestInfoPluginTest.java

@@ -5,8 +5,8 @@
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.models.PluginContext;
-import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.models.enums.ServerSettingKey;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.ServerSettingKey;
 import com.exceptionless.exceptionlessclient.models.services.RequestInfo;
 import com.exceptionless.exceptionlessclient.settings.ServerSettings;
 import com.exceptionless.exceptionlessclient.services.DefaultRequestInfoCollector;

src/test/java/com/exceptionless/exceptionlessclient/queue/DefaultEventQueueTest.java

@@ -4,7 +4,7 @@
 import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.exceptions.SubmissionClientException;
 import com.exceptionless.exceptionlessclient.models.Event;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
+import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorage;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;
 import com.exceptionless.exceptionlessclient.submission.DefaultSubmissionClient;

src/test/java/com/exceptionless/exceptionlessclient/settings/DefaultSettingsClientTest.java

@@ -3,7 +3,6 @@
 import com.exceptionless.exceptionlessclient.TestFixtures;
 import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
-import com.exceptionless.exceptionlessclient.models.submission.SettingsResponse;
 import okhttp3.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/com/exceptionless/exceptionlessclient/settings/SettingsManagerTest.java

@@ -1,7 +1,6 @@
 package com.exceptionless.exceptionlessclient.settings;
 
 import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
-import com.exceptionless.exceptionlessclient.models.submission.SettingsResponse;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorage;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/com/exceptionless/exceptionlessclient/submission/DefaultSubmissionClientTest.java

@@ -5,7 +5,6 @@
 import com.exceptionless.exceptionlessclient.exceptions.SubmissionClientException;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
-import com.exceptionless.exceptionlessclient.models.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.settings.SettingsManager;
 import okhttp3.*;
 import org.junit.jupiter.api.BeforeEach;