FINERACT-846: Migrating to Java 11, upgrading dependencies, fixing compiler warnings

This commit is contained in:
Petri Tuomola
2020-05-07 22:28:19 +02:00
committed by Michael Vorburger ⛑️
parent 7ace5d47b2
commit 0e4aeef1af
61 changed files with 530 additions and 518 deletions
@@ -20,8 +20,8 @@ package org.apache.fineract.common;
import static io.restassured.RestAssured.given;
import static io.restassured.path.json.JsonPath.from;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import io.restassured.RestAssured;
@@ -27,7 +27,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class ReadTaxonomyMappingServiceImplTest {
@@ -38,11 +38,11 @@ import org.apache.fineract.mix.service.XBRLBuilder;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -58,7 +58,7 @@ public class XBRLBuilderTest {
public void setUp() {
this.readNamespaceService = Mockito.mock(NamespaceReadPlatformServiceImpl.class);
lenient().when(this.readNamespaceService.retrieveNamespaceByPrefix(Matchers.anyString())).thenReturn(
lenient().when(this.readNamespaceService.retrieveNamespaceByPrefix(ArgumentMatchers.anyString())).thenReturn(
new NamespaceData(1l, "mockedprefix", "mockedurl"));
}
@@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class ListenerTest {
@@ -41,7 +41,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.security.core.userdetails.User;
@RunWith(MockitoJUnitRunner.class)
@@ -40,7 +40,7 @@ import org.apache.fineract.useradministration.domain.RoleRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class TopicTest {
@@ -29,7 +29,7 @@ import org.joda.time.LocalDate;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
@SuppressWarnings("unused")
@RunWith(MockitoJUnitRunner.class)
@@ -222,4 +222,4 @@ public class AdhikarLoanRepaymentScheduleTransactionProcessorTest {
// private String interestWaivedOf(final String value) {
// return value;
// }
}
}
@@ -29,7 +29,7 @@ import org.joda.time.LocalDate;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
@SuppressWarnings("unused")
@RunWith(MockitoJUnitRunner.class)
@@ -626,4 +626,4 @@ public class HeavensFamilyLoanRepaymentScheduleTransactionProcessorTest {
// private String interestWaivedOf(final String value) {
// return value;
// }
}
}
@@ -125,7 +125,7 @@ public class TemplateMergeServiceTest {
protected Map<String, Object> createMapFromJSON(String jsonText) {
Gson gson = new Gson();
Type ssMap = new TypeToken<Map<String, Object>>(){}.getType();
JsonElement json = new JsonParser().parse(jsonText);
JsonElement json = JsonParser.parseString(jsonText);
return gson.fromJson(json, ssMap);
}
}