Skip to content

Commit 5664060

Browse files
stIncMalestIncMale
authored
Do misc improvements (#64)
1 parent 856ef93 commit 5664060

File tree

6 files changed

+24
-53
lines changed

6 files changed

+24
-53
lines changed

‎src/integrationTest/java/com/mongodb/hibernate/BasicCrudIntegrationTests.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,16 @@
1616

1717
package com.mongodb.hibernate;
1818

19-
import static com.mongodb.hibernate.internal.MongoConstants.ID_FIELD_NAME;
2019
import static org.assertj.core.api.Assertions.assertThat;
2120

2221
import com.mongodb.client.MongoCollection;
23-
import com.mongodb.client.model.Sorts;
2422
import com.mongodb.hibernate.junit.InjectMongoCollection;
2523
import com.mongodb.hibernate.junit.MongoExtension;
2624
import jakarta.persistence.Column;
2725
import jakarta.persistence.Embeddable;
2826
import jakarta.persistence.Entity;
2927
import jakarta.persistence.Id;
3028
import jakarta.persistence.Table;
31-
import java.util.ArrayList;
32-
import java.util.List;
3329
import org.bson.BsonDocument;
3430
import org.hibernate.annotations.DynamicUpdate;
3531
import org.hibernate.testing.orm.junit.DomainModel;
@@ -51,7 +47,7 @@
5147
class BasicCrudIntegrationTests implements SessionFactoryScopeAware {
5248

5349
@InjectMongoCollection("books")
54-
private static MongoCollection<BsonDocument> collection;
50+
private static MongoCollection<BsonDocument> mongoCollection;
5551

5652
private SessionFactoryScope sessionFactoryScope;
5753

@@ -144,14 +140,14 @@ void testSimpleDeletion() {
144140
book.publishYear = 1867;
145141
session.persist(book);
146142
});
147-
assertThat(getCollectionDocuments()).hasSize(1);
143+
assertThat(mongoCollection.find()).hasSize(1);
148144

149145
sessionFactoryScope.inTransaction(session -> {
150146
var book = session.getReference(Book.class, id);
151147
session.remove(book);
152148
});
153149

154-
assertThat(getCollectionDocuments()).isEmpty();
150+
assertThat(mongoCollection.find()).isEmpty();
155151
}
156152
}
157153

@@ -202,14 +198,8 @@ void testDynamicUpdate() {
202198
}
203199
}
204200

205-
private static List<BsonDocument> getCollectionDocuments() {
206-
var documents = new ArrayList<BsonDocument>();
207-
collection.find().sort(Sorts.ascending(ID_FIELD_NAME)).into(documents);
208-
return documents;
209-
}
210-
211201
private static void assertCollectionContainsExactly(BsonDocument expectedDoc) {
212-
assertThat(getCollectionDocuments()).containsExactly(expectedDoc);
202+
assertThat(mongoCollection.find()).containsExactly(expectedDoc);
213203
}
214204

215205
@Entity

‎src/integrationTest/java/com/mongodb/hibernate/JakartaPersistenceBootstrappingIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
class JakartaPersistenceBootstrappingIntegrationTests {
4444

4545
@InjectMongoCollection("items")
46-
private static MongoCollection<BsonDocument> collection;
46+
private static MongoCollection<BsonDocument> mongoCollection;
4747

4848
@Test
4949
void smoke(EntityManagerFactoryScope scope) {
@@ -52,7 +52,7 @@ void smoke(EntityManagerFactoryScope scope) {
5252
item.id = 1;
5353
em.persist(item);
5454
});
55-
assertThat(collection.find()).containsExactly(BsonDocument.parse("{_id: 1}"));
55+
assertThat(mongoCollection.find()).containsExactly(BsonDocument.parse("{_id: 1}"));
5656
}
5757

5858
@Entity

