Skip to content

Revert changes to public apis that were altered instead of just depre… #1093

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

Merged
merged 1 commit into from
Mar 6, 2021
Merged

Revert changes to public apis that were altered instead of just depre… #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions ...in/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@ public class CouchbaseRepositoryQuery implements RepositoryQuery {
private final QueryMethodEvaluationContextProvider evaluationContextProvider;

public CouchbaseRepositoryQuery(final CouchbaseOperations operations, final CouchbaseQueryMethod queryMethod,
final NamedQueries namedQueries, final QueryMethodEvaluationContextProvider evaluationContextProvider) {
final NamedQueries namedQueries) {
this.operations = operations;
this.queryMethod = queryMethod;
this.namedQueries = namedQueries;
this.evaluationContextProvider = evaluationContextProvider;
throw new RuntimeException("Deprecated");
this.evaluationContextProvider = QueryMethodEvaluationContextProvider.DEFAULT;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public N1qlRepositoryQueryExecutor(final CouchbaseOperations operations, final C
this.queryMethod = queryMethod;
this.namedQueries = namedQueries;
this.evaluationContextProvider = evaluationContextProvider;
throw new RuntimeException("Deprecated");
}

private static final SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();
Expand All @@ -70,7 +69,8 @@ public Object execute(final Object[] parameters) {
SPEL_PARSER, evaluationContextProvider, namedQueries).createQuery();
} else {
final PartTree tree = new PartTree(queryMethod.getName(), domainClass);
query = new N1qlQueryCreator(tree, accessor, queryMethod, operations.getConverter(), operations.getBucketName()).createQuery();
query = new N1qlQueryCreator(tree, accessor, queryMethod, operations.getConverter(), operations.getBucketName())
.createQuery();
}

ExecutableFindByQueryOperation.ExecutableFindByQuery<?> operation = (ExecutableFindByQueryOperation.ExecutableFindByQuery<?>) operations
Expand Down
8 changes: 3 additions & 5 deletions ...org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@ public class ReactiveCouchbaseRepositoryQuery extends AbstractReactiveCouchbaseQ
private final QueryMethodEvaluationContextProvider evaluationContextProvider;

public ReactiveCouchbaseRepositoryQuery(final ReactiveCouchbaseOperations operations,
final ReactiveCouchbaseQueryMethod queryMethod, final NamedQueries namedQueries,
final QueryMethodEvaluationContextProvider evaluationContextProvider) {
super(queryMethod, operations, new SpelExpressionParser(), evaluationContextProvider);
final ReactiveCouchbaseQueryMethod queryMethod, final NamedQueries namedQueries) {
super(queryMethod, operations, new SpelExpressionParser(), QueryMethodEvaluationContextProvider.DEFAULT);
this.operations = operations;
this.queryMethod = queryMethod;
this.namedQueries = namedQueries;
this.evaluationContextProvider = evaluationContextProvider;
throw new RuntimeException("Deprecated");
this.evaluationContextProvider = QueryMethodEvaluationContextProvider.DEFAULT;
}

@Override
Expand Down
1 change: 0 additions & 1 deletion .../springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public ReactiveN1qlRepositoryQueryExecutor(final ReactiveCouchbaseOperations ope
this.queryMethod = queryMethod;
this.namedQueries = namedQueries;
this.evaluationContextProvider = evaluationContextProvider;
throw new RuntimeException("Deprecated");
}

/**
Expand Down
23 changes: 23 additions & 0 deletions ...g/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand All @@ -40,6 +41,7 @@
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.couchbase.CouchbaseClientFactory;
import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
import org.springframework.data.couchbase.core.CouchbaseTemplate;
import org.springframework.data.couchbase.domain.Address;
import org.springframework.data.couchbase.domain.Airport;
import org.springframework.data.couchbase.domain.AirportRepository;
Expand All @@ -48,13 +50,17 @@
import org.springframework.data.couchbase.domain.User;
import org.springframework.data.couchbase.domain.UserRepository;
import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories;
import org.springframework.data.couchbase.repository.query.CouchbaseQueryMethod;
import org.springframework.data.couchbase.repository.query.CouchbaseRepositoryQuery;
import org.springframework.data.couchbase.util.Capabilities;
import org.springframework.data.couchbase.util.ClusterAwareIntegrationTests;
import org.springframework.data.couchbase.util.ClusterType;
import org.springframework.data.couchbase.util.IgnoreWhen;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;

import com.couchbase.client.core.error.IndexExistsException;
Expand All @@ -76,6 +82,8 @@ public class CouchbaseRepositoryQueryIntegrationTests extends ClusterAwareIntegr

@Autowired UserRepository userRepository;

@Autowired CouchbaseTemplate couchbaseTemplate;

@BeforeEach
public void beforeEach() {
try {
Expand Down Expand Up @@ -305,6 +313,21 @@ void deleteAllById() {
}
}

@Test
void couchbaseRepositoryQuery() throws Exception {
User user = new User("1", "Dave", "Wilson");
userRepository.save(user);
String input = "findByFirstname";
Method method = UserRepository.class.getMethod(input, String.class);
CouchbaseQueryMethod queryMethod = new CouchbaseQueryMethod(method,
new DefaultRepositoryMetadata(UserRepository.class), new SpelAwareProxyProjectionFactory(),
couchbaseTemplate.getConverter().getMappingContext());

CouchbaseRepositoryQuery query = new CouchbaseRepositoryQuery(couchbaseTemplate, queryMethod, null);
List<User> users = (List<User>)query.execute(new String[] { "Dave" });
assertEquals(user, users.get(0));
}

private void sleep(int millis) {
try {
Thread.sleep(millis); // so they are executed out-of-order
Expand Down