Skip to content

Commit 9645488

Browse files
otaviojavaotaviojava
authored
Merge pull request #252 from dearrudam/refact-mongo
Refactoring the MongoDB implementation codes
2 parents 845b5e0 + 262d9ac commit 9645488

19 files changed

+351
-165
lines changed

‎jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/DocumentQueryConversor.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.eclipse.jnosql.communication.driver.ValueUtil;
2525

2626
import java.util.List;
27-
import java.util.stream.Collectors;
2827

2928
final class DocumentQueryConversor {
3029

@@ -50,13 +49,13 @@ public static Bson convert(DocumentCondition condition) {
5049
List<DocumentCondition> andList = condition.document().value().get(new TypeReference<>() {
5150
});
5251
yield Filters.and(andList.stream()
53-
.map(DocumentQueryConversor::convert).collect(Collectors.toList()));
52+
.map(DocumentQueryConversor::convert).toList());
5453
}
5554
case OR -> {
5655
List<DocumentCondition> orList = condition.document().value().get(new TypeReference<>() {
5756
});
5857
yield Filters.or(orList.stream()
59-
.map(DocumentQueryConversor::convert).collect(Collectors.toList()));
58+
.map(DocumentQueryConversor::convert).toList());
6059
}
6160
default -> throw new UnsupportedOperationException("The condition " + condition.condition()
6261
+ " is not supported from mongoDB diana driver");

‎jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBDocumentConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.List;
3131
import java.util.Map;
3232
import java.util.Optional;
33-
import java.util.stream.Collectors;
3433

3534
import static java.util.Objects.requireNonNull;
3635

@@ -83,7 +82,7 @@ public MongoDBDocumentManagerFactory apply(Settings settings) throws NullPointer
8382
.map(Object::toString)
8483
.map(HostPortConfiguration::new)
8584
.map(HostPortConfiguration::toServerAddress)
86-
.collect(Collectors.toList());
85+
.toList();
8786

8887
if (servers.isEmpty()) {
8988
Optional<ConnectionString> connectionString = settings

‎jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBDocumentManager.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import java.util.stream.Stream;
4141
import java.util.stream.StreamSupport;
4242

43-
import static java.util.stream.Collectors.toList;
4443
import static java.util.stream.StreamSupport.stream;
4544
import org.bson.BsonValue;
4645
import static org.eclipse.jnosql.databases.mongodb.communication.MongoDBUtils.ID_FIELD;
@@ -95,7 +94,7 @@ public Iterable<DocumentEntity> insert(Iterable<DocumentEntity> entities) {
9594
Objects.requireNonNull(entities, "entities is required");
9695
return StreamSupport.stream(entities.spliterator(), false)
9796
.map(this::insert)
98-
.collect(toList());
97+
.toList();
9998
}
10099

101100
@Override
@@ -104,7 +103,7 @@ public Iterable<DocumentEntity> insert(Iterable<DocumentEntity> entities, Durati
104103
Objects.requireNonNull(ttl, "ttl is required");
105104
return StreamSupport.stream(entities.spliterator(), false)
106105
.map(e -> insert(e, ttl))
107-
.collect(toList());
106+
.toList();
108107
}
109108

110109

@@ -129,7 +128,7 @@ public Iterable<DocumentEntity> update(Iterable<DocumentEntity> entities) {
129128
Objects.requireNonNull(entities, "entities is required");
130129
return StreamSupport.stream(entities.spliterator(), false)
131130
.map(this::update)
132-
.collect(toList());
131+
.toList();
133132
}
134133

135134

‎jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBUtils.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,17 @@
2525
import java.util.Map;
2626
import java.util.function.Function;
2727
import java.util.function.Predicate;
28-
import java.util.stream.Collectors;
28+
import java.util.function.UnaryOperator;
2929
import java.util.stream.StreamSupport;
3030

31-
import static java.util.stream.Collectors.toList;
3231
import static java.util.stream.Collectors.toMap;
3332
import static java.util.stream.StreamSupport.stream;
3433

3534
final class MongoDBUtils {
3635
static final String ID_FIELD = "_id";
3736

3837
private static final Function<Object, String> KEY_DOCUMENT = d -> cast(d).name();
39-
private static final Function<Object, Object> VALUE_DOCUMENT = d -> MongoDBUtils.convert(cast(d).value());
38+
private static final UnaryOperator<Object> VALUE_DOCUMENT = d -> MongoDBUtils.convert(cast(d).value());
4039

4140
private MongoDBUtils() {
4241
}
@@ -58,7 +57,7 @@ private static Object convert(Value value) {
5857
}
5958
if (isSudDocumentList(val)) {
6059
return StreamSupport.stream(Iterable.class.cast(val).spliterator(), false)
61-
.map(MongoDBUtils::getMap).collect(toList());
60+
.map(MongoDBUtils::getMap).toList();
6261
}
6362
return val;
6463
}
@@ -70,7 +69,7 @@ public static List<org.eclipse.jnosql.communication.document.Document> of(Map<St
7069
Object value = values.get(key);
7170
return getDocument(key, value);
7271
};
73-
return values.keySet().stream().filter(isNotNull).map(documentMap).collect(Collectors.toList());
72+
return values.keySet().stream().filter(isNotNull).map(documentMap).toList();
7473
}
7574

