Skip to content

Commit 4b62fb6

Browse files
jzheauxjzheaux
authored
Merge pull request eugenp#7916 from catalin-burcea/BAEL-16642
[BAEL-16642] Split or move guava-collections module
2 parents 8d94006 + adaff1d commit 4b62fb6

26 files changed

+149
-149
lines changed

‎guava-collections-map/README.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
=========
2+
3+
## Guava Collections Map examples
4+
5+
This module contains articles about map collections in Guava
6+
7+
### Relevant Articles:
8+
- [Guava – Maps](https://www.baeldung.com/guava-maps)
9+
- [Guide to Guava Multimap](https://www.baeldung.com/guava-multimap)
10+
- [Guide to Guava RangeMap](https://www.baeldung.com/guava-rangemap)
11+
- [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
12+
- [Guide to Guava ClassToInstanceMap](https://www.baeldung.com/guava-class-to-instance-map)

‎guava-collections-map/pom.xml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.baeldung.guava</groupId>
5+
<artifactId>guava-collections-map</artifactId>
6+
<version>0.1.0-SNAPSHOT</version>
7+
<name>guava-collections-map</name>
8+
9+
<parent>
10+
<groupId>com.baeldung</groupId>
11+
<artifactId>parent-java</artifactId>
12+
<version>0.0.1-SNAPSHOT</version>
13+
<relativePath>../parent-java</relativePath>
14+
</parent>
15+
16+
<dependencies>
17+
</dependencies>
18+
19+
<build>
20+
<finalName>guava-collections-map</finalName>
21+
<resources>
22+
<resource>
23+
<directory>src/main/resources</directory>
24+
<filtering>true</filtering>
25+
</resource>
26+
</resources>
27+
</build>
28+
29+
<properties>
30+
</properties>
31+
32+
</project>

‎guava-collections/src/test/java/org/baeldung/guava/ClassToInstanceMapUnitTest.java renamed to ‎guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.classtoinstancemap;
22
import com.google.common.collect.ClassToInstanceMap;
33
import com.google.common.collect.ImmutableClassToInstanceMap;
44
import com.google.common.collect.MutableClassToInstanceMap;

‎guava-collections/src/test/java/org/baeldung/guava/maps/initialize/GuavaMapInitializeUnitTest.java renamed to ‎guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava.maps.initialize;
1+
package com.baeldung.guava.initializemaps;
22

33
import static org.hamcrest.core.IsEqual.equalTo;
44
import static org.junit.Assert.*;

‎guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java renamed to ‎guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java

+3-100
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,18 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.maps;
22

3-
import static org.hamcrest.Matchers.contains;
43
import static org.hamcrest.Matchers.containsInAnyOrder;
54
import static org.junit.Assert.assertEquals;
65
import static org.junit.Assert.assertThat;
7-
import static org.junit.Assert.assertTrue;
86

97
import java.util.List;
108
import java.util.Map;
11-
import java.util.Set;
129

1310
import org.junit.Test;
1411

1512
import com.google.common.base.Function;
16-
import com.google.common.base.Joiner;
17-
import com.google.common.base.Predicates;
18-
import com.google.common.collect.ArrayListMultimap;
19-
import com.google.common.collect.BiMap;
20-
import com.google.common.collect.ClassToInstanceMap;
21-
import com.google.common.collect.ContiguousSet;
22-
import com.google.common.collect.DiscreteDomain;
23-
import com.google.common.collect.HashBasedTable;
24-
import com.google.common.collect.HashBiMap;
25-
import com.google.common.collect.HashMultiset;
26-
import com.google.common.collect.ImmutableList;
27-
import com.google.common.collect.ImmutableMap;
28-
import com.google.common.collect.ImmutableSet;
29-
import com.google.common.collect.ImmutableSortedMap;
30-
import com.google.common.collect.Iterables;
31-
import com.google.common.collect.Lists;
32-
import com.google.common.collect.Multimap;
33-
import com.google.common.collect.Multimaps;
34-
import com.google.common.collect.Multiset;
35-
import com.google.common.collect.Multisets;
36-
import com.google.common.collect.MutableClassToInstanceMap;
37-
import com.google.common.collect.Ordering;
38-
import com.google.common.collect.Range;
39-
import com.google.common.collect.RangeSet;
40-
import com.google.common.collect.Sets;
41-
import com.google.common.collect.Table;
42-
import com.google.common.collect.Tables;
43-
import com.google.common.collect.TreeRangeSet;
44-
45-
public class GuavaCollectionTypesUnitTest {
13+
import com.google.common.collect.*;
4614

47-
@Test
48-
public void whenCreateList_thenCreated() {
49-
final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
50-
51-
names.add("Tom");
52-
assertEquals(4, names.size());
53-
54-
names.remove("Adam");
55-
assertThat(names, contains("John", "Jane", "Tom"));
56-
}
57-
58-
@Test
59-
public void whenReverseList_thenReversed() {
60-
final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
61-
62-
final List<String> reversed = Lists.reverse(names);
63-
assertThat(reversed, contains("Jane", "Adam", "John"));
64-
}
65-
66-
@Test
67-
public void whenCreateCharacterListFromString_thenCreated() {
68-
final List<Character> chars = Lists.charactersOf("John");
69-
70-
assertEquals(4, chars.size());
71-
assertThat(chars, contains('J', 'o', 'h', 'n'));
72-
}
73-
74-
@Test
75-
public void whenPartitionList_thenPartitioned() {
76-
final List<String> names = Lists.newArrayList("John", "Jane", "Adam", "Tom", "Viki", "Tyler");
77-
final List<List<String>> result = Lists.partition(names, 2);
78-
79-
assertEquals(3, result.size());
80-
assertThat(result.get(0), contains("John", "Jane"));
81-
assertThat(result.get(1), contains("Adam", "Tom"));
82-
assertThat(result.get(2), contains("Viki", "Tyler"));
83-
}
84-
85-
@Test
86-
public void whenRemoveDuplicatesFromList_thenRemoved() {
87-
final List<Character> chars = Lists.newArrayList('h', 'e', 'l', 'l', 'o');
88-
assertEquals(5, chars.size());
89-
90-
final List<Character> result = ImmutableSet.copyOf(chars).asList();
91-
assertThat(result, contains('h', 'e', 'l', 'o'));
92-
}
93-
94-
@Test
95-
public void whenRemoveNullFromList_thenRemoved() {
96-
final List<String> names = Lists.newArrayList("John", null, "Adam", null, "Jane");
97-
Iterables.removeIf(names, Predicates.isNull());
98-
99-
assertEquals(3, names.size());
100-
assertThat(names, contains("John", "Adam", "Jane"));
101-
}
102-
103-
@Test
104-
public void whenCreateImmutableList_thenCreated() {
105-
final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
106-
107-
names.add("Tom");
108-
assertEquals(4, names.size());
109-
110-
final ImmutableList<String> immutable = ImmutableList.copyOf(names);
111-
assertThat(immutable, contains("John", "Adam", "Jane", "Tom"));
112-
}
15+
public class GuavaMapsUnitTest {
11316

11417
@Test
11518
public void whenCreateImmutableMap_thenCreated() {

‎guava-collections/src/test/java/org/baeldung/guava/GuavaMultiMapUnitTest.java renamed to ‎guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.multimap;
22

33
import com.google.common.collect.ArrayListMultimap;
44
import com.google.common.collect.Multimap;

‎guava-collections/src/test/java/org/baeldung/guava/GuavaRangeMapUnitTest.java renamed to ‎guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.rangemap;
22

33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertNull;

‎guava-collections/.gitignore

-13
This file was deleted.

‎guava-collections/README.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@
66
### Relevant Articles:
77
- [Guava Collections Cookbook](https://www.baeldung.com/guava-collections)
88
- [Guava Ordering Cookbook](https://www.baeldung.com/guava-order)
9+
- [Guide to Guava’s Ordering](https://www.baeldung.com/guava-ordering)
910
- [Hamcrest Collections Cookbook](https://www.baeldung.com/hamcrest-collections-arrays)
1011
- [Partition a List in Java](https://www.baeldung.com/java-list-split)
1112
- [Filtering and Transforming Collections in Guava](https://www.baeldung.com/guava-filter-and-transform-a-collection)
1213
- [Guava – Join and Split Collections](https://www.baeldung.com/guava-joiner-and-splitter-tutorial)
1314
- [Guava – Lists](https://www.baeldung.com/guava-lists)
14-
- [Guava – Maps](https://www.baeldung.com/guava-maps)
15-
- [Guide to Guava Multimap](https://www.baeldung.com/guava-multimap)
16-
- [Guide to Guava RangeMap](https://www.baeldung.com/guava-rangemap)
1715
- [Guide to Guava MinMaxPriorityQueue and EvictingQueue](https://www.baeldung.com/guava-minmax-priority-queue-and-evicting-queue)
18-
- [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
1916
- [Guide to Guava Table](https://www.baeldung.com/guava-table)
20-
- [Guide to Guava ClassToInstanceMap](https://www.baeldung.com/guava-class-to-instance-map)

‎guava-collections/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</dependencies>
4444

4545
<build>
46-
<finalName>guava</finalName>
46+
<finalName>guava-collections</finalName>
4747
<resources>
4848
<resource>
4949
<directory>src/main/resources</directory>

‎guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.collections;
22

33
import static org.junit.Assert.assertNull;
44
import static org.junit.Assert.assertTrue;

‎guava-collections/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.filtertransform;
22

33
import static org.hamcrest.Matchers.contains;
44
import static org.hamcrest.Matchers.containsInAnyOrder;

‎guava-collections/src/test/java/org/baeldung/guava/GuavaStringUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.joinsplit;
22

33
import static org.hamcrest.Matchers.contains;
44
import static org.hamcrest.Matchers.containsString;

‎guava-collections/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
package com.baeldung.guava.lists;
2+
3+
import com.google.common.base.Predicates;
4+
import com.google.common.collect.*;
5+
import org.junit.Test;
6+
7+
import java.util.List;
8+
9+
import static org.junit.Assert.assertEquals;
10+
import static org.junit.Assert.assertThat;
11+
import static org.hamcrest.Matchers.contains;
12+
13+
public class GuavaListsUnitTest {
14+
15+
@Test
16+
public void whenCreateList_thenCreated() {
17+
final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
18+
19+
names.add("Tom");
20+
assertEquals(4, names.size());
21+
22+
names.remove("Adam");
23+
assertThat(names, contains("John", "Jane", "Tom"));
24+
}
25+
26+
@Test
27+
public void whenReverseList_thenReversed() {
28+
final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
29+
30+
final List<String> reversed = Lists.reverse(names);
31+
assertThat(reversed, contains("Jane", "Adam", "John"));
32+
}
33+
34+
@Test
35+
public void whenCreateCharacterListFromString_thenCreated() {
36+
final List<Character> chars = Lists.charactersOf("John");
37+
38+
assertEquals(4, chars.size());
39+
assertThat(chars, contains('J', 'o', 'h', 'n'));
40+
}
41+
42+
@Test
43+
public void whenPartitionList_thenPartitioned() {
44+
final List<String> names = Lists.newArrayList("John", "Jane", "Adam", "Tom", "Viki", "Tyler");
45+
final List<List<String>> result = Lists.partition(names, 2);
46+
47+
assertEquals(3, result.size());
48+
assertThat(result.get(0), contains("John", "Jane"));
49+
assertThat(result.get(1), contains("Adam", "Tom"));
50+
assertThat(result.get(2), contains("Viki", "Tyler"));
51+
}
52+
53+
@Test
54+
public void whenRemoveDuplicatesFromList_thenRemoved() {
55+
final List<Character> chars = Lists.newArrayList('h', 'e', 'l', 'l', 'o');
56+
assertEquals(5, chars.size());
57+
58+
final List<Character> result = ImmutableSet.copyOf(chars).asList();
59+
assertThat(result, contains('h', 'e', 'l', 'o'));
60+
}
61+
62+
@Test
63+
public void whenRemoveNullFromList_thenRemoved() {
64+
final List<String> names = Lists.newArrayList("John", null, "Adam", null, "Jane");
65+
Iterables.removeIf(names, Predicates.isNull());
66+
67+
assertEquals(3, names.size());
68+
assertThat(names, contains("John", "Adam", "Jane"));
69+
}
70+
71+
@Test
72+
public void whenCreateImmutableList_thenCreated() {
73+
final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
74+
75+
names.add("Tom");
76+
assertEquals(4, names.size());
77+
78+
final ImmutableList<String> immutable = ImmutableList.copyOf(names);
79+
assertThat(immutable, contains("John", "Adam", "Jane", "Tom"));
80+
}
81+
82+
}

‎guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingExamplesUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.ordering;
22

33
import static org.hamcrest.Matchers.equalTo;
44
import static org.hamcrest.Matchers.nullValue;

‎guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.ordering;
22

33
import com.google.common.base.Function;
44
import com.google.common.collect.Ordering;

‎guava-collections/src/test/java/org/baeldung/java/CollectionApachePartitionUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.java;
1+
package com.baeldung.guava.partition;
22

33
import static org.hamcrest.Matchers.equalTo;
44
import static org.junit.Assert.assertThat;

‎guava-collections/src/test/java/org/baeldung/java/CollectionGuavaPartitionUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.java;
1+
package com.baeldung.guava.partition;
22

33
import static org.hamcrest.Matchers.equalTo;
44
import static org.junit.Assert.assertThat;

‎guava-collections/src/test/java/org/baeldung/java/CollectionJavaPartitionUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.java;
1+
package com.baeldung.guava.partition;
22

33
import static org.hamcrest.Matchers.equalTo;
44
import static org.junit.Assert.assertThat;

‎guava-collections/src/test/java/org/baeldung/guava/EvictingQueueUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.queues;
22

33

44
import com.google.common.collect.EvictingQueue;

‎guava-collections/src/test/java/org/baeldung/guava/MinMaxPriorityQueueUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.queues;
22

33

44
import com.google.common.collect.MinMaxPriorityQueue;

‎guava-collections/src/test/java/org/baeldung/guava/GuavaTableUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.guava;
1+
package com.baeldung.guava.table;
22

33
import static org.assertj.core.api.Assertions.*;
44
import java.util.List;

‎guava-collections/src/test/java/org/baeldung/hamcrest/HamcrestExamplesUnitTest.java renamed to ‎guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.hamcrest;
1+
package com.baeldung.hamcrest;
22

33
import static org.hamcrest.Matchers.contains;
44
import static org.hamcrest.Matchers.containsInAnyOrder;

0 commit comments

Comments
 (0)