Skip to content

Commit 94bfb6a

Browse files
committed
Fix code style issues
1 parent 792cede commit 94bfb6a

5 files changed

Lines changed: 49 additions & 47 deletions

File tree

.editorconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ max_line_length = 120
77
insert_final_newline = true
88
trim_trailing_whitespace = true
99

10-
[*.{xml,json}]
11-
continuation_indent_size = 4
10+
[*.json]
11+
indent_size = 2
1212

13-
[*.{java,gradle}]
13+
[*.{java,gradle,xml}]
1414
continuation_indent_size = 8
1515

1616
[*.{yml}]
1717
indent_size = 2
1818

19-
[*.{md}]
19+
[*.md]
2020
trim_trailing_whitespace = false

library/config/checkstyle/checkstyle.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
<!-- Checks whether files end with a new line. -->
1414
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
15-
<module name="NewlineAtEndOfFile"/>
15+
<module name="NewlineAtEndOfFile">
16+
<property name="lineSeparator" value="lf"/>
17+
</module>
1618

1719
<!-- Checks that property files contain the same keys. -->
1820
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->

library/src/test/java/me/proxer/library/ProxerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
*/
2424
public abstract class ProxerTest {
2525

26+
private final SslClient sslClient = SslClient.localhost();
27+
2628
protected MockWebServer server;
2729
protected OkHttpClient client;
2830
protected ProxerApi api;
2931

30-
private final SslClient sslClient = SslClient.localhost();
31-
3232
@Before
3333
public void setUp() throws IOException, GeneralSecurityException {
3434
api = constructApi().build();
Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"error": 0,
3-
"message": "Abfrage erfolgreich.",
4-
"data": [
5-
{
6-
"id": "777191",
7-
"fromid": "62",
8-
"message": "testttt",
9-
"timestamp": "1523608207",
10-
"action": "",
11-
"username": "genesis",
12-
"avatar": "62_RvGnYl.png"
13-
},
14-
{
15-
"id": "777189",
16-
"fromid": "62",
17-
"message": "777186",
18-
"timestamp": "1523608185",
19-
"action": "removeMessage",
20-
"username": "genesis",
21-
"avatar": "62_RvGnYl.png"
22-
}
23-
]
2+
"error": 0,
3+
"message": "Abfrage erfolgreich.",
4+
"data": [
5+
{
6+
"id": "777191",
7+
"fromid": "62",
8+
"message": "testttt",
9+
"timestamp": "1523608207",
10+
"action": "",
11+
"username": "genesis",
12+
"avatar": "62_RvGnYl.png"
13+
},
14+
{
15+
"id": "777189",
16+
"fromid": "62",
17+
"message": "777186",
18+
"timestamp": "1523608185",
19+
"action": "removeMessage",
20+
"username": "genesis",
21+
"avatar": "62_RvGnYl.png"
22+
}
23+
]
2424
}
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
2-
"error": 0,
3-
"message": "Abfrage erfolgreich.",
4-
"data": [
5-
{
6-
"id": "1",
7-
"name": "Proxer.Me Hauptchat",
8-
"topic": "Willkommen im Proxer-Chat!",
9-
"flag_readonly": "0",
10-
"flag_disabled": "0"
11-
},
12-
{
13-
"id": "6",
14-
"name": "Chat-Ankündigungen (21.03.18)",
15-
"topic": "",
16-
"flag_readonly": "1",
17-
"flag_disabled": "0"
18-
}
19-
]
2+
"error": 0,
3+
"message": "Abfrage erfolgreich.",
4+
"data": [
5+
{
6+
"id": "1",
7+
"name": "Proxer.Me Hauptchat",
8+
"topic": "Willkommen im Proxer-Chat!",
9+
"flag_readonly": "0",
10+
"flag_disabled": "0"
11+
},
12+
{
13+
"id": "6",
14+
"name": "Chat-Ankündigungen (21.03.18)",
15+
"topic": "",
16+
"flag_readonly": "1",
17+
"flag_disabled": "0"
18+
}
19+
]
2020
}

0 commit comments

Comments
 (0)