Skip to content

Commit fd27fad

Browse files
vanitasvitaevanitasvitae
committed
Fix checkstyle issues and faulty test dependencies
1 parent 992a3e9 commit fd27fad

File tree

5 files changed

+72
-52
lines changed

5 files changed

+72
-52
lines changed

‎smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import java.io.IOException;
2020
import java.io.Writer;
21-
import java.util.ArrayList;
2221
import java.net.URL;
22+
import java.util.ArrayList;
2323
import java.util.Collection;
2424
import java.util.Date;
2525
import java.util.List;

‎smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/MemoryAvatarMetadataStore.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
*
3+
* Copyright 2020 Paul Schaub
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
117
package org.jivesoftware.smackx.avatar;
218

319
import java.util.Map;
@@ -27,7 +43,7 @@ private static class Tuple<A, B> {
2743
private final A first;
2844
private final B second;
2945

30-
public Tuple(A first, B second) {
46+
Tuple(A first, B second) {
3147
this.first = first;
3248
this.second = second;
3349
}

‎smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/DataExtensionTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
*/
1717
package org.jivesoftware.smackx.avatar;
1818

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
1921
import org.jivesoftware.smack.test.util.SmackTestSuite;
2022
import org.jivesoftware.smack.util.PacketParserUtils;
2123
import org.jivesoftware.smack.util.stringencoder.Base64;
2224
import org.jivesoftware.smack.xml.XmlPullParser;
2325
import org.jivesoftware.smackx.avatar.element.DataExtension;
2426
import org.jivesoftware.smackx.avatar.provider.DataProvider;
2527

26-
import org.junit.Assert;
27-
import org.junit.Test;
28+
import org.junit.jupiter.api.Test;
2829

2930
public class DataExtensionTest extends SmackTestSuite {
3031

@@ -38,11 +39,11 @@ public class DataExtensionTest extends SmackTestSuite {
3839
public void checkDataExtensionParse() throws Exception {
3940
byte[] data = Base64.decode("qANQR1DBwU4DX7jmYZnnfe32");
4041
DataExtension dataExtension = new DataExtension(data);
41-
Assert.assertEquals(dataExtensionExample, dataExtension.toXML().toString());
42+
assertEquals(dataExtensionExample, dataExtension.toXML().toString());
4243

4344
XmlPullParser parser = PacketParserUtils.getParserFor(dataExtensionExample);
4445
DataExtension dataExtensionFromProvider = new DataProvider().parse(parser);
45-
Assert.assertEquals(Base64.encodeToString(data), Base64.encodeToString(dataExtensionFromProvider.getData()));
46+
assertEquals(Base64.encodeToString(data), Base64.encodeToString(dataExtensionFromProvider.getData()));
4647
}
4748

4849
}

‎smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/MetadataExtensionTest.java‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
*/
1717
package org.jivesoftware.smackx.avatar;
1818

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertNull;
21+
1922
import java.net.URL;
2023
import java.util.ArrayList;
2124
import java.util.HashMap;
@@ -27,8 +30,7 @@
2730
import org.jivesoftware.smackx.avatar.element.MetadataExtension;
2831
import org.jivesoftware.smackx.avatar.provider.MetadataProvider;
2932

30-
import org.junit.Assert;
31-
import org.junit.Test;
33+
import org.junit.jupiter.api.Test;
3234

3335
public class MetadataExtensionTest {
3436

@@ -99,23 +101,23 @@ public void checkMetadataExtensionParse() throws Exception {
99101
infos.add(info);
100102

101103
MetadataExtension metadataExtension = new MetadataExtension(infos);
102-
Assert.assertEquals(metadataExtensionExample, metadataExtension.toXML().toString());
104+
assertEquals(metadataExtensionExample, metadataExtension.toXML().toString());
103105

104106
XmlPullParser parser = PacketParserUtils.getParserFor(metadataExtensionExample);
105107
MetadataExtension metadataExtensionFromProvider = new MetadataProvider().parse(parser);
106108

107-
Assert.assertEquals(id, metadataExtensionFromProvider.getInfoElements().get(0).getId());
108-
Assert.assertEquals(url, metadataExtensionFromProvider.getInfoElements().get(0).getUrl());
109-
Assert.assertEquals(bytes, metadataExtensionFromProvider.getInfoElements().get(0).getBytes().intValue());
110-
Assert.assertEquals(type, metadataExtensionFromProvider.getInfoElements().get(0).getType());
111-
Assert.assertEquals(pixelsHeight, metadataExtensionFromProvider.getInfoElements().get(0).getHeight().intValue());
112-
Assert.assertEquals(pixelsWidth, metadataExtensionFromProvider.getInfoElements().get(0).getWidth().intValue());
109+
assertEquals(id, metadataExtensionFromProvider.getInfoElements().get(0).getId());
110+
assertEquals(url, metadataExtensionFromProvider.getInfoElements().get(0).getUrl());
111+
assertEquals(bytes, metadataExtensionFromProvider.getInfoElements().get(0).getBytes().intValue());
112+
assertEquals(type, metadataExtensionFromProvider.getInfoElements().get(0).getType());
113+
assertEquals(pixelsHeight, metadataExtensionFromProvider.getInfoElements().get(0).getHeight().intValue());
114+
assertEquals(pixelsWidth, metadataExtensionFromProvider.getInfoElements().get(0).getWidth().intValue());
113115
}
114116

115117
@Test
116-
public void checkEmptyMetadataExtensionParse() throws Exception {
118+
public void checkEmptyMetadataExtensionParse() {
117119
MetadataExtension metadataExtension = new MetadataExtension(null);
118-
Assert.assertEquals(emptyMetadataExtensionExample, metadataExtension.toXML().toString());
120+
assertEquals(emptyMetadataExtensionExample, metadataExtension.toXML().toString());
119121
}
120122

121123
@Test
@@ -127,26 +129,26 @@ public void checkSeveralInfosInMetadataExtension() throws Exception {
127129
MetadataInfo info2 = metadataExtensionFromProvider.getInfoElements().get(1);
128130
MetadataInfo info3 = metadataExtensionFromProvider.getInfoElements().get(2);
129131

130-
Assert.assertEquals("111f4b3c50d7b0df729d299bc6f8e9ef9066971f", info1.getId());
131-
Assert.assertNull(info1.getUrl());
132-
Assert.assertEquals(12345, info1.getBytes().intValue());
133-
Assert.assertEquals("image/png", info1.getType());
134-
Assert.assertEquals(64, info1.getHeight().intValue());
135-
Assert.assertEquals(64, info1.getWidth().intValue());
136-
137-
Assert.assertEquals("e279f80c38f99c1e7e53e262b440993b2f7eea57", info2.getId());
138-
Assert.assertEquals(new URL("http://avatars.example.org/happy.png"), info2.getUrl());
139-
Assert.assertEquals(12345, info2.getBytes().intValue());
140-
Assert.assertEquals("image/png", info2.getType());
141-
Assert.assertEquals(64, info2.getHeight().intValue());
142-
Assert.assertEquals(128, info2.getWidth().intValue());
143-
144-
Assert.assertEquals("357a8123a30844a3aa99861b6349264ba67a5694", info3.getId());
145-
Assert.assertEquals(new URL("http://avatars.example.org/happy.gif"), info3.getUrl());
146-
Assert.assertEquals(23456, info3.getBytes().intValue());
147-
Assert.assertEquals("image/gif", info3.getType());
148-
Assert.assertEquals(64, info3.getHeight().intValue());
149-
Assert.assertEquals(64, info3.getWidth().intValue());
132+
assertEquals("111f4b3c50d7b0df729d299bc6f8e9ef9066971f", info1.getId());
133+
assertNull(info1.getUrl());
134+
assertEquals(12345, info1.getBytes().intValue());
135+
assertEquals("image/png", info1.getType());
136+
assertEquals(64, info1.getHeight().intValue());
137+
assertEquals(64, info1.getWidth().intValue());
138+
139+
assertEquals("e279f80c38f99c1e7e53e262b440993b2f7eea57", info2.getId());
140+
assertEquals(new URL("http://avatars.example.org/happy.png"), info2.getUrl());
141+
assertEquals(12345, info2.getBytes().intValue());
142+
assertEquals("image/png", info2.getType());
143+
assertEquals(64, info2.getHeight().intValue());
144+
assertEquals(128, info2.getWidth().intValue());
145+
146+
assertEquals("357a8123a30844a3aa99861b6349264ba67a5694", info3.getId());
147+
assertEquals(new URL("http://avatars.example.org/happy.gif"), info3.getUrl());
148+
assertEquals(23456, info3.getBytes().intValue());
149+
assertEquals("image/gif", info3.getType());
150+
assertEquals(64, info3.getHeight().intValue());
151+
assertEquals(64, info3.getWidth().intValue());
150152
}
151153

152154
@Test
@@ -155,24 +157,24 @@ public void checkInfosAndPointersParse() throws Exception {
155157
MetadataExtension metadataExtensionFromProvider = new MetadataProvider().parse(parser);
156158

157159
MetadataInfo info = metadataExtensionFromProvider.getInfoElements().get(0);
158-
Assert.assertEquals("111f4b3c50d7b0df729d299bc6f8e9ef9066971f", info.getId());
159-
Assert.assertNull(info.getUrl());
160-
Assert.assertEquals(12345, info.getBytes().intValue());
161-
Assert.assertEquals("image/png", info.getType());
162-
Assert.assertEquals(64, info.getHeight().intValue());
163-
Assert.assertEquals(64, info.getWidth().intValue());
160+
assertEquals("111f4b3c50d7b0df729d299bc6f8e9ef9066971f", info.getId());
161+
assertNull(info.getUrl());
162+
assertEquals(12345, info.getBytes().intValue());
163+
assertEquals("image/png", info.getType());
164+
assertEquals(64, info.getHeight().intValue());
165+
assertEquals(64, info.getWidth().intValue());
164166

165167
MetadataPointer pointer1 = metadataExtensionFromProvider.getPointerElements().get(0);
166168
Map<String, Object> fields1 = pointer1.getFields();
167-
Assert.assertEquals("http://example.com/virtualworlds", pointer1.getNamespace());
168-
Assert.assertEquals("Ancapistan", fields1.get("game"));
169-
Assert.assertEquals("Kropotkin", fields1.get("character"));
169+
assertEquals("http://example.com/virtualworlds", pointer1.getNamespace());
170+
assertEquals("Ancapistan", fields1.get("game"));
171+
assertEquals("Kropotkin", fields1.get("character"));
170172

171173
MetadataPointer pointer2 = metadataExtensionFromProvider.getPointerElements().get(1);
172174
Map<String, Object> fields2 = pointer2.getFields();
173-
Assert.assertEquals("http://sample.com/game", pointer2.getNamespace());
174-
Assert.assertEquals("hard", fields2.get("level"));
175-
Assert.assertEquals("2", fields2.get("players"));
175+
assertEquals("http://sample.com/game", pointer2.getNamespace());
176+
assertEquals("hard", fields2.get("level"));
177+
assertEquals("2", fields2.get("players"));
176178
}
177179

178180
@Test
@@ -202,7 +204,7 @@ public void createMetadataExtensionWithInfoAndPointer() {
202204
pointers.add(pointer2);
203205

204206
MetadataExtension metadataExtension = new MetadataExtension(infos, pointers);
205-
Assert.assertEquals(metadataWithInfoAndPointers, metadataExtension.toXML().toString());
207+
assertEquals(metadataWithInfoAndPointers, metadataExtension.toXML().toString());
206208
}
207209

208210
}

‎smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/Avatar.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.io.IOException;
2727
import java.io.InputStream;
2828
import java.io.OutputStream;
29+
import java.nio.charset.StandardCharsets;
2930
import java.util.Scanner;
3031
import java.util.logging.Level;
3132
import java.util.logging.Logger;
@@ -95,7 +96,7 @@ public void onAvatarUpdateReceived(EntityBareJid user, MetadataExtension metadat
9596

9697
connection.connect().login();
9798

98-
Scanner input = new Scanner(System.in);
99+
Scanner input = new Scanner(System.in, StandardCharsets.UTF_8.name());
99100
while (true) {
100101
String line = input.nextLine();
101102

@@ -109,7 +110,7 @@ public void onAvatarUpdateReceived(EntityBareJid user, MetadataExtension metadat
109110

110111
private static void createDownloadDirectory(File avatarDownloadDirectory) throws IOException {
111112
if (!avatarDownloadDirectory.mkdirs()) {
112-
throw new IOException("Cannot create temp directory '" + avatarDownloadDirectory.getAbsolutePath() +"'");
113+
throw new IOException("Cannot create temp directory '" + avatarDownloadDirectory.getAbsolutePath() + "'");
113114
} else {
114115
LOGGER.info("Created temporary avatar download directory '" + avatarDownloadDirectory.getAbsolutePath() + "'");
115116
}

0 commit comments

Comments
 (0)