Permalink
Browse files

#454: Upload with null file

  • Loading branch information...
1 parent 5a49b78 commit b7b1a46904e8e8de4a09504e8ccb3668dde9e2cd @garcia-jj garcia-jj committed Sep 20, 2012
@@ -124,7 +124,6 @@
import br.com.caelum.vraptor.interceptor.multipart.NullMultipartInterceptor;
import br.com.caelum.vraptor.interceptor.multipart.Servlet3MultipartInterceptor;
import br.com.caelum.vraptor.interceptor.multipart.ServletFileUploadCreator;
-import br.com.caelum.vraptor.interceptor.multipart.UploadedFileConverter;
import br.com.caelum.vraptor.ioc.Component;
import br.com.caelum.vraptor.ioc.ConverterHandler;
import br.com.caelum.vraptor.ioc.InterceptorStereotypeHandler;
@@ -160,16 +159,16 @@
import br.com.caelum.vraptor.serialization.xstream.XStreamJSONSerialization;
import br.com.caelum.vraptor.serialization.xstream.XStreamXMLSerialization;
import br.com.caelum.vraptor.validator.BeanValidator;
-import br.com.caelum.vraptor.validator.DefaultValidator;
import br.com.caelum.vraptor.validator.DefaultBeanValidator;
-import br.com.caelum.vraptor.validator.MethodValidatorCreator;
-import br.com.caelum.vraptor.validator.ValidatorCreator;
+import br.com.caelum.vraptor.validator.DefaultValidator;
import br.com.caelum.vraptor.validator.MessageConverter;
import br.com.caelum.vraptor.validator.MessageInterpolatorFactory;
+import br.com.caelum.vraptor.validator.MethodValidatorCreator;
import br.com.caelum.vraptor.validator.MethodValidatorInterceptor;
import br.com.caelum.vraptor.validator.NullBeanValidator;
import br.com.caelum.vraptor.validator.Outjector;
import br.com.caelum.vraptor.validator.ReplicatorOutjector;
+import br.com.caelum.vraptor.validator.ValidatorCreator;
import br.com.caelum.vraptor.validator.ValidatorFactoryCreator;
import br.com.caelum.vraptor.view.AcceptHeaderToFormat;
import br.com.caelum.vraptor.view.DefaultAcceptHeaderToFormat;
@@ -303,8 +302,7 @@
PrimitiveLongConverter.class,
PrimitiveShortConverter.class,
ShortConverter.class,
- StringConverter.class,
- UploadedFileConverter.class));
+ StringConverter.class));
@SuppressWarnings("unchecked")
@@ -27,8 +27,8 @@
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
-import java.util.ResourceBundle;
import java.util.Map.Entry;
+import java.util.ResourceBundle;
import org.junit.Before;
import org.junit.Test;
@@ -55,8 +55,6 @@
import br.com.caelum.vraptor.converter.PrimitiveLongConverter;
import br.com.caelum.vraptor.converter.PrimitiveShortConverter;
import br.com.caelum.vraptor.converter.ShortConverter;
-import br.com.caelum.vraptor.interceptor.multipart.UploadedFile;
-import br.com.caelum.vraptor.interceptor.multipart.UploadedFileConverter;
import br.com.caelum.vraptor.ioc.Container;
public class DefaultConvertersTest {
@@ -91,7 +89,6 @@ public void shouldRegisterConvertersForAllDefaultTypes() {
put(Calendar.class, LocaleBasedCalendarConverter.class);
put(Date.class, LocaleBasedDateConverter.class);
put(Enum.class, EnumConverter.class);
- put(UploadedFile.class, UploadedFileConverter.class);
}
private static final long serialVersionUID = 8559316558416038474L;
};

0 comments on commit b7b1a46

Please sign in to comment.