‎src/integrationTest/java/com/mongodb/hibernate/id/MongoIdFieldNameIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
class MongoIdFieldNameIntegrationTests {
4545

4646
@InjectMongoCollection("movies")
47-
private static MongoCollection<BsonDocument> collection;
47+
private static MongoCollection<BsonDocument> mongoCollection;
4848

4949
@Test
5050
void testEntityWithoutIdColumnAnnotation(SessionFactoryScope scope) {
@@ -77,7 +77,7 @@ void testEntityWithIdColumnAnnotationWithNameElementIdentical(SessionFactoryScop
7777
}
7878

7979
private static void assertCollectionContainsExactly(BsonDocument expectedDoc) {
80-
assertThat(collection.find()).containsExactly(expectedDoc);
80+
assertThat(mongoCollection.find()).containsExactly(expectedDoc);
8181
}
8282

8383
@Entity

‎src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@
1717
package com.mongodb.hibernate.jdbc;
1818

1919
import static com.mongodb.hibernate.internal.MongoConstants.ID_FIELD_NAME;
20+
import static org.assertj.core.api.Assertions.assertThat;
2021
import static org.junit.jupiter.api.Assertions.assertEquals;
2122

22-
import com.mongodb.client.MongoClient;
23-
import com.mongodb.client.MongoClients;
2423
import com.mongodb.client.MongoCollection;
2524
import com.mongodb.client.model.Sorts;
26-
import com.mongodb.hibernate.internal.cfg.MongoConfigurationBuilder;
25+
import com.mongodb.hibernate.junit.InjectMongoCollection;
26+
import com.mongodb.hibernate.junit.MongoExtension;
2727
import java.sql.Connection;
2828
import java.sql.SQLException;
29-
import java.util.ArrayList;
3029
import java.util.List;
3130
import java.util.function.Function;
3231
import org.bson.BsonDocument;
@@ -37,17 +36,17 @@
3736
import org.junit.jupiter.api.BeforeAll;
3837
import org.junit.jupiter.api.BeforeEach;
3938
import org.junit.jupiter.api.Nested;
39+
import org.junit.jupiter.api.extension.ExtendWith;
4040
import org.junit.jupiter.params.ParameterizedTest;
4141
import org.junit.jupiter.params.provider.ValueSource;
4242

43+
@ExtendWith(MongoExtension.class)
4344
class MongoPreparedStatementIntegrationTests {
4445

4546
@AutoClose
4647
private static SessionFactory sessionFactory;
4748

48-
@AutoClose
49-
private static MongoClient mongoClient;
50-
49+
@InjectMongoCollection("books")
5150
private static MongoCollection<BsonDocument> mongoCollection;
5251

5352
@AutoClose
@@ -56,9 +55,6 @@ class MongoPreparedStatementIntegrationTests {
5655
@BeforeAll
5756
static void beforeAll() {
5857
sessionFactory = new Configuration().buildSessionFactory();
59-
var config = new MongoConfigurationBuilder(sessionFactory.getProperties()).build();
60-
mongoClient = MongoClients.create(config.mongoClientSettings());
61-
mongoCollection = mongoClient.getDatabase(config.databaseName()).getCollection("books", BsonDocument.class);
6258
}
6359

6460
@BeforeEach
@@ -201,11 +197,8 @@ private void assertExecuteUpdate(
201197
connection.commit();
202198
}
203199
}
204-
var actualDocuments = mongoCollection
205-
.find()
206-
.sort(Sorts.ascending(ID_FIELD_NAME))
207-
.into(new ArrayList<>());
208-
assertEquals(expectedDocuments, actualDocuments);
200+
assertThat(mongoCollection.find().sort(Sorts.ascending(ID_FIELD_NAME)))
201+
.containsExactlyElementsOf(expectedDocuments);
209202
}
210203
});
211204
}

‎src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoStatementIntegrationTests.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
package com.mongodb.hibernate.jdbc;
1818

