Git on OS X seems to have problems with changing between branches with the old and new casing of the two json related files. Changing back to the old names to avoid issues when changing branches. Change-Id: I948395a7ce725db4116fe0e7ac1a23628dc659c7tags/7.4.0.beta1
@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentHashMap; | |||
import java.util.concurrent.ConcurrentMap; | |||
import com.vaadin.server.communication.DateSerializer; | |||
import com.vaadin.server.communication.JsonSerializer; | |||
import com.vaadin.server.communication.JSONSerializer; | |||
import com.vaadin.shared.Connector; | |||
import com.vaadin.shared.JsonConstants; | |||
import com.vaadin.shared.communication.UidlValue; | |||
@@ -212,7 +212,7 @@ public class JsonCodec implements Serializable { | |||
*/ | |||
private static Map<String, Class<?>> transportTypeToType = new HashMap<String, Class<?>>(); | |||
private static Map<Class<?>, JsonSerializer<?>> customSerializers = new HashMap<Class<?>, JsonSerializer<?>>(); | |||
private static Map<Class<?>, JSONSerializer<?>> customSerializers = new HashMap<Class<?>, JSONSerializer<?>>(); | |||
static { | |||
customSerializers.put(Date.class, new DateSerializer()); | |||
} | |||
@@ -907,7 +907,7 @@ public class JsonCodec implements Serializable { | |||
private static JsonValue serializeJson(Object value, | |||
ConnectorTracker connectorTracker) { | |||
JsonSerializer serializer = customSerializers.get(value.getClass()); | |||
JSONSerializer serializer = customSerializers.get(value.getClass()); | |||
return serializer.serialize(value, connectorTracker); | |||
} | |||
@@ -28,7 +28,7 @@ import elemental.json.JsonValue; | |||
* @since 7.2 | |||
* @author Vaadin Ltd | |||
*/ | |||
public class DateSerializer implements JsonSerializer<Date> { | |||
public class DateSerializer implements JSONSerializer<Date> { | |||
@Override | |||
public Date deserialize(Type type, JsonValue jsonValue, |
@@ -29,7 +29,7 @@ import elemental.json.JsonValue; | |||
* symmetric so they can be chained and produce the original result (or an equal | |||
* result). | |||
* <p> | |||
* Each {@link JsonSerializer} implementation can handle an object of a single | |||
* Each {@link JSONSerializer} implementation can handle an object of a single | |||
* type. | |||
* <p> | |||
* This is the server side interface, see | |||
@@ -38,7 +38,7 @@ import elemental.json.JsonValue; | |||
* @since 7.2 | |||
* @author Vaadin Ltd | |||
*/ | |||
public interface JsonSerializer<T> { | |||
public interface JSONSerializer<T> { | |||
/** | |||
* Creates and deserializes an object received from the client. Must be | |||
* compatible with {@link #serialize(Object, ConnectorTracker)} and also |
@@ -40,7 +40,7 @@ import elemental.json.JsonValue; | |||
* @since 7.0 | |||
* | |||
*/ | |||
public class JsonSerializerTest extends TestCase { | |||
public class JSONSerializerTest extends TestCase { | |||
HashMap<String, AbstractSplitPanelState> stringToStateMap; | |||
HashMap<AbstractSplitPanelState, String> stateToStringMap; | |||
@@ -51,7 +51,7 @@ public class TestClassesSerializable extends TestCase { | |||
"com\\.vaadin\\.server\\.communication\\.PushRequestHandler.*", | |||
"com\\.vaadin\\.server\\.communication\\.PushHandler.*", // PushHandler | |||
"com\\.vaadin\\.server\\.communication\\.DateSerializer", // | |||
"com\\.vaadin\\.server\\.communication\\.JsonSerializer", // | |||
"com\\.vaadin\\.server\\.communication\\.JSONSerializer", // | |||
// and its inner classes do not need to be serializable | |||
"com\\.vaadin\\.util\\.SerializerHelper", // fully static | |||
// class level filtering, also affecting nested classes and |