Skip to content

remove com.sun.deploy #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IliaIsakhin merged 1 commit into from
Aug 10, 2020
Merged

remove com.sun.deploy #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions src/test/java/com/epam/izh/rd/online/SchoolbookServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.epam.izh.rd.online.repository.BookRepository;
import com.epam.izh.rd.online.service.AuthorService;
import com.epam.izh.rd.online.service.BookService;
import com.sun.deploy.util.ReflectionUtil;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -72,11 +71,10 @@ void testConstructors(Class clazz, Class[] params) {
@MethodSource("com.epam.izh.rd.online.Providers#testServiceAndRepositories")
@DisplayName("Проверка наличия классов репозиториев, сервисов и их интерфейсов")
void testClasses(String canonicalClassName, String interfaceName) {
boolean isClassAvailable = ReflectionUtil
.isClassAvailable(canonicalClassName, Thread.currentThread().getContextClassLoader());
boolean isClassAvailable = isClassAvailable(canonicalClassName, Thread.currentThread().getContextClassLoader());
assertTrue(isClassAvailable, "Не найден класс " + canonicalClassName);

Class clazz = ReflectionUtil.getClass(canonicalClassName, Thread.currentThread().getContextClassLoader());
Class clazz = getClass(canonicalClassName, Thread.currentThread().getContextClassLoader());
List<String> interfacesNames = Arrays.asList(clazz.getInterfaces()).stream().map(Class::getCanonicalName)
.collect(
Collectors.toList());
Expand All @@ -102,7 +100,7 @@ void testEqualsAndHash() {
@Test
@DisplayName("Проверка всей общей логики работы сервисов и репозиториев")
void testLogic() {
Class clazz = ReflectionUtil.getClass("com.epam.izh.rd.online.repository.SimpleAuthorRepository",
Class clazz = getClass("com.epam.izh.rd.online.repository.SimpleAuthorRepository",
Thread.currentThread().getContextClassLoader());
AuthorRepository authorRepository = null;
try {
Expand All @@ -113,7 +111,7 @@ void testLogic() {
fail("Сначала полностью реализуйте всю стрктуру приложения.");
}

clazz = ReflectionUtil.getClass("com.epam.izh.rd.online.repository.SimpleSchoolBookRepository",
clazz = getClass("com.epam.izh.rd.online.repository.SimpleSchoolBookRepository",
Thread.currentThread().getContextClassLoader());
BookRepository bookRepository = null;
try {
Expand All @@ -124,7 +122,7 @@ void testLogic() {
fail("Сначала полностью реализуйте всю стрктуру приложения.");
}

clazz = ReflectionUtil.getClass("com.epam.izh.rd.online.service.SimpleAuthorService",
clazz = getClass("com.epam.izh.rd.online.service.SimpleAuthorService",
Thread.currentThread().getContextClassLoader());
AuthorService authorService = null;
try {
Expand All @@ -136,7 +134,7 @@ void testLogic() {
fail("Сначала полностью реализуйте всю стрктуру приложения.");
}

clazz = ReflectionUtil.getClass("com.epam.izh.rd.online.service.SimpleSchoolBookService",
clazz = getClass("com.epam.izh.rd.online.service.SimpleSchoolBookService",
Thread.currentThread().getContextClassLoader());
BookService bookService = null;
try {
Expand Down Expand Up @@ -266,8 +264,7 @@ void testLogic() {
}

private Author getNewInstanceOfAuthor(String name, String lastName, LocalDate birthdate, String country) {
Class clazz = ReflectionUtil
.getClass("com.epam.izh.rd.online.entity.Author", Thread.currentThread().getContextClassLoader());
Class clazz = getClass("com.epam.izh.rd.online.entity.Author", Thread.currentThread().getContextClassLoader());
try {
Author author = (Author) clazz.newInstance();

Expand All @@ -286,8 +283,8 @@ private Author getNewInstanceOfAuthor(String name, String lastName, LocalDate bi

private SchoolBook getNewInstanceOfSchoolBook(int numberOfPages, String name, String authorName,
String authorLastName, LocalDate publishDate) {
Class clazz = ReflectionUtil
.getClass("com.epam.izh.rd.online.entity.SchoolBook", Thread.currentThread().getContextClassLoader());
Class clazz = getClass(
"com.epam.izh.rd.online.entity.SchoolBook", Thread.currentThread().getContextClassLoader());
try {
SchoolBook schoolBook = (SchoolBook) clazz.newInstance();

Expand All @@ -312,4 +309,22 @@ private void setValueToField(Class clazz, String fieldName, Object obj, Object v
ReflectionUtils.setField(Objects.requireNonNull(ReflectionUtils.findField(clazz, fieldName)), obj, value);
}


private static Class getClass(String name, ClassLoader classLoader) {
try {
return Class.forName(name, false, classLoader);
} catch (Throwable e) {
return null;
}
}

private static boolean isClassAvailable(String name, ClassLoader classLoader) {
try {
Class clazz = Class.forName(name, false, classLoader);
return clazz != null;
} catch (Throwable e) {
return false;
}
}

}