Skip to content

Fixed when IN query statement didn't work with Long values #36249

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
rinatmini merged 4 commits into from
Aug 5, 2023
Merged

Fixed when IN query statement didn't work with Long values #36249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc17de0
Fixed when IN query statement didn't work with Long values
rinatmini Aug 4, 2023
37d8c79
Warn fix
rinatmini Aug 4, 2023
a20db0c
Build warnings were fixed
rinatmini Aug 4, 2023
a3308f5
Added more tests + resolved PR comments
rinatmini Aug 4, 2023
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
1 change: 1 addition & 0 deletions sdk/spring/azure-spring-data-cosmos/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#### Breaking Changes

#### Bugs Fixed
* Fixed when IN statement in annotated query didn't work with Long values - See [PR 36249](https://github.com/Azure/azure-sdk-for-java/pull/36249).

@kushagraThapar kushagraThapar Aug 5, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Fixed when IN statement in annotated query didn't work with Long values - See [PR 36249](https://github.com/Azure/azure-sdk-for-java/pull/36249).
* Fixed an issue with IN statement in annotated queries not working for `Long` data type - See [PR 36249](https://github.com/Azure/azure-sdk-for-java/pull/36249).


#### Other Changes

Expand Down
3 changes: 1 addition & 2 deletions ...src/main/java/com/azure/spring/data/cosmos/repository/support/StringBasedCosmosQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ public Object execute(final Object[] parameters) {
if (!("").equals(paramName)) {
String inParamCheck = "array_contains(@" + paramName.toLowerCase(Locale.US);
if (parameters[paramIndex] instanceof Collection && !modifiedExpandedQuery.contains(inParamCheck)) {
List<String> expandParam = ((Collection<?>) parameters[paramIndex]).stream()
.map(Object::toString).collect(Collectors.toList());
List<Object> expandParam = ((Collection<?>) parameters[paramIndex]).stream().collect(Collectors.toList());
List<String> expandedParamKeys = new ArrayList<>();
for (int arrayIndex = 0; arrayIndex < expandParam.size(); arrayIndex++) {
expandedParamKeys.add("@" + paramName + arrayIndex);
Expand Down
3 changes: 1 addition & 2 deletions .../java/com/azure/spring/data/cosmos/repository/support/StringBasedReactiveCosmosQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ public Object execute(final Object[] parameters) {
if (!("").equals(paramName)) {
String inParamCheck = "array_contains(@" + paramName.toLowerCase(Locale.US);
if (parameters[paramIndex] instanceof Collection && !modifiedExpandedQuery.contains(inParamCheck)) {
ArrayList<String> expandParam = (ArrayList<String>) ((Collection<?>) parameters[paramIndex]).stream()
.map(Object::toString).collect(Collectors.toList());
List<Object> expandParam = ((Collection<?>) parameters[paramIndex]).stream().collect(Collectors.toList());
List<String> expandedParamKeys = new ArrayList<>();
for (int arrayIndex = 0; arrayIndex < expandParam.size(); arrayIndex++) {
expandedParamKeys.add("@" + paramName + arrayIndex);
Expand Down
13 changes: 13 additions & 0 deletions ...e-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.azure.cosmos.models.IndexingMode;
import com.azure.spring.data.cosmos.domain.Address;

import java.time.LocalDate;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -134,6 +135,18 @@ public final class TestConstants {
public static final int PRECONDITION_FAILED_STATUS_CODE = 412;
public static final int CONFLICT_STATUS_CODE = 409;

public static final Long LONG_ID_1 = Long.valueOf(10000001);
public static final Long LONG_ID_2 = Long.valueOf(20000002);
public static final Long LONG_ID_3 = Long.valueOf(54600003);

public static final Integer HOME_NUMBER_1 = 1;
public static final Integer HOME_NUMBER_2 = 99;
public static final Integer HOME_NUMBER_3 = 4444;

public static final LocalDate REGISTRATION_TIME_1D_AGO = LocalDate.now().minusDays(1);
public static final LocalDate REGISTRATION_TIME_1W_AGO = LocalDate.now().minusDays(7);
public static final LocalDate REGISTRATION_TIME_1M_AGO = LocalDate.now().minusMonths(1);

public static final Map<String, String> PASSPORT_IDS_BY_COUNTRY = new HashMap<String, String>() {{
put("United States of America", "123456789");
put("Côte d'Ivoire", "IC1234567");
Expand Down
34 changes: 34 additions & 0 deletions ...g/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Address.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.azure.spring.data.cosmos.core.mapping.PartitionKey;
import org.springframework.data.annotation.Id;

import java.time.LocalDate;
import java.util.Objects;

@Container(ru = TestConstants.DEFAULT_MINIMUM_RU)
Expand All @@ -24,6 +25,15 @@ public class Address {
@Id
String postalCode;
String street;

Long longId;
Comment thread
rinatmini marked this conversation as resolved.

Integer homeNumber;

LocalDate registrationDate;

boolean isOffice;

@PartitionKey
String city;

Expand All @@ -47,10 +57,34 @@ public String getCity() {
return city;
}

public Long getLongId() {
return longId;
}

public Integer getHomeNumber() {
return homeNumber;
}

public LocalDate getRegistrationDate() {
return registrationDate;
}

public boolean getIsOffice() {
return isOffice;
}

public void setCity(String city) {
this.city = city;
}

public void setLongId(Long longId) { this.longId = longId; }

public void setHomeNumber(Integer homeNumber) { this.homeNumber = homeNumber; }

public void setRegistrationDate(LocalDate registrationDate) { this.registrationDate = registrationDate; }

public void setIsOffice(boolean isOffice) { this.isOffice = isOffice; }

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down
63 changes: 63 additions & 0 deletions ...s/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -281,6 +282,68 @@ public void testAnnotatedQueryWithMultipleCitiesAndSort() {
assertAddressOrder(resultsAsc2, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2, Address.TEST_ADDRESS1_PARTITION1);
}

@Test
public void testAnnotatedQueryWithInLongParameters() {
Address.TEST_ADDRESS1_PARTITION1.setLongId(TestConstants.LONG_ID_1);
Address.TEST_ADDRESS2_PARTITION1.setLongId(TestConstants.LONG_ID_1);
Address.TEST_ADDRESS1_PARTITION2.setLongId(TestConstants.LONG_ID_2);
Address.TEST_ADDRESS4_PARTITION3.setLongId(TestConstants.LONG_ID_3);

final List<Long> longListForIn = Arrays.asList(TestConstants.LONG_ID_1, TestConstants.LONG_ID_2);

final List<Address> addresses = Arrays.asList(Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2, Address.TEST_ADDRESS4_PARTITION3);
addressRepository.saveAll(addresses);

final List<Address> resultsAsc = addressRepository.annotatedFindByInLongParameters(longListForIn, Sort.by(Sort.Direction.ASC, "longId"));
assertAddressOrder(resultsAsc, Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2);
}

@Test
public void testAnnotatedQueryWithInIntParameters() {
Address.TEST_ADDRESS1_PARTITION1.setHomeNumber(TestConstants.HOME_NUMBER_1);
Address.TEST_ADDRESS2_PARTITION1.setHomeNumber(TestConstants.HOME_NUMBER_1);
Address.TEST_ADDRESS1_PARTITION2.setHomeNumber(TestConstants.HOME_NUMBER_2);
Address.TEST_ADDRESS4_PARTITION3.setHomeNumber(TestConstants.HOME_NUMBER_3);

final List<Integer> homeNumbersForIn = Arrays.asList(TestConstants.HOME_NUMBER_1, TestConstants.HOME_NUMBER_2);

final List<Address> addresses = Arrays.asList(Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2, Address.TEST_ADDRESS4_PARTITION3);
addressRepository.saveAll(addresses);

final List<Address> resultsAsc = addressRepository.annotatedFindByInHomeNumberParameters(homeNumbersForIn, Sort.by(Sort.Direction.ASC, "longId"));
assertAddressOrder(resultsAsc, Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2);
}

@Test
public void testAnnotatedQueryWithInDateParameters() {
Address.TEST_ADDRESS1_PARTITION1.setRegistrationDate(TestConstants.REGISTRATION_TIME_1D_AGO);
Address.TEST_ADDRESS2_PARTITION1.setRegistrationDate(TestConstants.REGISTRATION_TIME_1D_AGO);
Address.TEST_ADDRESS1_PARTITION2.setRegistrationDate(TestConstants.REGISTRATION_TIME_1M_AGO);
Address.TEST_ADDRESS4_PARTITION3.setRegistrationDate(TestConstants.REGISTRATION_TIME_1W_AGO);

final List<LocalDate> datesForIn = Arrays.asList(TestConstants.REGISTRATION_TIME_1D_AGO, TestConstants.REGISTRATION_TIME_1M_AGO);

final List<Address> addresses = Arrays.asList(Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2, Address.TEST_ADDRESS4_PARTITION3);
addressRepository.saveAll(addresses);

final List<Address> resultsAsc = addressRepository.annotatedFindByInRegistrationDateParameters(datesForIn, Sort.by(Sort.Direction.ASC, "longId"));
assertAddressOrder(resultsAsc, Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2);
}

@Test
public void testAnnotatedQueryWithInBooleanParameters() {
Address.TEST_ADDRESS1_PARTITION1.setIsOffice(true);
Address.TEST_ADDRESS4_PARTITION3.setIsOffice(true);

final List<Boolean> boolForIn = Arrays.asList(true);

final List<Address> addresses = Arrays.asList(Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2, Address.TEST_ADDRESS4_PARTITION3);
addressRepository.saveAll(addresses);

final List<Address> resultsAsc = addressRepository.annotatedFindByInIsOfficeParameters(boolForIn, Sort.by(Sort.Direction.ASC, "longId"));
assertAddressOrder(resultsAsc, Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS4_PARTITION3);
}

@Test
public void testAnnotatedQueryWithArrayContains() {
final List<Address> addresses = Arrays.asList(Address.TEST_ADDRESS1_PARTITION1, Address.TEST_ADDRESS2_PARTITION1, Address.TEST_ADDRESS1_PARTITION2);
Expand Down
13 changes: 13 additions & 0 deletions ...s/src/test/java/com/azure/spring/data/cosmos/repository/repository/AddressRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDate;
import java.util.List;

@Repository
Expand Down Expand Up @@ -57,6 +58,18 @@ public interface AddressRepository extends CosmosRepository<Address, String> {
@Query(value = "select * from a where a.city IN (@cities)")
List<Address> annotatedFindByCityIn(@Param("cities") List<String> cities, Sort sort);

@Query(value = "select * from a where a.longId IN (@longList)")
List<Address> annotatedFindByInLongParameters(@Param("longList") List<Long> longsList, Sort sort);

@Query(value = "select * from a where a.homeNumber IN (@homeNumbers)")
List<Address> annotatedFindByInHomeNumberParameters(@Param("homeNumbers") List<Integer> longsList, Sort sort);

@Query(value = "select * from a where a.registrationDate IN (@registrationDates)")
List<Address> annotatedFindByInRegistrationDateParameters(@Param("registrationDates") List<LocalDate> registrationDates, Sort sort);

@Query(value = "select * from a where a.isOffice IN (@isOffices)")
List<Address> annotatedFindByInIsOfficeParameters(@Param("isOffices") List<Boolean> isOffices, Sort sort);

@Query(value = "SELECT * FROM a WHERE ARRAY_CONTAINS(@cities, a.city) ")
List<Address> annotatedFindByCities(@Param("cities") List<String> cities);

Expand Down