Skip to content

Commit eb4dec4

Browse files
authored
FMWK-520 Remove unnecessary checked ReflectiveOperationException declaration (#166)
1 parent 1562be5 commit eb4dec4

File tree

3 files changed

+20
-31
lines changed

3 files changed

+20
-31
lines changed

src/main/java/com/aerospike/mapper/tools/AeroMapper.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,6 @@ private <T> T read(Policy readPolicy, @NotNull Class<T> clazz, @NotNull Key key,
232232
try {
233233
ThreadLocalKeySaver.save(key);
234234
return mappingConverter.convertToObject(clazz, key, record, entry, resolveDependencies);
235-
} catch (ReflectiveOperationException e) {
236-
throw new AerospikeException(e);
237235
} finally {
238236
ThreadLocalKeySaver.clear();
239237
}
@@ -263,8 +261,6 @@ private <T> T[] readBatch(BatchPolicy batchPolicy, @NotNull Class<T> clazz, @Not
263261
ThreadLocalKeySaver.save(keys[i]);
264262
T result = mappingConverter.convertToObject(clazz, keys[i], records[i], entry, false);
265263
results[i] = result;
266-
} catch (ReflectiveOperationException e) {
267-
throw new AerospikeException(e);
268264
} finally {
269265
ThreadLocalKeySaver.clear();
270266
}
@@ -328,8 +324,7 @@ public <T> void find(@NotNull Class<T> clazz, Function<T, Boolean> function) thr
328324

329325
RecordSet recordSet = null;
330326
try {
331-
// TODO: set the policy (If this statement is thought to be useful, which is
332-
// dubious)
327+
// TODO: set the policy (If this statement is thought to be useful, which is dubious)
333328
recordSet = mClient.query(null, statement);
334329
T result;
335330
while (recordSet.next()) {

src/main/java/com/aerospike/mapper/tools/ReactiveAeroMapper.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public <T> Mono<T> readFromDigest(@NotNull Class<T> clazz, @NotNull byte[] diges
116116
}
117117

118118
@Override
119-
public <T> Mono<T> readFromDigest(@NotNull Class<T> clazz, @NotNull byte[] digest, boolean resolveDependencies) throws AerospikeException {
119+
public <T> Mono<T> readFromDigest(@NotNull Class<T> clazz, @NotNull byte[] digest, boolean resolveDependencies) {
120120
ClassCacheEntry<T> entry = MapperUtils.getEntryAndValidateNamespace(clazz, this);
121121
Key key = new Key(entry.getNamespace(), digest, entry.getSetName(), null);
122122
return this.read(null, clazz, key, entry, resolveDependencies);
@@ -211,8 +211,6 @@ private <T> Mono<T> read(Policy readPolicy, @NotNull Class<T> clazz, @NotNull Ke
211211
try {
212212
ThreadLocalKeySaver.save(key);
213213
return mappingConverter.convertToObject(clazz, key, keyRecord.record, entry, resolveDependencies);
214-
} catch (ReflectiveOperationException e) {
215-
throw new AerospikeException(e);
216214
} finally {
217215
ThreadLocalKeySaver.clear();
218216
}
@@ -240,8 +238,6 @@ private <T> Flux<T> readBatch(BatchPolicy batchPolicy, @NotNull Class<T> clazz,
240238
try {
241239
ThreadLocalKeySaver.save(keyRecord.key);
242240
return mappingConverter.convertToObject(clazz, keyRecord.key, keyRecord.record, entry, true);
243-
} catch (ReflectiveOperationException e) {
244-
throw new AerospikeException(e);
245241
} finally {
246242
ThreadLocalKeySaver.clear();
247243
}
@@ -296,7 +292,8 @@ public Mono<Boolean> delete(WritePolicy writePolicy, @NotNull Object object) {
296292
}
297293

298294
@Override
299-
public <T> Mono<Void> find(@NotNull Class<T> clazz, Function<T, Boolean> function) throws AerospikeException {
295+
@SuppressWarnings("deprecation")
296+
public <T> Mono<Void> find(@NotNull Class<T> clazz, Function<T, Boolean> function) {
300297
return Mono.fromCallable(() -> {
301298
asMapper().find(clazz, function);
302299
return null;

src/main/java/com/aerospike/mapper/tools/converters/MappingConverter.java

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package com.aerospike.mapper.tools.converters;
22

3-
import java.util.ArrayList;
4-
import java.util.Iterator;
5-
import java.util.List;
6-
import java.util.Map;
7-
8-
import javax.validation.constraints.NotNull;
9-
103
import com.aerospike.client.AerospikeException;
114
import com.aerospike.client.IAerospikeClient;
125
import com.aerospike.client.Key;
@@ -24,6 +17,12 @@
2417
import com.aerospike.mapper.tools.utils.MapperUtils;
2518
import com.aerospike.mapper.tools.utils.TypeUtils;
2619

20+
import javax.validation.constraints.NotNull;
21+
import java.util.ArrayList;
22+
import java.util.Iterator;
23+
import java.util.List;
24+
import java.util.Map;
25+
2726
public class MappingConverter {
2827

2928
private final IBaseAeroMapper mapper;
@@ -76,14 +75,9 @@ public <T> T translateFromAerospike(@NotNull Object obj, @NotNull Class<T> expec
7675
* @param clazz The class type to convert the Aerospike record to.
7776
* @param record The Aerospike record to convert.
7877
* @return A virtual list.
79-
* @throws AerospikeException an AerospikeException will be thrown in case of an encountering a ReflectiveOperationException.
8078
*/
8179
public <T> T convertToObject(Class<T> clazz, Key key, Record record) {
82-
try {
83-
return convertToObject(clazz, key, record, null);
84-
} catch (ReflectiveOperationException e) {
85-
throw new AerospikeException(e);
86-
}
80+
return convertToObject(clazz, key, record, null);
8781
}
8882

8983
/**
@@ -94,16 +88,15 @@ public <T> T convertToObject(Class<T> clazz, Key key, Record record) {
9488
* @param record The Aerospike record to convert.
9589
* @param entry The entry that holds information on how to store the provided class.
9690
* @return A virtual list.
97-
* @throws AerospikeException an AerospikeException will be thrown in case of an encountering a ReflectiveOperationException.
9891
*/
99-
public <T> T convertToObject(Class<T> clazz, Key key, Record record, ClassCacheEntry<T> entry) throws ReflectiveOperationException {
92+
public <T> T convertToObject(Class<T> clazz, Key key, Record record, ClassCacheEntry<T> entry) {
10093
return this.convertToObject(clazz, key, record, entry, true);
10194
}
10295

10396
/**
10497
* This method should not be used, it is public only to allow mappers to see it.
10598
*/
106-
public <T> T convertToObject(Class<T> clazz, Key key, Record record, ClassCacheEntry<T> entry, boolean resolveDependencies) throws ReflectiveOperationException {
99+
public <T> T convertToObject(Class<T> clazz, Key key, Record record, ClassCacheEntry<T> entry, boolean resolveDependencies) {
107100
if (entry == null) {
108101
entry = ClassCache.getInstance().loadClass(clazz, mapper);
109102
}
@@ -252,10 +245,14 @@ public void resolveDependencies(ClassCacheEntry<?> parentEntity) {
252245
DeferredObjectLoader.DeferredObjectSetter thisObjectSetter = deferredObjects.get(i);
253246
try {
254247
ThreadLocalKeySaver.save(keys[i]);
255-
Object result = records[i] == null ? null : convertToObject((Class) thisObjectSetter.getObject().getType(), keys[i], records[i], classCacheEntryList.get(i), false);
248+
Object obj = convertToObject(
249+
(Class<Object>) thisObjectSetter.getObject().getType(),
250+
keys[i],
251+
records[i],
252+
(ClassCacheEntry<Object>) classCacheEntryList.get(i),
253+
false);
254+
Object result = records[i] == null ? null : obj;
256255
thisObjectSetter.getSetter().setValue(result);
257-
} catch (ReflectiveOperationException e) {
258-
throw new AerospikeException(e);
259256
} finally {
260257
ThreadLocalKeySaver.clear();
261258
}

0 commit comments

Comments
 (0)