7675
private static org.eclipse.jnosql.communication.document.Document getDocument(String key, Object value) {
@@ -80,7 +79,7 @@ private static org.eclipse.jnosql.communication.document.Document getDocument(St
8079
List<List<org.eclipse.jnosql.communication.document.Document>> documents = new ArrayList<>();
8180
for (Object object : Iterable.class.cast(value)) {
8281
Map<?, ?> map = Map.class.cast(object);
83-
documents.add(map.entrySet().stream().map(e -> getDocument(e.getKey().toString(), e.getValue())).collect(toList()));
82+
documents.add(map.entrySet().stream().map(e -> getDocument(e.getKey().toString(), e.getValue())).toList());
8483
}
8584
return org.eclipse.jnosql.communication.document.Document.of(key, documents);
8685
}

‎jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/BinaryValueReaderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ class BinaryValueReaderTest {
3030
private ValueReader valueReader;
3131

3232
@BeforeEach
33-
public void init() {
33+
void init() {
3434
valueReader = new BinaryValueReader();
3535
}
3636

3737
@Test
38-
public void shouldValidateCompatibility() {
38+
void shouldValidateCompatibility() {
3939
assertTrue(valueReader.test(Binary.class));
4040
assertFalse(valueReader.test(AtomicBoolean.class));
4141
}
4242

4343
@Test
44-
public void shouldConvert() {
44+
void shouldConvert() {
4545
byte[] bytes = new byte[] {10, 10, 10};
4646
assertEquals(new Binary(bytes), valueReader.read(Binary.class, bytes));
4747
assertEquals(new Binary("hello".getBytes()), valueReader.read(Binary.class, "hello"));

‎jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoAuthenticationTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
class MongoAuthenticationTest {
3636

3737
@Test
38-
public void shouldReturnErrorWhenTheNumberParameterIsInvalid() {
38+
void shouldReturnErrorWhenTheNumberParameterIsInvalid() {
3939
Settings settings = Settings.builder().put(USER, "value")
4040
.build();
4141

4242
assertThrows(CommunicationException.class, () -> MongoAuthentication.of(settings));
4343

4444
}
4545
@Test
46-
public void shouldReturnOneAuthentication() {
46+
void shouldReturnOneAuthentication() {
4747
Settings settings = Settings.builder()
4848
.put(AUTHENTICATION_SOURCE, "database")
4949
.put(PASSWORD, "password")
@@ -59,7 +59,7 @@ public void shouldReturnOneAuthentication() {
5959
}
6060

6161
@Test
62-
public void shouldReturnOneAuthenticationWithGSSAPI() {
62+
void shouldReturnOneAuthenticationWithGSSAPI() {
6363
Settings settings = Settings.builder()
6464
.put(AUTHENTICATION_SOURCE, "database")
6565
.put(PASSWORD, "password")
@@ -75,7 +75,7 @@ public void shouldReturnOneAuthenticationWithGSSAPI() {
7575
}
7676

7777
@Test
78-
public void shouldReturnOneAuthenticationWithMongoX509() {
78+
void shouldReturnOneAuthenticationWithMongoX509() {
7979
Settings settings = Settings.builder()
8080
.put(AUTHENTICATION_SOURCE, "database")
8181
.put(PASSWORD, "password")
@@ -90,7 +90,7 @@ public void shouldReturnOneAuthenticationWithMongoX509() {
9090
}
9191

9292
@Test
93-
public void shouldReturnOneAuthenticationWithSCRAMSHA1() {
93+
void shouldReturnOneAuthenticationWithSCRAMSHA1() {
9494
Settings settings = Settings.builder()
9595
.put(AUTHENTICATION_SOURCE, "database")
9696
.put(PASSWORD, "password")
@@ -106,7 +106,7 @@ public void shouldReturnOneAuthenticationWithSCRAMSHA1() {
106106
}
107107

108108
@Test
109-
public void shouldReturnOneAuthenticationWithSCRAMSHA256() {
109+
void shouldReturnOneAuthenticationWithSCRAMSHA256() {
110110
Settings settings = Settings.builder()
111111
.put(AUTHENTICATION_SOURCE, "database")
112112
.put(PASSWORD, "password")

‎jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBDocumentConfigurationTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import static org.junit.jupiter.api.Assertions.assertNotNull;
2727
import static org.junit.jupiter.api.Assertions.assertThrows;
2828

29-
public class MongoDBDocumentConfigurationTest {
29+
class MongoDBDocumentConfigurationTest {
3030

3131
@Test
32-
public void shouldCreateDocumentManagerFactoryByMap() {
32+
void shouldCreateDocumentManagerFactoryByMap() {
3333
Map<String, String> map = new HashMap<>();
3434
map.put("mongodb-server-host-1", "172.17.0.2:27017");
3535
MongoDBDocumentConfiguration configuration = new MongoDBDocumentConfiguration();
@@ -39,26 +39,26 @@ public void shouldCreateDocumentManagerFactoryByMap() {
3939

4040

4141
@Test
42-
public void shouldReturnErrorWhendSettingsIsNull() {
42+
void shouldReturnErrorWhendSettingsIsNull() {
4343
DocumentConfiguration configuration = new MongoDBDocumentConfiguration();
4444
assertThrows(NullPointerException.class, () -> configuration.apply(null));
4545
}
4646

4747
@Test
48-
public void shouldReturnErrorWhenMapSettingsIsNull() {
48+
void shouldReturnErrorWhenMapSettingsIsNull() {
4949
MongoDBDocumentConfiguration configuration = new MongoDBDocumentConfiguration();
5050
assertThrows(NullPointerException.class, () -> configuration.get((Map) null));
5151
}
5252

5353
@Test
54-
public void shouldReturnFromConfiguration() {
54+
void shouldReturnFromConfiguration() {
5555
DocumentConfiguration configuration = DocumentConfiguration.getConfiguration();
5656
Assertions.assertNotNull(configuration);
5757
Assertions.assertTrue(configuration instanceof DocumentConfiguration);
5858
}
5959

6060
@Test
61-
public void shouldReturnFromConfigurationQuery() {
61+
void shouldReturnFromConfigurationQuery() {
6262
MongoDBDocumentConfiguration configuration = DocumentConfiguration
6363
.getConfiguration(MongoDBDocumentConfiguration.class);
6464
Assertions.assertNotNull(configuration);

‎jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBDocumentManagerFactoryTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import static org.junit.jupiter.api.Assertions.assertNotNull;
2727
import static org.junit.jupiter.api.Assertions.assertThrows;
2828

29-
public class MongoDBDocumentManagerFactoryTest {
29+
class MongoDBDocumentManagerFactoryTest {
3030

3131
private static MongoDBDocumentConfiguration configuration;
3232

@@ -36,23 +36,23 @@ public static void setUp() throws IOException {
3636
}
3737

3838
@Test
39-
public void shouldCreateEntityManager() {
39+
void shouldCreateEntityManager() {
4040
MongoDBDocumentManagerFactory mongoDBFactory = configuration.apply(Settings.builder().build());
4141
assertNotNull(mongoDBFactory.apply("database"));
4242
}
4343

4444
@Test
45-
public void shouldReturnNPEWhenSettingsIsNull() {
45+
void shouldReturnNPEWhenSettingsIsNull() {
4646
assertThrows(NullPointerException.class, () -> configuration.apply((Settings) null));
4747
}
4848

4949
@Test
50-
public void shouldReturnNPEWhenMapSettingsIsNull() {
50+
void shouldReturnNPEWhenMapSettingsIsNull() {
5151
assertThrows(NullPointerException.class, () -> configuration.get((Map<String, String>) null));
5252
}
5353

5454
@Test
55-
public void shouldReturnNPEWhenMongoClientIsNull() {
55+
void shouldReturnNPEWhenMongoClientIsNull() {
5656
assertThrows(NullPointerException.class, () -> configuration.get((MongoClient) null));
5757
}
5858

0 commit comments

Comments
 (0)