Reviewers: rchandia,
Description:
Validation serializers should extend CustomSerializer
Please review this at http://gwt-code-reviews.appspot.com/1415803/
Affected files:
M
user/src/javax/validation/ConstraintViolationException_CustomFieldSerializer.java
M
user/src/org/hibernate/validator/engine/ConstraintViolationImpl_CustomFieldSerializer.java
M
user/src/org/hibernate/validator/engine/PathImpl_CustomFieldSerializer.java
Index:
user/src/javax/validation/ConstraintViolationException_CustomFieldSerializer.java
===================================================================
---
user/src/javax/validation/ConstraintViolationException_CustomFieldSerializer.java
(revision 9990)
+++
user/src/javax/validation/ConstraintViolationException_CustomFieldSerializer.java
(working copy)
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may
not
* use this file except in compliance with the License. You may obtain a
copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,6 +15,7 @@
*/
package javax.validation;
+import com.google.gwt.user.client.rpc.CustomFieldSerializer;
import com.google.gwt.user.client.rpc.SerializationException;
import com.google.gwt.user.client.rpc.SerializationStreamReader;
import com.google.gwt.user.client.rpc.SerializationStreamWriter;
@@ -24,23 +25,26 @@
/**
* Custom Serializer for {@link ConstraintViolationException}.
*/
-public class ConstraintViolationException_CustomFieldSerializer {
+public class ConstraintViolationException_CustomFieldSerializer extends
+ CustomFieldSerializer<ConstraintViolationException> {
- public static void deserialize(SerializationStreamReader streamReader,
+ public static ConstraintViolationException instantiate(
+ SerializationStreamReader streamReader) throws
SerializationException {
+ String message = streamReader.readString();
+ @SuppressWarnings("unchecked")
+ Set<ConstraintViolation<?>> set = (Set<ConstraintViolation<?>>)
streamReader
+ .readObject();
+ return new ConstraintViolationException(message, set);
+ }
+
+ @Override
+ public void deserializeInstance(SerializationStreamReader streamReader,
ConstraintViolationException instance) throws SerializationException
{
// no fields
}
- public static ConstraintViolationException instantiate(
- SerializationStreamReader streamReader)
- throws SerializationException {
- String message = streamReader.readString();
- @SuppressWarnings("unchecked")
- Set<ConstraintViolation<?>> set = (Set<ConstraintViolation<?>>)
streamReader.readObject();
- return new ConstraintViolationException(message, set);
- }
-
- public static void serialize(SerializationStreamWriter streamWriter,
+ @Override
+ public void serializeInstance(SerializationStreamWriter streamWriter,
ConstraintViolationException instance) throws SerializationException
{
streamWriter.writeString(instance.getMessage());
streamWriter.writeObject(instance.getConstraintViolations());
Index:
user/src/org/hibernate/validator/engine/ConstraintViolationImpl_CustomFieldSerializer.java
===================================================================
---
user/src/org/hibernate/validator/engine/ConstraintViolationImpl_CustomFieldSerializer.java
(revision 9990)
+++
user/src/org/hibernate/validator/engine/ConstraintViolationImpl_CustomFieldSerializer.java
(working copy)
@@ -15,6 +15,7 @@
*/
package org.hibernate.validator.engine;
+import com.google.gwt.user.client.rpc.CustomFieldSerializer;
import com.google.gwt.user.client.rpc.SerializationException;
import com.google.gwt.user.client.rpc.SerializationStreamReader;
import com.google.gwt.user.client.rpc.SerializationStreamWriter;
@@ -27,26 +28,32 @@
/**
* Custom Serializer for {@link ConstraintViolationImpl}.
*/
-public class ConstraintViolationImpl_CustomFieldSerializer {
+public class ConstraintViolationImpl_CustomFieldSerializer<T> extends
+ CustomFieldSerializer<ConstraintViolationImpl<T>> {
- public static void deserialize(SerializationStreamReader streamReader,
- ConstraintViolationImpl instance) throws SerializationException {
+ @Override
+ public void deserializeInstance(SerializationStreamReader streamReader,
+ ConstraintViolationImpl<T> instance) throws SerializationException {
// no fields
}
- public static ConstraintViolationImpl<Object> instantiate(
+ @Override
+ public boolean hasCustomInstantiateInstance() {
+ return true;
+ }
+
+ public ConstraintViolationImpl<T> instantiateInstance(
SerializationStreamReader streamReader) throws
SerializationException {
-
String messageTemplate = null;
String interpolatedMessage = streamReader.readString();
- Class<Object> rootBeanClass = null;
- Object rootBean = null;
+ Class<T> rootBeanClass = null;
+ T rootBean = null;
Object leafBeanInstance = null;
Object value = null;
Path propertyPath = (Path) streamReader.readObject();
ConstraintDescriptor<?> constraintDescriptor = null;
ElementType elementType = null;
- return new ConstraintViolationImpl<Object>(messageTemplate,
+ return new ConstraintViolationImpl<T>(messageTemplate,
interpolatedMessage, rootBeanClass, rootBean, leafBeanInstance,
value,
propertyPath, constraintDescriptor, elementType);
}
@@ -65,8 +72,8 @@
* <li>Property Path</li>
* </ol>
*/
- public static void serialize(SerializationStreamWriter streamWriter,
- ConstraintViolationImpl instance) throws SerializationException {
+ public void serializeInstance(SerializationStreamWriter streamWriter,
+ ConstraintViolationImpl<T> instance) throws SerializationException {
// streamWriter.writeString(instance.getMessageTemplate());
streamWriter.writeString(instance.getMessage());
Index:
user/src/org/hibernate/validator/engine/PathImpl_CustomFieldSerializer.java
===================================================================
---
user/src/org/hibernate/validator/engine/PathImpl_CustomFieldSerializer.java
(revision 9990)
+++
user/src/org/hibernate/validator/engine/PathImpl_CustomFieldSerializer.java
(working copy)
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may
not
* use this file except in compliance with the License. You may obtain a
copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,6 +15,7 @@
*/
package org.hibernate.validator.engine;
+import com.google.gwt.user.client.rpc.CustomFieldSerializer;
import com.google.gwt.user.client.rpc.SerializationException;
import com.google.gwt.user.client.rpc.SerializationStreamReader;
import com.google.gwt.user.client.rpc.SerializationStreamWriter;
@@ -22,21 +23,30 @@
/**
* Custom Serializer for {@link PathImpl}.
*/
-public class PathImpl_CustomFieldSerializer {
+public class PathImpl_CustomFieldSerializer extends
+ CustomFieldSerializer<PathImpl> {
- public static void deserialize(SerializationStreamReader streamReader,
+ @Override
+ public void deserializeInstance(SerializationStreamReader streamReader,
PathImpl instance) throws SerializationException {
// no fields
}
- public static PathImpl instantiate(SerializationStreamReader
streamReader)
+ @Override
+ public boolean hasCustomInstantiateInstance() {
+ return true;
+ }
+
+ @Override
+ public PathImpl instantiateInstance(SerializationStreamReader
streamReader)
throws SerializationException {
String propertyPath = streamReader.readString();
return PathImpl.createPathFromString(propertyPath);
}
- public static void serialize(SerializationStreamWriter streamWriter,
+ @Override
+ public void serializeInstance(SerializationStreamWriter streamWriter,
PathImpl instance) throws SerializationException {
streamWriter.writeString(instance.toString());
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
