Thanks to visit codestin.com
Credit goes to github.com

Skip to content

DATAMONGO-1761 - add "distinct" method for "MongoTemplate" class #494

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

Closed
wants to merge 7 commits into from
Closed

DATAMONGO-1761 - add "distinct" method for "MongoTemplate" class #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ac97cb
add distinct method for MongoTemplate
Jul 28, 2017
26863eb
add a distinct method without query param
Jul 31, 2017
6af8437
reformat code
Jul 31, 2017
af97850
add author info
Aug 3, 2017
0f7cd17
Merge branch 'master' into issues/DATAMONGO-1761
javaerEric Sep 2, 2017
f00d563
Merge branch 'master' into issues/DATAMONGO-1761
javaerEric Sep 28, 2017
4f5855b
Merge branch 'master' of github.com:spring-projects/spring-data-mongodb
javaerEric Oct 17, 2017
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
100 changes: 75 additions & 25 deletions spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,33 @@
*/
package org.springframework.data.mongodb.core;

import com.mongodb.Cursor;
import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.Mongo;
import com.mongodb.MongoClient;
import com.mongodb.MongoException;
import com.mongodb.ReadPreference;
import com.mongodb.WriteConcern;
import com.mongodb.client.AggregateIterable;
import com.mongodb.client.DistinctIterable;
import com.mongodb.client.FindIterable;
import com.mongodb.client.MapReduceIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.CountOptions;
import com.mongodb.client.model.CreateCollectionOptions;
import com.mongodb.client.model.DeleteOptions;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.FindOneAndDeleteOptions;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import com.mongodb.client.model.UpdateOptions;
import com.mongodb.client.result.DeleteResult;
import com.mongodb.client.result.UpdateResult;
import com.mongodb.util.JSONParseException;

import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.core.query.SerializationUtils.*;

Expand Down Expand Up @@ -127,31 +154,29 @@
import org.springframework.util.ResourceUtils;
import org.springframework.util.StringUtils;

import com.mongodb.Cursor;
import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.Mongo;
import com.mongodb.MongoClient;
import com.mongodb.MongoException;
import com.mongodb.ReadPreference;
import com.mongodb.WriteConcern;
import com.mongodb.client.AggregateIterable;
import com.mongodb.client.FindIterable;
import com.mongodb.client.MapReduceIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.CountOptions;
import com.mongodb.client.model.CreateCollectionOptions;
import com.mongodb.client.model.DeleteOptions;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.FindOneAndDeleteOptions;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import com.mongodb.client.model.UpdateOptions;
import com.mongodb.client.result.DeleteResult;
import com.mongodb.client.result.UpdateResult;
import com.mongodb.util.JSONParseException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.Scanner;
import java.util.Set;
import java.util.concurrent.TimeUnit;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;

import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.SerializationUtils.serializeToJsonSafely;

/**
* Primary implementation of {@link MongoOperations}.
Expand All @@ -173,6 +198,7 @@
* @author Laszlo Csontos
* @author Maninder Singh
* @author Borislav Rangelov
* @author duozhilin
*/
@SuppressWarnings("deprecation")
public class MongoTemplate implements MongoOperations, ApplicationContextAware, IndexOperationsProvider {
Expand Down Expand Up @@ -808,6 +834,30 @@ public <T> T findById(Object id, Class<T> entityClass, String collectionName) {
return doFindOne(collectionName, new Document(idKey, id), new Document(), entityClass);
}

public <T, Z> List<T> distinct(String field, Class<Z> entityClass, Class<T> resultClass) {
return distinct(new Query(), field, determineCollectionName(entityClass), resultClass);
}

public <T, Z> List<T> distinct(Query query, String field, Class<Z> entityClass, Class<T> resultClass) {
return distinct(query, field, determineCollectionName(entityClass), resultClass);
}

public <T> List<T> distinct(Query query, String field, String collectionName, Class<T> resultClass) {
MongoCollection<Document> collection = this.getCollection(collectionName);
DistinctIterable<T> iterable = collection.distinct(field, query.getQueryObject(), resultClass);

MongoCursor<T> cursor = iterable.iterator();

List<T> result = new ArrayList<T>();

while (cursor.hasNext()) {
T object = cursor.next();
result.add(object);
}

return result;
}

@Override
public <T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass) {
return geoNear(near, entityClass, determineCollectionName(entityClass));
Expand Down
99 changes: 89 additions & 10 deletions ...-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@
*/
package org.springframework.data.mongodb.core;

import com.mongodb.DBRef;
import com.mongodb.Mongo;
import com.mongodb.MongoException;
import com.mongodb.ReadPreference;
import com.mongodb.WriteConcern;
import com.mongodb.client.FindIterable;
import com.mongodb.client.ListIndexesIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.result.UpdateResult;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.hamcrest.Matchers.*;
Expand Down Expand Up @@ -99,16 +110,50 @@
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import com.mongodb.DBRef;
import com.mongodb.Mongo;
import com.mongodb.MongoException;
import com.mongodb.ReadPreference;
import com.mongodb.WriteConcern;
import com.mongodb.client.FindIterable;
import com.mongodb.client.ListIndexesIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.result.UpdateResult;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;

import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.hasProperty;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isOneOf;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
import static org.springframework.data.mongodb.core.query.Update.update;

/**
* Integration test for {@link MongoTemplate}.
Expand All @@ -122,6 +167,7 @@
* @author Christoph Strobl
* @author Mark Paluch
* @author Laszlo Csontos
* @author duozhilin
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("classpath:infrastructure.xml")
Expand Down Expand Up @@ -749,6 +795,39 @@ public void testFindAndRemove() throws Exception {
assertThat(notFound, nullValue());
}

@Test
public void testDistinct() {
Address address1 = new Address();
address1.state = "PA";
address1.city = "Philadelphia";

Address address2 = new Address();
address2.state = "PA";
address2.city = " New York";

MyPerson person1 = new MyPerson();
person1.name = "Ben";
person1.address = address1;

MyPerson person2 = new MyPerson();
person2.name = "Eric";
person2.address = address2;

template.save(person1);
template.save(person2);

List<String> nameList = template.distinct("name", MyPerson.class, String.class);
assertTrue(nameList.containsAll(Arrays.asList(person1.getName(), person2.getName())));

Query query = new BasicQuery("{'address.state' : 'PA'}");
nameList = template.distinct(query, "name", MyPerson.class, String.class);
assertTrue(nameList.containsAll(Arrays.asList(person1.getName(), person2.getName())));

String collectionName = template.determineCollectionName(MyPerson.class);
nameList = template.distinct(query, "name", collectionName, String.class);
assertTrue(nameList.containsAll(Arrays.asList(person1.getName(), person2.getName())));
}

@Test
public void testUsingAnInQueryWithObjectId() throws Exception {

Expand Down