Skip to content

Commit 4181927

Browse files
committed
add formatter
1 parent b32e11b commit 4181927

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

java-sdk-logging/logback-extension/src/test/java/com/google/api/logging/SDKLoggingMdcJsonProviderTest.java

+6-16
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,16 @@
1010
import java.io.IOException;
1111
import java.util.HashMap;
1212
import java.util.Map;
13-
import org.junit.jupiter.api.BeforeEach;
1413
import org.junit.jupiter.api.Test;
1514

1615
public class SDKLoggingMdcJsonProviderTest {
17-
private SDKLoggingMdcJsonProvider provider = new SDKLoggingMdcJsonProvider();
1816

19-
private JsonGenerator generator = mock(JsonGenerator.class);
20-
21-
private ILoggingEvent event = mock(ILoggingEvent.class);
22-
23-
private Map<String, String> mdc;
24-
25-
@BeforeEach
26-
public void setup() {
27-
mdc = new HashMap<>();
17+
@Test
18+
void testWriteJsonFormat() throws IOException {
19+
SDKLoggingMdcJsonProvider provider = new SDKLoggingMdcJsonProvider();
20+
JsonGenerator generator = mock(JsonGenerator.class);
21+
ILoggingEvent event = mock(ILoggingEvent.class);
22+
Map<String, String> mdc = new HashMap<>();
2823
mdc.put("json1", "{\n"
2924
+ " \"@version\": \"1\",\n"
3025
+ " \"textPayload\": \"Received response\",\n"
@@ -34,13 +29,8 @@ public void setup() {
3429
+ " }\n"
3530
+ "}");
3631
when(event.getMDCPropertyMap()).thenReturn(mdc);
37-
}
38-
39-
@Test
40-
void testUnwrapped() throws IOException {
4132

4233
provider.writeTo(generator, event);
43-
4434
verify(generator).writeFieldName("json1");
4535
verify(generator).writeTree(any());
4636
}

java-sdk-logging/pom.xml

+22
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<slf4j.version>1.7.36</slf4j.version>
1919
<junit.version>5.12.0</junit.version>
2020
<mockito.version>4.11.0</mockito.version>
21+
<google-java-format.version>1.7</google-java-format.version>
2122
</properties>
2223

2324
<dependencyManagement>
@@ -39,4 +40,25 @@
3940
</dependencies>
4041
</dependencyManagement>
4142

43+
<build>
44+
<plugins>
45+
<plugin>
46+
<groupId>com.coveo</groupId>
47+
<artifactId>fmt-maven-plugin</artifactId>
48+
<version>2.9</version>
49+
<configuration>
50+
<style>google</style>
51+
<verbose>true</verbose>
52+
</configuration>
53+
<dependencies>
54+
<dependency>
55+
<groupId>com.google.googlejavaformat</groupId>
56+
<artifactId>google-java-format</artifactId>
57+
<version>${google-java-format.version}</version>
58+
</dependency>
59+
</dependencies>
60+
</plugin>
61+
</plugins>
62+
</build>
63+
4264
</project>

0 commit comments

Comments
 (0)