Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract validation availability check out of BeanValidator (#251).
BeanValidator uses and depends on javax.validation classes. So JSR303 presence check is extracted out of it to avoid ClassNotFoundException. Change-Id: I8df9a9da873cf694a326c9abb05315c8e94a0a96
- Loading branch information
Denis Anisimov
committed
Sep 23, 2016
1 parent
cef5b51
commit 0b5e2f3
Showing
4 changed files
with
192 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,118 @@ | |||
/* | |||
* Copyright 2000-2016 Vaadin Ltd. | |||
* | |||
* 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 | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.data; | |||
|
|||
import static org.junit.Assert.assertEquals; | |||
|
|||
import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.lang.reflect.InvocationTargetException; | |||
import java.net.URL; | |||
import java.net.URLClassLoader; | |||
|
|||
import javax.validation.Validation; | |||
|
|||
import org.apache.commons.io.IOUtils; | |||
import org.junit.Assert; | |||
import org.junit.Test; | |||
|
|||
import com.vaadin.data.util.BeanUtil; | |||
import com.vaadin.tests.data.bean.BeanToValidate; | |||
import com.vaadin.ui.TextField; | |||
|
|||
/** | |||
* @author Vaadin Ltd | |||
* | |||
*/ | |||
public class Jsr303Test { | |||
|
|||
private static class TestClassLoader extends URLClassLoader { | |||
|
|||
public TestClassLoader() { | |||
super(new URL[0], Thread.currentThread().getContextClassLoader()); | |||
} | |||
|
|||
@Override | |||
public Class<?> loadClass(String name) throws ClassNotFoundException { | |||
String vaadinPackagePrefix = getClass().getPackage().getName(); | |||
vaadinPackagePrefix = vaadinPackagePrefix.substring(0, | |||
vaadinPackagePrefix.lastIndexOf('.')); | |||
if (name.equals(UnitTest.class.getName())) { | |||
super.loadClass(name); | |||
} else if (name | |||
.startsWith(Validation.class.getPackage().getName())) { | |||
throw new ClassNotFoundException(); | |||
} else if (name.startsWith(vaadinPackagePrefix)) { | |||
String path = name.replace('.', '/').concat(".class"); | |||
URL resource = Thread.currentThread().getContextClassLoader() | |||
.getResource(path); | |||
InputStream stream; | |||
try { | |||
stream = resource.openStream(); | |||
byte[] bytes = IOUtils.toByteArray(stream); | |||
return defineClass(name, bytes, 0, bytes.length); | |||
} catch (IOException e) { | |||
throw new RuntimeException(e); | |||
} | |||
} | |||
return super.loadClass(name); | |||
} | |||
} | |||
|
|||
public interface UnitTest { | |||
void execute(); | |||
} | |||
|
|||
public static class Jsr303UnitTest implements UnitTest { | |||
|
|||
private TextField nameField = new TextField(); | |||
|
|||
@Override | |||
public void execute() { | |||
Assert.assertFalse(BeanUtil.checkBeanValidationAvailable()); | |||
|
|||
BeanBinder<BeanToValidate> binder = new BeanBinder<>( | |||
BeanToValidate.class); | |||
BeanToValidate item = new BeanToValidate(); | |||
String name = "Johannes"; | |||
item.setFirstname(name); | |||
item.setAge(32); | |||
|
|||
binder.bind(nameField, "firstname"); | |||
binder.bind(item); | |||
|
|||
assertEquals(name, nameField.getValue()); | |||
|
|||
// BeanToValidate : @Size(min = 3, max = 16) for the firstName | |||
nameField.setValue("a"); | |||
assertEquals(nameField.getValue(), item.getFirstname()); | |||
} | |||
|
|||
} | |||
|
|||
@Test | |||
public void beanBinderWithoutJsr303() throws ClassNotFoundException, | |||
NoSuchMethodException, SecurityException, InstantiationException, | |||
IllegalAccessException, IllegalArgumentException, | |||
InvocationTargetException, IOException, InterruptedException { | |||
URLClassLoader loader = new TestClassLoader(); | |||
Class<?> clazz = loader.loadClass(Jsr303UnitTest.class.getName()); | |||
UnitTest test = (UnitTest) clazz.newInstance(); | |||
test.execute(); | |||
loader.close(); | |||
} | |||
|
|||
} |