Skip to content

tools.mappers package cleanup. #3

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
roimenashe merged 1 commit into from
Apr 19, 2021
Merged

tools.mappers package cleanup. #3

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
1 change: 0 additions & 1 deletion src/main/java/com/aerospike/mapper/tools/mappers/DateMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ public Object fromAerospikeFormat(Object value) {
long longValue = (Long)value;
return new Date(longValue);
}

}
2 changes: 1 addition & 1 deletion src/main/java/com/aerospike/mapper/tools/mappers/EnumMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class EnumMapper extends TypeMapper {
public EnumMapper(Class<? extends Enum<?>> clazz) {
this.clazz = clazz;
}

@Override
public Object toAerospikeFormat(Object value) {
return value.toString();
Expand All @@ -30,5 +31,4 @@ public Object fromAerospikeFormat(Object value) {

throw new AerospikeException(String.format("Enum value of \"%s\" not found in type %s", stringValue, clazz.toString()));
}

}
4 changes: 1 addition & 3 deletions src/main/java/com/aerospike/mapper/tools/mappers/InstantMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ public Object toAerospikeFormat(Object value) {
return null;
}
Instant instant = (Instant)value;
long time = instant.getEpochSecond() * 1_000_000_000 + instant.getNano();
return time;
return instant.getEpochSecond() * 1_000_000_000 + instant.getNano();
}

@Override
Expand All @@ -24,5 +23,4 @@ public Object fromAerospikeFormat(Object value) {
long longValue = (Long)value;
return Instant.ofEpochSecond(longValue/1_000_000_000, longValue % 1_000_000_000);
}

}
23 changes: 6 additions & 17 deletions src/main/java/com/aerospike/mapper/tools/mappers/ListMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
package com.aerospike.mapper.tools.mappers;

import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;

import com.aerospike.client.AerospikeException;
import com.aerospike.mapper.annotations.AerospikeReference;
import com.aerospike.mapper.annotations.AerospikeEmbed.EmbedType;
import com.aerospike.mapper.tools.AeroMapper;
import com.aerospike.mapper.tools.ClassCache;
import com.aerospike.mapper.tools.ClassCacheEntry;
import com.aerospike.mapper.tools.DeferredObjectLoader;
import com.aerospike.mapper.tools.*;
import com.aerospike.mapper.tools.DeferredObjectLoader.DeferredObject;
import com.aerospike.mapper.tools.DeferredObjectLoader.DeferredObjectSetter;
import com.aerospike.mapper.tools.DeferredObjectLoader.DeferredSetter;
import com.aerospike.mapper.tools.TypeMapper;
import com.aerospike.mapper.tools.TypeUtils;
import com.aerospike.mapper.tools.TypeUtils.AnnotatedType;

import java.util.*;
import java.util.Map.Entry;

public class ListMapper extends TypeMapper {

@SuppressWarnings("unused")
Expand Down Expand Up @@ -96,7 +86,7 @@ public Object toAerospikeInstanceFormat(Object obj) {
// This class must be a subclass of the annotated type
item = this.instanceClassMapper.toAerospikeFormat(obj, false, true);
}
return new AbstractMap.SimpleEntry<Object, Object>(key, item);
return new AbstractMap.SimpleEntry<>(key, item);
}
}

Expand Down Expand Up @@ -188,9 +178,9 @@ public Object fromAerospikeFormat(Object value) {
return value;
}

int index = 0;
if (instanceClass == null) {
// We don't have any hints as to how to translate them, we have to look up each type
int index = 0;
for (Object obj : list) {
if (obj == null) {
results.add(null);
Expand Down Expand Up @@ -219,7 +209,6 @@ public void setValue(Object object) {
}
}
else {
int index = 0;
for (Object obj : list) {
if (!allowBatchLoad) {
results.add(this.instanceClassMapper.fromAerospikeFormat(obj));
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/aerospike/mapper/tools/mappers/ObjectEmbedMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.aerospike.mapper.tools.AeroMapper;
import com.aerospike.mapper.tools.ClassCache;
import com.aerospike.mapper.tools.ClassCacheEntry;
import com.aerospike.mapper.tools.TypeMapper;

public class ObjectEmbedMapper extends ObjectMapper {

Expand Down Expand Up @@ -50,7 +49,7 @@ public Object fromAerospikeFormat(Object value) {
}
ClassCacheEntry<?> entry = ClassCache.getInstance().loadClass(referencedClass, this.mapper);
try {
Object instance = null;
Object instance;

switch (type) {
case LIST:
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/aerospike/mapper/tools/mappers/ObjectReferenceMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,14 @@ public Object fromAerospikeFormat(Object value) {
}

if (this.lazy) {
// Object instance = classToUse.getUnderlyingClass().newInstance();
//Object instance = classToUse.getUnderlyingClass().newInstance();
Map<String, Object> map = new HashMap<>();
Object instance = classToUse.constructAndHydrate(map);
classToUse.setKey(instance, key);
return instance;
}
else if (allowBatch) {
DeferredObject defObject = new DeferredObject(key, classToUse.getUnderlyingClass(), ReferenceType.DIGEST.equals(type));
return defObject;
return new DeferredObject(key, classToUse.getUnderlyingClass(), ReferenceType.DIGEST.equals(type));
}
else if (ReferenceType.DIGEST.equals(type)) {
return mapper.readFromDigest(classToUse.getUnderlyingClass(), (byte[]) key, false);
Expand Down