Skip to content

Commit 808ab6d

Browse files
roimenasheroimenashe
authored
Resolve dependencies for new single operation methods of VirtualList and ReactiveVirtualList. (#65)
1 parent ea3d4d8 commit 808ab6d

File tree

2 files changed

+40
-100
lines changed

2 files changed

+40
-100
lines changed

‎src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveVirtualList.java

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public Mono<E> getByValue(Object value, ReturnType returnResultsOfType) {
6464
* @param returnResultsOfType Type to return.
6565
* @return A list of the records which match the given value.
6666
*/
67-
@SuppressWarnings("unchecked")
6867
public Mono<E> getByValue(WritePolicy writePolicy, Object value, ReturnType returnResultsOfType) {
6968
if (writePolicy == null) {
7069
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -75,7 +74,7 @@ public Mono<E> getByValue(WritePolicy writePolicy, Object value, ReturnType retu
7574

7675
return reactiveAeroMapper.getReactorClient()
7776
.operate(writePolicy, key, interactor.getOperation())
78-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
77+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
7978
}
8079

8180
/**
@@ -137,7 +136,6 @@ public Mono<E> getByValueList(List<Object> values, ReturnType returnResultsOfTyp
137136
* @param returnResultsOfType Type to return.
138137
* @return A list of the records which match the given list of values.
139138
*/
140-
@SuppressWarnings("unchecked")
141139
public Mono<E> getByValueList(WritePolicy writePolicy, List<Object> values, ReturnType returnResultsOfType) {
142140
if (writePolicy == null) {
143141
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -148,7 +146,7 @@ public Mono<E> getByValueList(WritePolicy writePolicy, List<Object> values, Retu
148146

149147
return reactiveAeroMapper.getReactorClient()
150148
.operate(writePolicy, key, interactor.getOperation())
151-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
149+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
152150
}
153151

154152
/**
@@ -170,7 +168,6 @@ public Mono<E> getByValueRelativeRankRange(Object value, int rank, ReturnType re
170168
* @param returnResultsOfType Type to return.
171169
* @return A list of records that matches the given value and rank.
172170
*/
173-
@SuppressWarnings("unchecked")
174171
public Mono<E> getByValueRelativeRankRange(WritePolicy writePolicy, Object value, int rank, ReturnType returnResultsOfType) {
175172
if (writePolicy == null) {
176173
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -181,7 +178,7 @@ public Mono<E> getByValueRelativeRankRange(WritePolicy writePolicy, Object value
181178

182179
return reactiveAeroMapper.getReactorClient()
183180
.operate(writePolicy, key, interactor.getOperation())
184-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
181+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
185182
}
186183

187184
/**
@@ -205,7 +202,6 @@ public Mono<E> getByValueRelativeRankRange(Object value, int rank, int count, Re
205202
* @param returnResultsOfType Type to return.
206203
* @return A list of records that matches the given value, rank and count.
207204
*/
208-
@SuppressWarnings("unchecked")
209205
public Mono<E> getByValueRelativeRankRange(WritePolicy writePolicy, Object value, int rank, int count, ReturnType returnResultsOfType) {
210206
if (writePolicy == null) {
211207
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -216,7 +212,7 @@ public Mono<E> getByValueRelativeRankRange(WritePolicy writePolicy, Object value
216212

217213
return reactiveAeroMapper.getReactorClient()
218214
.operate(writePolicy, key, interactor.getOperation())
219-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
215+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
220216
}
221217

222218
/**
@@ -236,7 +232,6 @@ public Mono<E> getByIndexRange(int index, ReturnType returnResultsOfType) {
236232
* @param returnResultsOfType Type to return.
237233
* @return A list of the records which match the given index.
238234
*/
239-
@SuppressWarnings("unchecked")
240235
public Mono<E> getByIndexRange(WritePolicy writePolicy, int index, ReturnType returnResultsOfType) {
241236
if (writePolicy == null) {
242237
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -247,7 +242,7 @@ public Mono<E> getByIndexRange(WritePolicy writePolicy, int index, ReturnType re
247242

248243
return reactiveAeroMapper.getReactorClient()
249244
.operate(writePolicy, key, interactor.getOperation())
250-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
245+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
251246
}
252247

253248
/**
@@ -267,7 +262,6 @@ public Mono<E> getByIndexRange(int index, int count, ReturnType returnResultsOfT
267262
* @param returnResultsOfType Type to return.
268263
* @return A list of the records which match the given index and count.
269264
*/
270-
@SuppressWarnings("unchecked")
271265
public Mono<E> getByIndexRange(WritePolicy writePolicy, int index, int count, ReturnType returnResultsOfType) {
272266
if (writePolicy == null) {
273267
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -278,7 +272,7 @@ public Mono<E> getByIndexRange(WritePolicy writePolicy, int index, int count, Re
278272

279273
return reactiveAeroMapper.getReactorClient()
280274
.operate(writePolicy, key, interactor.getOperation())
281-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
275+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
282276
}
283277

284278
/**
@@ -298,7 +292,6 @@ public Mono<E> getByRank(int rank, ReturnType returnResultsOfType) {
298292
* @param returnResultsOfType Type to return.
299293
* @return A list of the records which match the given rank.
300294
*/
301-
@SuppressWarnings("unchecked")
302295
public Mono<E> getByRank(WritePolicy writePolicy, int rank, ReturnType returnResultsOfType) {
303296
if (writePolicy == null) {
304297
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -309,7 +302,7 @@ public Mono<E> getByRank(WritePolicy writePolicy, int rank, ReturnType returnRes
309302

310303
return reactiveAeroMapper.getReactorClient()
311304
.operate(writePolicy, key, interactor.getOperation())
312-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
305+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
313306
}
314307

315308
/**
@@ -329,7 +322,6 @@ public Mono<E> getByRankRange(int rank, ReturnType returnResultsOfType) {
329322
* @param returnResultsOfType Type to return.
330323
* @return A list of the records which match the given rank.
331324
*/
332-
@SuppressWarnings("unchecked")
333325
public Mono<E> getByRankRange(WritePolicy writePolicy, int rank, ReturnType returnResultsOfType) {
334326
if (writePolicy == null) {
335327
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -340,7 +332,7 @@ public Mono<E> getByRankRange(WritePolicy writePolicy, int rank, ReturnType retu
340332

341333
return reactiveAeroMapper.getReactorClient()
342334
.operate(writePolicy, key, interactor.getOperation())
343-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
335+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
344336
}
345337

346338
/**
@@ -360,7 +352,6 @@ public Mono<E> getByRankRange(int rank, int count, ReturnType returnResultsOfTyp
360352
* @param returnResultsOfType Type to return.
361353
* @return A list of the records which match the given rank and count.
362354
*/
363-
@SuppressWarnings("unchecked")
364355
public Mono<E> getByRankRange(WritePolicy writePolicy, int rank, int count, ReturnType returnResultsOfType) {
365356
if (writePolicy == null) {
366357
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -371,7 +362,7 @@ public Mono<E> getByRankRange(WritePolicy writePolicy, int rank, int count, Retu
371362

372363
return reactiveAeroMapper.getReactorClient()
373364
.operate(writePolicy, key, interactor.getOperation())
374-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
365+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
375366
}
376367

377368
/**
@@ -399,7 +390,6 @@ public Mono<E> getByKey(Object key, ReturnType returnResultsOfType) {
399390
* @param returnResultsOfType Type to return.
400391
* @return A list of the records which match the given key range.
401392
*/
402-
@SuppressWarnings("unchecked")
403393
public Mono<E> getByKey(WritePolicy writePolicy, Object key, ReturnType returnResultsOfType) {
404394
if (writePolicy == null) {
405395
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -410,7 +400,7 @@ public Mono<E> getByKey(WritePolicy writePolicy, Object key, ReturnType returnRe
410400

411401
return reactiveAeroMapper.getReactorClient()
412402
.operate(writePolicy, this.key, interactor.getOperation())
413-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
403+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
414404
}
415405

416406
/**
@@ -510,7 +500,6 @@ public Mono<E> removeByValue(Object value, ReturnType returnResultsOfType) {
510500
* @param returnResultsOfType Type to return.
511501
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
512502
*/
513-
@SuppressWarnings("unchecked")
514503
public Mono<E> removeByValue(WritePolicy writePolicy, Object value, ReturnType returnResultsOfType) {
515504
if (writePolicy == null) {
516505
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -521,7 +510,7 @@ public Mono<E> removeByValue(WritePolicy writePolicy, Object value, ReturnType r
521510

522511
return reactiveAeroMapper.getReactorClient()
523512
.operate(writePolicy, key, interactor.getOperation())
524-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
513+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
525514
}
526515

527516
/**
@@ -541,7 +530,6 @@ public Mono<E> removeByValueList(List<Object> values, ReturnType returnResultsOf
541530
* @param returnResultsOfType Type to return.
542531
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
543532
*/
544-
@SuppressWarnings("unchecked")
545533
public Mono<E> removeByValueList(WritePolicy writePolicy, List<Object> values, ReturnType returnResultsOfType) {
546534
if (writePolicy == null) {
547535
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -552,7 +540,7 @@ public Mono<E> removeByValueList(WritePolicy writePolicy, List<Object> values, R
552540

553541
return reactiveAeroMapper.getReactorClient()
554542
.operate(writePolicy, key, interactor.getOperation())
555-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
543+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
556544
}
557545

558546
/**
@@ -594,7 +582,7 @@ public Mono<E> removeByValueRange(WritePolicy writePolicy, Object startValue, Ob
594582

595583
return reactiveAeroMapper.getReactorClient()
596584
.operate(writePolicy, key, interactor.getOperation())
597-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
585+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
598586
}
599587

600588
/**
@@ -616,7 +604,6 @@ public Mono<E> removeByValueRelativeRankRange(Object value, int rank, ReturnType
616604
* @param returnResultsOfType Type to return.
617605
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
618606
*/
619-
@SuppressWarnings("unchecked")
620607
public Mono<E> removeByValueRelativeRankRange(WritePolicy writePolicy, Object value, int rank, ReturnType returnResultsOfType) {
621608
if (writePolicy == null) {
622609
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -627,7 +614,7 @@ public Mono<E> removeByValueRelativeRankRange(WritePolicy writePolicy, Object va
627614

628615
return reactiveAeroMapper.getReactorClient()
629616
.operate(writePolicy, key, interactor.getOperation())
630-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
617+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
631618
}
632619

633620
/**
@@ -651,7 +638,6 @@ public Mono<E> removeByValueRelativeRankRange(Object value, int rank, int count,
651638
* @param returnResultsOfType Type to return.
652639
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
653640
*/
654-
@SuppressWarnings("unchecked")
655641
public Mono<E> removeByValueRelativeRankRange(WritePolicy writePolicy, Object value, int rank, int count, ReturnType returnResultsOfType) {
656642
if (writePolicy == null) {
657643
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -662,7 +648,7 @@ public Mono<E> removeByValueRelativeRankRange(WritePolicy writePolicy, Object va
662648

663649
return reactiveAeroMapper.getReactorClient()
664650
.operate(writePolicy, key, interactor.getOperation())
665-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
651+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
666652
}
667653

668654
/**
@@ -682,7 +668,6 @@ public Mono<E> removeByIndex(int index, ReturnType returnResultsOfType) {
682668
* @param returnResultsOfType Type to return.
683669
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
684670
*/
685-
@SuppressWarnings("unchecked")
686671
public Mono<E> removeByIndex(WritePolicy writePolicy, int index, ReturnType returnResultsOfType) {
687672
if (writePolicy == null) {
688673
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -693,7 +678,7 @@ public Mono<E> removeByIndex(WritePolicy writePolicy, int index, ReturnType retu
693678

694679
return reactiveAeroMapper.getReactorClient()
695680
.operate(writePolicy, key, interactor.getOperation())
696-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
681+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
697682
}
698683

699684
/**
@@ -713,7 +698,6 @@ public Mono<E> removeByIndexRange(int index, ReturnType returnResultsOfType) {
713698
* @param returnResultsOfType Type to return.
714699
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
715700
*/
716-
@SuppressWarnings("unchecked")
717701
public Mono<E> removeByIndexRange(WritePolicy writePolicy, int index, ReturnType returnResultsOfType) {
718702
if (writePolicy == null) {
719703
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -724,7 +708,7 @@ public Mono<E> removeByIndexRange(WritePolicy writePolicy, int index, ReturnType
724708

725709
return reactiveAeroMapper.getReactorClient()
726710
.operate(writePolicy, key, interactor.getOperation())
727-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
711+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
728712
}
729713

730714
/**
@@ -746,7 +730,6 @@ public Mono<E> removeByIndexRange(int index, int count, ReturnType returnResults
746730
* @param returnResultsOfType Type to return.
747731
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
748732
*/
749-
@SuppressWarnings("unchecked")
750733
public Mono<E> removeByIndexRange(WritePolicy writePolicy, int index, int count, ReturnType returnResultsOfType) {
751734
if (writePolicy == null) {
752735
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -757,7 +740,7 @@ public Mono<E> removeByIndexRange(WritePolicy writePolicy, int index, int count,
757740

758741
return reactiveAeroMapper.getReactorClient()
759742
.operate(writePolicy, key, interactor.getOperation())
760-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
743+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
761744
}
762745

763746
/**
@@ -777,7 +760,6 @@ public Mono<E> removeByRank(int rank, ReturnType returnResultsOfType) {
777760
* @param returnResultsOfType Type to return.
778761
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
779762
*/
780-
@SuppressWarnings("unchecked")
781763
public Mono<E> removeByRank(WritePolicy writePolicy, int rank, ReturnType returnResultsOfType) {
782764
if (writePolicy == null) {
783765
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -788,7 +770,7 @@ public Mono<E> removeByRank(WritePolicy writePolicy, int rank, ReturnType return
788770

789771
return reactiveAeroMapper.getReactorClient()
790772
.operate(writePolicy, key, interactor.getOperation())
791-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
773+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
792774
}
793775

794776
/**
@@ -808,7 +790,6 @@ public Mono<E> removeByRankRange(int rank, ReturnType returnResultsOfType) {
808790
* @param returnResultsOfType Type to return.
809791
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
810792
*/
811-
@SuppressWarnings("unchecked")
812793
public Mono<E> removeByRankRange(WritePolicy writePolicy, int rank, ReturnType returnResultsOfType) {
813794
if (writePolicy == null) {
814795
writePolicy = new WritePolicy(owningEntry.getWritePolicy());
@@ -819,7 +800,7 @@ public Mono<E> removeByRankRange(WritePolicy writePolicy, int rank, ReturnType r
819800

820801
return reactiveAeroMapper.getReactorClient()
821802
.operate(writePolicy, key, interactor.getOperation())
822-
.map(keyRecord -> (E)interactor.getResult(keyRecord.record.getList(binName)));
803+
.map(keyRecord -> getResultsWithDependencies(keyRecord, interactor));
823804
}
824805

825806
/**
@@ -841,7 +822,6 @@ public Mono<E> removeByRankRange(int rank, int count, ReturnType returnResultsOf
841822
* @param returnResultsOfType Type to return.
842823
* @return A list of the records which have been removed from the database if returnResults is true, null otherwise.
843824
*/
844-
@SuppressWarnings("unchecked")
845825
public Mono<E> removeByRankRange(WritePolicy writePolicy, int rank, int count, ReturnType returnResultsOfType) {
846826
if (writePolicy == null) {
847827
writePolicy = new WritePolicy(owningEntry.getWritePolicy());

0 commit comments

Comments
 (0)