Skip to content

Commit c06e15f

Browse files
committed
Removed services sub-package from models
1 parent ea67fb8 commit c06e15f

21 files changed

+27
-30
lines changed

src/main/java/com/exceptionless/exceptionlessclient/models/services/EnvironmentInfo.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/EnvironmentInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exceptionless.exceptionlessclient.models.services;
1+
package com.exceptionless.exceptionlessclient.models;
22

33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
55
import com.exceptionless.exceptionlessclient.models.enums.EventTag;
6-
import com.exceptionless.exceptionlessclient.models.services.EnvironmentInfo;
7-
import com.exceptionless.exceptionlessclient.models.services.RequestInfo;
8-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
6+
import com.exceptionless.exceptionlessclient.models.error.Error;
97
import com.exceptionless.exceptionlessclient.queue.EventDataFilter;
108
import com.exceptionless.exceptionlessclient.queue.EventValidator;
119
import com.exceptionless.exceptionlessclient.utils.Utils;

src/main/java/com/exceptionless/exceptionlessclient/models/services/Module.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/Module.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exceptionless.exceptionlessclient.models.services;
1+
package com.exceptionless.exceptionlessclient.models;
22

33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;

src/main/java/com/exceptionless/exceptionlessclient/models/services/RequestInfo.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/RequestInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exceptionless.exceptionlessclient.models.services;
1+
package com.exceptionless.exceptionlessclient.models;
22

33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.Builder;

src/main/java/com/exceptionless/exceptionlessclient/models/services/error/Error.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/error/Error.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.exceptionless.exceptionlessclient.models.services.error;
1+
package com.exceptionless.exceptionlessclient.models.error;
22

3-
import com.exceptionless.exceptionlessclient.models.services.Module;
3+
import com.exceptionless.exceptionlessclient.models.Module;
44
import lombok.Builder;
55
import lombok.Data;
66
import lombok.EqualsAndHashCode;

src/main/java/com/exceptionless/exceptionlessclient/models/services/error/InnerError.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/error/InnerError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exceptionless.exceptionlessclient.models.services.error;
1+
package com.exceptionless.exceptionlessclient.models.error;
22

33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;

src/main/java/com/exceptionless/exceptionlessclient/models/services/error/Method.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/error/Method.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exceptionless.exceptionlessclient.models.services.error;
1+
package com.exceptionless.exceptionlessclient.models.error;
22

33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;

src/main/java/com/exceptionless/exceptionlessclient/models/services/error/Parameter.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/error/Parameter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exceptionless.exceptionlessclient.models.services.error;
1+
package com.exceptionless.exceptionlessclient.models.error;
22

33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;

src/main/java/com/exceptionless/exceptionlessclient/models/services/error/StackFrame.java renamed to src/main/java/com/exceptionless/exceptionlessclient/models/error/StackFrame.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exceptionless.exceptionlessclient.models.services.error;
1+
package com.exceptionless.exceptionlessclient.models.error;
22

