Skip to content

Commit bc7ad6a

Browse files
pc9795pc9795
authored
Merge pull request #51 from exceptionless/clean-services
Moving service logic to plugins
2 parents 0288de6 + ba267cb commit bc7ad6a

38 files changed

+412
-615
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ public class ConfigurationManager {
3535
private static final Integer API_KEY_MIN_LENGTH = 11;
3636
private static final Integer DEFAULT_HEART_BEAT_INTERVAL_IN_SECS = 30;
3737

38-
@Getter private final EnvironmentInfoCollectorIF environmentInfoCollector;
39-
@Getter private final ErrorParserIF errorParser;
4038
@Getter private final LastReferenceIdManagerIF lastReferenceIdManager;
41-
@Getter private final ModuleCollectorIF moduleCollector;
42-
@Getter private final RequestInfoCollectorIF requestInfoCollector;
4339
@Getter private final SubmissionClientIF submissionClient;
4440
@Getter private final EventQueueIF queue;
4541
@Getter private final Configuration configuration;
@@ -55,34 +51,19 @@ public class ConfigurationManager {
5551

5652
@Builder
5753
public ConfigurationManager(
58-
EnvironmentInfoCollectorIF environmentInfoCollector,
59-
ErrorParserIF errorParser,
6054
LastReferenceIdManagerIF lastReferenceIdManager,
6155
LogCapturerIF logCatpurer,
62-
ModuleCollectorIF moduleCollector,
63-
RequestInfoCollectorIF requestInfoCollector,
6456
SubmissionClientIF submissionClient,
6557
SettingsClientIF settingsClient,
6658
StorageProviderIF storageProvider,
6759
EventQueueIF queue,
6860
Configuration configuration,
6961
Integer maxQueueItems,
7062
Integer processingIntervalInSecs) {
71-
this.environmentInfoCollector =
72-
environmentInfoCollector == null
73-
? DefaultEnvironmentInfoCollector.builder().build()
74-
: environmentInfoCollector;
75-
this.errorParser = errorParser == null ? DefaultErrorParser.builder().build() : errorParser;
7663
this.lastReferenceIdManager =
7764
lastReferenceIdManager == null
7865
? DefaultLastReferenceIdManager.builder().build()
7966
: lastReferenceIdManager;
80-
this.moduleCollector =
81-
moduleCollector == null ? DefaultModuleCollector.builder().build() : moduleCollector;
82-
this.requestInfoCollector =
83-
requestInfoCollector == null
84-
? DefaultRequestInfoCollector.builder().build()
85-
: requestInfoCollector;
8667
this.storageProvider =
8768
storageProvider == null
8869
? InMemoryStorageProvider.builder().maxQueueItems(maxQueueItems).build()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ public PrivateInformationInclusions(
3333
Boolean ipAddress,
3434
Boolean machineName,
3535
Boolean userName) {
36-
this.queryString = queryString == null || queryString;
37-
this.postData = postData == null || postData;
38-
this.cookies = cookies == null || cookies;
39-
this.ipAddress = ipAddress == null || ipAddress;
40-
this.machineName = machineName == null || machineName;
41-
this.userName = userName == null || userName;
36+
this.queryString = queryString != null && queryString;
37+
this.postData = postData != null && postData;
38+
this.cookies = cookies != null && cookies;
39+
this.ipAddress = ipAddress != null && ipAddress;
40+
this.machineName = machineName != null && machineName;
41+
this.userName = userName != null && userName;
4242
this.propertyChangeSupport = new PropertyChangeSupport(this);
4343
}
4444

‎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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package com.exceptionless.exceptionlessclient.models;
22

3-
import com.exceptionless.exceptionlessclient.models.base.Model;
43
import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
54
import com.exceptionless.exceptionlessclient.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;
5+
import com.exceptionless.exceptionlessclient.models.base.Model;
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;

0 commit comments

Comments
 (0)