Skip to content

Commit a778fb6

Browse files
author
Michael Mantos
committed
JAVA-56 - Format files
1 parent b0cb996 commit a778fb6

6 files changed

Lines changed: 96 additions & 105 deletions

File tree

src/main/java/com/stackify/api/common/http/HttpClient.java

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
/**
3838
* HttpClient
39+
*
3940
* @author Eric Martin
4041
*/
4142
public class HttpClient {
@@ -64,25 +65,25 @@ public class HttpClient {
6465

6566
/**
6667
* Constructor
68+
*
6769
* @param apiConfig API configuration
6870
*/
69-
public HttpClient(final ApiConfiguration apiConfig) {
70-
Preconditions.checkNotNull(apiConfig);
71-
this.apiConfig = apiConfig;
72-
73-
if (apiConfig.getHttpProxyHost() != null &&
74-
!apiConfig.getHttpProxyHost().isEmpty() &&
75-
apiConfig.getHttpProxyPort() != null &&
76-
!apiConfig.getHttpProxyPort().isEmpty()) {
77-
this.proxy = HttpProxy.build(apiConfig.getHttpProxyHost(), apiConfig.getHttpProxyPort());
78-
} else {
79-
this.proxy = HttpProxy.fromSystemProperties();
80-
}
81-
}
71+
public HttpClient(final ApiConfiguration apiConfig) {
72+
Preconditions.checkNotNull(apiConfig);
73+
this.apiConfig = apiConfig;
74+
75+
if (apiConfig.getHttpProxyHost() != null && !apiConfig.getHttpProxyHost().isEmpty()
76+
&& apiConfig.getHttpProxyPort() != null && !apiConfig.getHttpProxyPort().isEmpty()) {
77+
this.proxy = HttpProxy.build(apiConfig.getHttpProxyHost(), apiConfig.getHttpProxyPort());
78+
} else {
79+
this.proxy = HttpProxy.fromSystemProperties();
80+
}
81+
}
8282

8383
/**
8484
* Posts data to stackify
85-
* @param path REST path
85+
*
86+
* @param path REST path
8687
* @param jsonBytes JSON bytes
8788
* @return Response string
8889
* @throws IOException
@@ -94,14 +95,16 @@ public String post(final String path, final byte[] jsonBytes) throws IOException
9495

9596
/**
9697
* Posts data to stackify
97-
* @param path REST path
98+
*
99+
* @param path REST path
98100
* @param jsonBytes JSON bytes
99-
* @param gzip True if the post should be gzipped, false otherwise
101+
* @param gzip True if the post should be gzipped, false otherwise
100102
* @return Response string
101103
* @throws IOException
102104
* @throws HttpException
103105
*/
104-
public String post(final String path, final byte[] jsonBytes, final boolean gzip) throws IOException, HttpException {
106+
public String post(final String path, final byte[] jsonBytes, final boolean gzip)
107+
throws IOException, HttpException {
105108
Preconditions.checkNotNull(path);
106109
Preconditions.checkArgument(!path.isEmpty());
107110
Preconditions.checkNotNull(jsonBytes);
@@ -114,13 +117,8 @@ public String post(final String path, final byte[] jsonBytes, final boolean gzip
114117

115118
// request properties
116119
if (LOGGER.isDebugEnabled()) {
117-
LOGGER.debug(
118-
"#HttpClient #Post Sending request to {}/{} - Body: {}",
119-
apiConfig.getApiUrl(),
120-
path,
121-
(new ObjectMapper())
122-
.writeValueAsString(jsonBytes)
123-
);
120+
LOGGER.debug("#HttpClient #Post Sending request to {}/{} - Body: {}", apiConfig.getApiUrl(), path,
121+
(new ObjectMapper()).writeValueAsString(jsonBytes));
124122
}
125123

126124
connection = (HttpURLConnection) url.openConnection(proxy);
@@ -187,6 +185,7 @@ public String post(final String path, final byte[] jsonBytes, final boolean gzip
187185

188186
/**
189187
* Reads all remaining contents from the stream and closes it
188+
*
190189
* @param stream The stream
191190
* @return The contents of the stream
192191
* @throws IOException

src/main/java/com/stackify/api/common/log/LogAppender.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,8 @@ public class LogAppender<T> implements Closeable {
8888
*
8989
* @param logger Logger project name
9090
*/
91-
public LogAppender(@NonNull final String logger,
92-
@NonNull final EventAdapter<T> eventAdapter,
93-
final Masker masker,
94-
final boolean skipJson) {
91+
public LogAppender(@NonNull final String logger, @NonNull final EventAdapter<T> eventAdapter, final Masker masker,
92+
final boolean skipJson) {
9593
this.logger = logger;
9694
this.eventAdapter = eventAdapter;
9795
this.masker = masker;
@@ -103,9 +101,7 @@ public LogAppender(@NonNull final String logger,
103101
*
104102
* @param logger Logger project name
105103
*/
106-
public LogAppender(@NonNull final String logger,
107-
@NonNull final EventAdapter<T> eventAdapter,
108-
final Masker masker) {
104+
public LogAppender(@NonNull final String logger, @NonNull final EventAdapter<T> eventAdapter, final Masker masker) {
109105
this(logger, eventAdapter, masker, false);
110106
}
111107

src/main/java/com/stackify/api/common/log/LogTransportAgentSocket.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.slf4j.LoggerFactory;
3131

3232
/**
33-
* Log Transport - Agent Socket
34-
* Send log messages to Stackify Agent via Domain Socket
33+
* Log Transport - Agent Socket Send log messages to Stackify Agent via Domain
34+
* Socket
3535
*
3636
* @author Darin Howard
3737
*/
@@ -54,9 +54,7 @@ public class LogTransportAgentSocket implements LogTransport {
5454
*/
5555
private static final Logger LOGGER = LoggerFactory.getLogger(LogTransportAgentSocket.class);
5656

57-
public LogTransportAgentSocket(@NonNull final ApiConfiguration apiConfig,
58-
Masker masker,
59-
boolean skipJson) {
57+
public LogTransportAgentSocket(@NonNull final ApiConfiguration apiConfig, Masker masker, boolean skipJson) {
6058
this.apiConfig = apiConfig;
6159
this.logTransportPreProcessor = new LogTransportPreProcessor(masker, skipJson);
6260
this.httpSocketClient = new HttpSocketClient(apiConfig.getAgentSocketPath());
@@ -83,12 +81,8 @@ public void send(@NonNull final LogMsgGroup group) throws Exception {
8381
httpPost.setEntity(new ByteArrayEntity(logGroup.toByteArray()));
8482

8583
if (LOGGER.isDebugEnabled()) {
86-
LOGGER.debug(
87-
"#Log #Transport #Socket Sending request to {} - Body: {}",
88-
httpPost.getURI(),
89-
(new ObjectMapper())
90-
.writeValueAsString(group)
91-
);
84+
LOGGER.debug("#Log #Transport #Socket Sending request to {} - Body: {}", httpPost.getURI(),
85+
(new ObjectMapper()).writeValueAsString(group));
9286
}
9387

9488
httpSocketClient.send(httpPost);

src/main/java/com/stackify/api/common/log/LogTransportDirect.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
import lombok.extern.slf4j.Slf4j;
2929

3030
/**
31-
* Log Transport - Direct
32-
* Send log messages directly to Stackify
31+
* Log Transport - Direct Send log messages directly to Stackify
3332
*
3433
* @author Eric Martin
3534
*/
@@ -64,10 +63,8 @@ public class LogTransportDirect implements LogTransport {
6463
* @param apiConfig API configuration
6564
* @param objectMapper JSON object mapper
6665
*/
67-
public LogTransportDirect(@NonNull final ApiConfiguration apiConfig,
68-
@NonNull final ObjectMapper objectMapper,
69-
Masker masker,
70-
boolean skipJson) {
66+
public LogTransportDirect(@NonNull final ApiConfiguration apiConfig, @NonNull final ObjectMapper objectMapper,
67+
Masker masker, boolean skipJson) {
7168
this.apiConfig = apiConfig;
7269
this.objectMapper = objectMapper;
7370
this.logTransportPreProcessor = new LogTransportPreProcessor(masker, skipJson);
@@ -94,12 +91,8 @@ public void send(@NonNull final LogMsgGroup group) throws Exception {
9491

9592
try {
9693
if (LOGGER.isDebugEnabled()) {
97-
LOGGER.debug(
98-
"#Log #Transport #Direct Sending request to {} - Body: {}",
99-
LOG_SAVE_PATH,
100-
objectMapper
101-
.writeValueAsString(group)
102-
);
94+
LOGGER.debug("#Log #Transport #Direct Sending request to {} - Body: {}", LOG_SAVE_PATH,
95+
objectMapper.writeValueAsString(group));
10396
}
10497
httpClient.post(LOG_SAVE_PATH, jsonBytes, true);
10598
} catch (Exception e) {

src/test/java/com/stackify/api/common/log/LogAppenderTest.java

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -30,61 +30,67 @@
3030

3131
/**
3232
* LogAppender JUnit Test
33+
*
3334
* @author Eric Martin
3435
*/
3536
@RunWith(PowerMockRunner.class)
36-
@PrepareForTest({LogAppender.class, LogBackgroundService.class})
37+
@PrepareForTest({ LogAppender.class, LogBackgroundService.class })
3738
public class LogAppenderTest {
3839

3940
/**
4041
* testActivate
41-
* @throws Exception
42+
*
43+
* @throws Exception
4244
*/
4345
@Test
4446
public void testActivate() throws Exception {
4547
EventAdapter<?> adapter = Mockito.mock(EventAdapter.class);
4648
LogAppender<?> appender = new LogAppender("logger", adapter, new Masker());
47-
49+
4850
LogCollector collector = Mockito.mock(LogCollector.class);
4951
PowerMockito.whenNew(LogCollector.class).withAnyArguments().thenReturn(collector);
5052

5153
LogBackgroundService background = PowerMockito.mock(LogBackgroundService.class);
5254
PowerMockito.whenNew(LogBackgroundService.class).withAnyArguments().thenReturn(background);
53-
54-
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key").envDetail(Mockito.mock(EnvironmentDetail.class)).build();
55-
55+
56+
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key")
57+
.envDetail(Mockito.mock(EnvironmentDetail.class)).build();
58+
5659
appender.activate(config);
57-
60+
5861
Mockito.verify(background).start();
5962
}
60-
63+
6164
/**
6265
* testClose
63-
* @throws Exception
66+
*
67+
* @throws Exception
6468
*/
6569
@Test
6670
public void testClose() throws Exception {
6771
EventAdapter<?> adapter = Mockito.mock(EventAdapter.class);
6872
LogAppender<?> appender = new LogAppender("logger", adapter, new Masker());
69-
73+
7074
LogCollector collector = Mockito.mock(LogCollector.class);
7175
PowerMockito.whenNew(LogCollector.class).withAnyArguments().thenReturn(collector);
7276

7377
LogBackgroundService background = PowerMockito.mock(LogBackgroundService.class);
7478
PowerMockito.whenNew(LogBackgroundService.class).withAnyArguments().thenReturn(background);
75-
76-
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key").envDetail(Mockito.mock(EnvironmentDetail.class)).build();
77-
79+
80+
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key")
81+
.envDetail(Mockito.mock(EnvironmentDetail.class)).build();
82+
7883
appender.activate(config);
79-
84+
8085
appender.close();
81-
86+
8287
Mockito.verify(background).stop();
8388
}
8489

8590
/**
8691
* testAppend
87-
* @throws Exception
92+
*
93+
* @throws Exception
8894
*/
8995
@Test
9096
public void testAppend() throws Exception {
@@ -97,87 +103,91 @@ public void testAppend() throws Exception {
97103
Mockito.when(adapter.getThrowable(event)).thenReturn(t);
98104
Mockito.when(adapter.getStackifyError(event, t)).thenReturn(error);
99105
Mockito.when(adapter.getLogMsg(event, error)).thenReturn(logMsg);
100-
106+
101107
ErrorGovernor governor = Mockito.mock(ErrorGovernor.class);
102108
Mockito.when(governor.errorShouldBeSent(Mockito.any(StackifyError.class))).thenReturn(true);
103109
PowerMockito.whenNew(ErrorGovernor.class).withAnyArguments().thenReturn(governor);
104-
110+
105111
LogAppender<String> appender = new LogAppender<String>("logger", adapter, new Masker());
106-
112+
107113
LogCollector collector = Mockito.mock(LogCollector.class);
108114
PowerMockito.whenNew(LogCollector.class).withAnyArguments().thenReturn(collector);
109115

110116
LogBackgroundService background = PowerMockito.mock(LogBackgroundService.class);
111117
PowerMockito.whenNew(LogBackgroundService.class).withAnyArguments().thenReturn(background);
112-
113-
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key").envDetail(Mockito.mock(EnvironmentDetail.class)).build();
114-
118+
119+
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key")
120+
.envDetail(Mockito.mock(EnvironmentDetail.class)).build();
121+
115122
appender.activate(config);
116123

117124
Mockito.when(background.isRunning()).thenReturn(true);
118125

119126
appender.append(event);
120-
127+
121128
appender.close();
122-
129+
123130
Mockito.verify(collector).addLogMsg(logMsg);
124131
}
125-
132+
126133
/**
127134
* testAppendWithoutActivate
128-
* @throws Exception
135+
*
136+
* @throws Exception
129137
*/
130138
@Test
131139
public void testAppendWithoutActivate() throws Exception {
132140
String event = "log event";
133-
141+
134142
EventAdapter<String> adapter = Mockito.mock(EventAdapter.class);
135-
143+
136144
LogAppender<String> appender = new LogAppender<String>("logger", adapter, new Masker());
137-
145+
138146
LogCollector collector = Mockito.mock(LogCollector.class);
139147
PowerMockito.whenNew(LogCollector.class).withAnyArguments().thenReturn(collector);
140148

141149
appender.append(event);
142-
150+
143151
appender.close();
144-
145-
Mockito.verifyZeroInteractions(collector);
152+
153+
Mockito.verifyZeroInteractions(collector);
146154
}
147-
155+
148156
/**
149157
* testAppendInternalEvent
150-
* @throws Exception
158+
*
159+
* @throws Exception
151160
*/
152161
@Test
153162
public void testAppendInternalEvent() throws Exception {
154163
String event = "log event";
155-
164+
156165
EventAdapter<String> adapter = Mockito.mock(EventAdapter.class);
157166
Mockito.when(adapter.getClassName(event)).thenReturn("com.stackify.api.common.log.LogBackgroundService");
158-
167+
159168
ErrorGovernor governor = Mockito.mock(ErrorGovernor.class);
160169
Mockito.when(governor.errorShouldBeSent(Mockito.any(StackifyError.class))).thenReturn(true);
161170
PowerMockito.whenNew(ErrorGovernor.class).withAnyArguments().thenReturn(governor);
162-
171+
163172
LogAppender<String> appender = new LogAppender<String>("logger", adapter, new Masker());
164-
173+
165174
LogCollector collector = Mockito.mock(LogCollector.class);
166175
PowerMockito.whenNew(LogCollector.class).withAnyArguments().thenReturn(collector);
167176

168177
LogBackgroundService background = PowerMockito.mock(LogBackgroundService.class);
169178
PowerMockito.whenNew(LogBackgroundService.class).withAnyArguments().thenReturn(background);
170-
171-
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key").envDetail(Mockito.mock(EnvironmentDetail.class)).build();
172-
179+
180+
ApiConfiguration config = ApiConfiguration.newBuilder().apiUrl("url").apiKey("key")
181+
.envDetail(Mockito.mock(EnvironmentDetail.class)).build();
182+
173183
appender.activate(config);
174184

175185
Mockito.when(background.isRunning()).thenReturn(true);
176186

177187
appender.append(event);
178-
188+
179189
appender.close();
180-
181-
Mockito.verifyZeroInteractions(collector);
190+
191+
Mockito.verifyZeroInteractions(collector);
182192
}
183193
}

0 commit comments

Comments
 (0)