Skip to content

Commit

Permalink
Fix duplicates in CRUD options
Browse files Browse the repository at this point in the history
- Remove CRUD<name>Options classes like a duplicates.
- Add options directly to the argument list without CRUD<name>Options class builders.
- Change Map:toString() test in the ProxyOperationBuildersTest class with EnumMap specific.
- Add test in ProxySpaceSelectOptionsIT class with after and first options.

Closes #417.
  • Loading branch information
nickkkccc committed Sep 13, 2023
1 parent d643df8 commit c8bfc3f
Show file tree
Hide file tree
Showing 24 changed files with 127 additions and 658 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@

### API changes

- Add "mode" option for crud select operation ([#107](https://github.com/tarantool/cartridge-java/issues/107))
- Change using of proxy client parameters (mode, rollback_on_error, stop_on_error) with enum classes ([#419](https://github.com/tarantool/cartridge-java/issues/419))
- Add `"mode"` option for crud select operation ([#107](https://github.com/tarantool/cartridge-java/issues/107))
- Change using of proxy client parameters (`mode`, `rollback_on_error`, `stop_on_error`) with enum classes ([#419](https://github.com/tarantool/cartridge-java/issues/419))
- Add `"after"` and `"first"` option for select operation like API in SelectOptions ([#417](https://github.com/tarantool/cartridge-java/issues/417))
#### Note:
- When using `Conditions:limit()` and `SelectOptions:first()` at the same time, the `smallest` one is selected.
- When using `Conditions:after()` and `SelectOptions:after()` at the same time, the `Conditions:after()` is selected.

### Bugfixes

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package io.tarantool.driver.api.space.options.interfaces;

import io.tarantool.driver.api.space.options.contracts.OperationWIthBatchSizeOptions;
import io.tarantool.driver.api.space.options.contracts.OperationWithAfterOptions;
import io.tarantool.driver.api.space.options.contracts.OperationWithBucketIdOptions;
import io.tarantool.driver.api.space.options.contracts.OperationWithFieldsOptions;
import io.tarantool.driver.api.space.options.contracts.OperationWithFirstOptions;
import io.tarantool.driver.api.space.options.contracts.OperationWithModeOptions;
import io.tarantool.driver.api.space.options.contracts.OperationWithTimeoutOptions;

Expand All @@ -14,5 +16,6 @@
*/
public interface SelectOptions<T extends SelectOptions<T>>
extends OperationWithBucketIdOptions<T>, OperationWithTimeoutOptions<T>, OperationWithFieldsOptions<T>,
OperationWithModeOptions<T>, OperationWIthBatchSizeOptions<T> {
OperationWithModeOptions<T>, OperationWIthBatchSizeOptions<T>, OperationWithAfterOptions<T>,
OperationWithFirstOptions<T> {
}

This file was deleted.

53 changes: 0 additions & 53 deletions src/main/java/io/tarantool/driver/core/proxy/CRUDBaseOptions.java

This file was deleted.

50 changes: 0 additions & 50 deletions src/main/java/io/tarantool/driver/core/proxy/CRUDBatchOptions.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit c8bfc3f

Please sign in to comment.