Skip to content
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

Fix errors for new serialization system - GCI Task #36

Closed
wants to merge 5 commits into from
Closed

Fix errors for new serialization system - GCI Task #36

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e6f6de
Fix errors for new serialization system
PutawanDE Nov 7, 2018
d45fb3d
Reformat and change return null serialized value
PutawanDE Nov 7, 2018
c2bdd36
Use serializeNonNull instead of serialize
PutawanDE Nov 8, 2018
9aae0cc
Return empty when data is not a value map
PutawanDE Nov 8, 2018
49d3856
Check data and get it as value map (Invert order)
PutawanDE Nov 9, 2018
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
35 changes: 19 additions & 16 deletions src/main/java/org/terasology/dynamicCities/parcels/DynParcelTypeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,44 @@
*/
package org.terasology.dynamicCities.parcels;


import com.google.common.collect.ImmutableMap;
import org.terasology.commonworld.Orientation;
import org.terasology.math.geom.Rect2i;
import org.terasology.persistence.typeHandling.DeserializationContext;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.PersistedDataMap;
import org.terasology.persistence.typeHandling.RegisterTypeHandler;
import org.terasology.persistence.typeHandling.SerializationContext;
import org.terasology.persistence.typeHandling.SimpleTypeHandler;
import org.terasology.persistence.typeHandling.*;

import java.util.Map;
import java.util.Optional;

@RegisterTypeHandler
public class DynParcelTypeHandler extends SimpleTypeHandler<DynParcel> {
public class DynParcelTypeHandler extends TypeHandler<DynParcel> {

@Override
public PersistedData serialize(DynParcel parcel, SerializationContext context) {
public PersistedData serializeNonNull(DynParcel parcel, PersistedDataSerializer serializer) {
Map<String, PersistedData> data = new ImmutableMap.Builder()
.put("height", context.create(parcel.getHeight()))
.put("posX", context.create(parcel.getShape().minX()))
.put("posY", context.create(parcel.getShape().minY()))
.put("sizeX", context.create(parcel.getShape().sizeX()))
.put("sizeY", context.create(parcel.getShape().sizeY()))
.put("zone", context.create(parcel.getZone()))
.put("orientation", context.create(parcel.getOrientation().name()))
.put("height", serializer.serialize(parcel.getHeight()))
.put("posX", serializer.serialize(parcel.getShape().minX()))
.put("posY", serializer.serialize(parcel.getShape().minY()))
.put("sizeX", serializer.serialize(parcel.getShape().sizeX()))
.put("sizeY", serializer.serialize(parcel.getShape().sizeY()))
.put("zone", serializer.serialize(parcel.getZone()))
.put("orientation", serializer.serialize(parcel.getOrientation().name()))
.build();
return context.create(data);
return serializer.serialize(data);
}

@Override
public DynParcel deserialize(PersistedData data, DeserializationContext context) {
public Optional<DynParcel> deserialize(PersistedData data) {
if (!data.isValueMap()) {
PutawanDE marked this conversation as resolved.
Show resolved Hide resolved
return Optional.empty();
}
PersistedDataMap root = data.getAsValueMap();
PutawanDE marked this conversation as resolved.
Show resolved Hide resolved
Rect2i shape = Rect2i.createFromMinAndSize(root.getAsInteger("posX"), root.getAsInteger("posY"),
root.getAsInteger("sizeX"), root.getAsInteger("sizeY"));
return new DynParcel(shape, Orientation.valueOf(root.getAsString("orientation")), root.getAsString("zone"), root.getAsInteger("height"));
return Optional.ofNullable
(new DynParcel(shape, Orientation.valueOf(root.getAsString("orientation")),
root.getAsString("zone"), root.getAsInteger("height")));
}
}