Skip to content

Goodbye Guava #707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stokito wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Goodbye Guava #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c33f409
[integration-test] OmemoManagerSetupHelper: Replace Guava Map.differe…
stokito May 1, 2026
bd861f9
[smack-java11-full] Replace Guava Resources usage with stdlib ClassLo…
stokito May 1, 2026
9d43d48
[smack-core] Smacktest: replace usage of Guava Set with stdlib HashSet
stokito May 1, 2026
0de7686
[build] Remove Guava library
stokito May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion smack-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ dependencies {
testFixturesApi "org.assertj:assertj-core:3.26.3"
testFixturesApi "org.xmlunit:xmlunit-assertj:$xmlUnitVersion"
testFixturesApi 'org.hamcrest:hamcrest-library:2.2'
testFixturesApi "com.google.guava:guava:${guavaVersion}"
}

class CreateFileTask extends DefaultTask {
Expand Down
6 changes: 3 additions & 3 deletions smack-core/src/test/java/org/jivesoftware/smack/SmackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;

import com.google.common.collect.Sets;
import org.junit.jupiter.api.Test;

public class SmackTest {

@Test
public void getNoticeStreamTest() throws IOException {
Set<String> expectedStrings = Sets.newHashSet(
Set<String> expectedStrings = new HashSet<>(Set.of(
"Florian Schmaus"
, "Paul Schaub"
);
));
int maxLineLength = 0;

try (InputStream inputStream = Smack.getNoticeStream()) {
Expand Down
1 change: 0 additions & 1 deletion smack-integration-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencies {
api project(':smack-websocket-okhttp')
api project(':smack-resolver-dnsjava')
implementation project(':smack-websocket-java11')
implementation "com.google.guava:guava:${guavaVersion}"
implementation "org.reflections:reflections:${orgReflectionsVersion}"
api 'eu.geekplace.javapinning:java-pinning-java11:1.3.0'
implementation group: 'commons-io', name: 'commons-io', version: "$commonsIoVersion"
Expand Down
4 changes: 1 addition & 3 deletions ...integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint;
import org.jivesoftware.smackx.pubsub.PubSubException;

import com.google.common.collect.Maps;

public class OmemoManagerSetupHelper {


Expand Down Expand Up @@ -77,7 +75,7 @@ public static void trustAllIdentitiesWithTests(OmemoManager alice, OmemoManager

Map<OmemoDevice, OmemoFingerprint> fps2 = alice.getActiveFingerprints(bob.getOwnJid());
assertEquals(fps1.size(), fps2.size());
assertTrue(Maps.difference(fps1, fps2).areEqual());
assertEquals(fps1, fps2);

assertAllDevicesAreDecided(alice, fps2);
assertAllDevicesAreTrusted(alice, fps2);
Expand Down
6 changes: 3 additions & 3 deletions ...t/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.jivesoftware.smack.util.EqualsUtil;
import org.jivesoftware.smack.util.HashCode;

import com.google.common.io.Resources;

import org.jgrapht.graph.DefaultEdge;
import org.jgrapht.graph.DirectedPseudograph;
import org.jgrapht.io.DOTImporter;
Expand All @@ -43,8 +43,8 @@ public class ModularXmppClientToServerConnectionStateGraphTest {

@Test
public void testStateGraphDotOutput() throws IOException, ImportException {
URL stateGraphDotFileUrl = Resources.getResource("state-graph.dot");
String expectedStateGraphDot = Resources.toString(stateGraphDotFileUrl, StandardCharsets.UTF_8);
URL stateGraphDotFileUrl = ModularXmppClientToServerConnectionStateGraphTest.class.getClassLoader().getResource("state-graph.dot");
String expectedStateGraphDot = new String(stateGraphDotFileUrl.openStream().readAllBytes(), StandardCharsets.UTF_8);

StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
Expand Down
Loading