Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-23 19:16:14 +01:00
Code Issues Projects Releases Wiki Activity

Clone Java optionals

Browse Source 
Fixes #498
This commit is contained in:
Dan Mulloy 2018-08-01 16:08:53 -04:00
parent 3ef537242f
commit 8d9bf7d91f
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/API/src/main/java/com/comphenix/protocol/events/PacketContainer.java
View File

@ -86,7 +86,8 @@ public class PacketContainer implements Serializable {
.instanceProvider(DefaultInstances.DEFAULT)
.andThen(BukkitCloner.class)
.andThen(ImmutableDetector.class)
.andThen(OptionalCloner.class)
.andThen(JavaOptionalCloner.class)
.andThen(GuavaOptionalCloner.class)
.andThen(CollectionCloner.class)
.andThen(getSpecializedDeepClonerFactory())
.build();

6
modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/OptionalCloner.java → modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/GuavaOptionalCloner.java
View File

@ -6,14 +6,14 @@ package com.comphenix.protocol.reflect.cloning;
import com.google.common.base.Optional;
/**
* A cloner that can clone Optional objects
* A cloner that can clone Guava Optional objects
* @author dmulloy2
*/
public class OptionalCloner implements Cloner {
public class GuavaOptionalCloner implements Cloner {
protected Cloner wrapped;
public OptionalCloner(Cloner wrapped) {
public GuavaOptionalCloner(Cloner wrapped) {
this.wrapped = wrapped;
}

33
modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/JavaOptionalCloner.java Normal file
View File

@ -0,0 +1,33 @@
/**
* (c) 2018 dmulloy2
*/
package com.comphenix.protocol.reflect.cloning;
import java.util.Optional;
/**
* A cloner that can clone Java Optional objects
* @author dmulloy2
*/
public class JavaOptionalCloner implements Cloner {
protected Cloner wrapped;
public JavaOptionalCloner(Cloner wrapped) {
this.wrapped = wrapped;
}
@Override
public boolean canClone(Object source) {
return source instanceof Optional;
}
@Override
public Object clone(Object source) {
Optional<?> optional = (Optional<?>) source;
return optional.map(o -> wrapped.clone(o));
}
public Cloner getWrapped() {
return wrapped;
}
}