33
import lombok.EqualsAndHashCode;
44
import lombok.Value;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
44
import com.exceptionless.exceptionlessclient.models.Event;
55
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
6-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
7-
import com.exceptionless.exceptionlessclient.models.services.error.InnerError;
6+
import com.exceptionless.exceptionlessclient.models.error.Error;
7+
import com.exceptionless.exceptionlessclient.models.error.InnerError;
88
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
99
import com.exceptionless.exceptionlessclient.plugins.MergedEvent;
1010
import lombok.Builder;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.exceptionless.exceptionlessclient.models.Event;
55
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
66
import com.exceptionless.exceptionlessclient.models.enums.EnvironmentInfoPropertyKey;
7-
import com.exceptionless.exceptionlessclient.models.services.EnvironmentInfo;
7+
import com.exceptionless.exceptionlessclient.models.EnvironmentInfo;
88
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
99
import com.exceptionless.exceptionlessclient.plugins.preconfigured.args.EnvironmentInfoGetArgs;
1010
import com.sun.management.OperatingSystemMXBean;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
66
import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
77
import com.exceptionless.exceptionlessclient.models.enums.EventType;
8-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
9-
import com.exceptionless.exceptionlessclient.models.services.error.StackFrame;
8+
import com.exceptionless.exceptionlessclient.models.error.Error;
9+
import com.exceptionless.exceptionlessclient.models.error.StackFrame;
1010
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
1111
import lombok.Builder;
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.exceptionless.exceptionlessclient.models.Event;
55
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
66
import com.exceptionless.exceptionlessclient.models.enums.EventType;
7-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
7+
import com.exceptionless.exceptionlessclient.models.error.Error;
88
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
99
import com.exceptionless.exceptionlessclient.settings.ServerSettings;
1010
import lombok.Builder;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
44
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
5-
import com.exceptionless.exceptionlessclient.models.services.Module;
6-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
5+
import com.exceptionless.exceptionlessclient.models.Module;
6+
import com.exceptionless.exceptionlessclient.models.error.Error;
77
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
88
import lombok.Builder;
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
44
import com.exceptionless.exceptionlessclient.models.Event;
55
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
6-
import com.exceptionless.exceptionlessclient.models.services.RequestInfo;
6+
import com.exceptionless.exceptionlessclient.models.RequestInfo;
77
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
88
import com.exceptionless.exceptionlessclient.plugins.preconfigured.args.RequestInfoGetArgs;
99
import com.exceptionless.exceptionlessclient.utils.Utils;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
import com.exceptionless.exceptionlessclient.models.Event;
66
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
77
import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
8-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
9-
import com.exceptionless.exceptionlessclient.models.services.error.StackFrame;
10-
import com.exceptionless.exceptionlessclient.plugins.preconfigured.DuplicateErrorCheckerPlugin;
8+
import com.exceptionless.exceptionlessclient.models.error.Error;
9+
import com.exceptionless.exceptionlessclient.models.error.StackFrame;
1110
import com.exceptionless.exceptionlessclient.queue.DefaultEventQueue;
1211
import org.junit.jupiter.api.BeforeEach;
1312
import org.junit.jupiter.api.Test;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.exceptionless.exceptionlessclient.configuration.PrivateInformationInclusions;
66
import com.exceptionless.exceptionlessclient.models.Event;
77
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
8-
import com.exceptionless.exceptionlessclient.models.services.EnvironmentInfo;
8+
import com.exceptionless.exceptionlessclient.models.EnvironmentInfo;
99
import org.junit.jupiter.api.BeforeEach;
1010
import org.junit.jupiter.api.Test;
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.exceptionless.exceptionlessclient.models.PluginContext;
88
import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
99
import com.exceptionless.exceptionlessclient.models.enums.EventType;
10-
import com.exceptionless.exceptionlessclient.models.services.error.StackFrame;
10+
import com.exceptionless.exceptionlessclient.models.error.StackFrame;
1111
import org.junit.jupiter.api.BeforeEach;
1212
import org.junit.jupiter.api.Test;
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
77
import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
88
import com.exceptionless.exceptionlessclient.models.enums.EventType;
9-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
9+
import com.exceptionless.exceptionlessclient.models.error.Error;
1010
import com.exceptionless.exceptionlessclient.settings.ServerSettings;
1111
import com.exceptionless.exceptionlessclient.storage.InMemoryStorage;
1212
import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.exceptionless.exceptionlessclient.models.Event;
66
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
77
import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
8-
import com.exceptionless.exceptionlessclient.models.services.Module;
9-
import com.exceptionless.exceptionlessclient.models.services.error.Error;
8+
import com.exceptionless.exceptionlessclient.models.Module;
9+
import com.exceptionless.exceptionlessclient.models.error.Error;
1010
import org.junit.jupiter.api.BeforeEach;
1111
import org.junit.jupiter.api.Test;
1212
import org.junit.jupiter.api.extension.ExtendWith;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.exceptionless.exceptionlessclient.models.PluginContext;
99
import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
1010
import com.exceptionless.exceptionlessclient.models.enums.ServerSettingKey;
11-
import com.exceptionless.exceptionlessclient.models.services.RequestInfo;
11+
import com.exceptionless.exceptionlessclient.models.RequestInfo;
1212
import com.exceptionless.exceptionlessclient.settings.ServerSettings;
1313
import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;
1414
import org.junit.jupiter.api.BeforeEach;

0 commit comments

Comments
 (0)