1919
import static com.mongodb.hibernate.internal.MongoConstants.ID_FIELD_NAME;
20+
import static org.assertj.core.api.Assertions.assertThat;
2021
import static org.junit.jupiter.api.Assertions.assertEquals;
2122

22-
import com.mongodb.client.MongoClient;
23-
import com.mongodb.client.MongoClients;
2423
import com.mongodb.client.MongoCollection;
2524
import com.mongodb.client.model.Sorts;
26-
import com.mongodb.hibernate.internal.cfg.MongoConfigurationBuilder;
27-
import java.util.ArrayList;
25+
import com.mongodb.hibernate.junit.InjectMongoCollection;
26+
import com.mongodb.hibernate.junit.MongoExtension;
2827
import java.util.List;
2928
import org.bson.BsonDocument;
3029
import org.hibernate.Session;
@@ -34,17 +33,17 @@
3433
import org.junit.jupiter.api.BeforeAll;
3534
import org.junit.jupiter.api.BeforeEach;
3635
import org.junit.jupiter.api.Nested;
36+
import org.junit.jupiter.api.extension.ExtendWith;
3737
import org.junit.jupiter.params.ParameterizedTest;
3838
import org.junit.jupiter.params.provider.ValueSource;
3939

40+
@ExtendWith(MongoExtension.class)
4041
class MongoStatementIntegrationTests {
4142

4243
@AutoClose
4344
private static SessionFactory sessionFactory;
4445

45-
@AutoClose
46-
private static MongoClient mongoClient;
47-
46+
@InjectMongoCollection("books")
4847
private static MongoCollection<BsonDocument> mongoCollection;
4948

5049
@AutoClose
@@ -53,9 +52,6 @@ class MongoStatementIntegrationTests {
5352
@BeforeAll
5453
static void beforeAll() {
5554
sessionFactory = new Configuration().buildSessionFactory();
56-
var config = new MongoConfigurationBuilder(sessionFactory.getProperties()).build();
57-
mongoClient = MongoClients.create(config.mongoClientSettings());
58-
mongoCollection = mongoClient.getDatabase(config.databaseName()).getCollection("books", BsonDocument.class);
5955
}
6056

6157
@BeforeEach
@@ -243,11 +239,8 @@ private void assertExecuteUpdate(
243239
connection.commit();
244240
}
245241
}
246-
var actualDocuments = mongoCollection
247-
.find()
248-
.sort(Sorts.ascending(ID_FIELD_NAME))
249-
.into(new ArrayList<>());
250-
assertEquals(expectedDocuments, actualDocuments);
242+
assertThat(mongoCollection.find().sort(Sorts.ascending(ID_FIELD_NAME)))
243+
.containsExactlyElementsOf(expectedDocuments);
251244
}
252245
});
253246
}

‎src/main/java/com/mongodb/hibernate/jdbc/MongoDatabaseMetaData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818

1919
import static com.mongodb.hibernate.internal.MongoAssertions.assertTrue;
2020
import static com.mongodb.hibernate.internal.MongoAssertions.fail;
21-
import static com.mongodb.hibernate.internal.VisibleForTesting.AccessModifier.PRIVATE;
2221

23-
import com.mongodb.hibernate.internal.VisibleForTesting;
2422
import java.sql.Connection;
2523
import java.sql.DatabaseMetaData;
2624
import java.sql.ResultSet;
@@ -30,9 +28,6 @@ final class MongoDatabaseMetaData implements DatabaseMetaDataAdapter {
3028
public static final String MONGO_DATABASE_PRODUCT_NAME = "MongoDB";
3129
public static final String MONGO_JDBC_DRIVER_NAME = "MongoDB Java Driver JDBC Adapter";
3230

33-
@VisibleForTesting(otherwise = PRIVATE)
34-
record VersionNumPair(int majorVersion, int minVersion) {}
35-
3631
private final Connection connection;
3732

3833
private final Version databaseVersion;

0 commit comments

Comments
 (0)