You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2016/02/02 11:23:20 UTC
incubator-fineract git commit: Migrate to Java 8
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 5d7520d3e -> 86ca06215
Migrate to Java 8
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/86ca0621
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/86ca0621
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/86ca0621
Branch: refs/heads/develop
Commit: 86ca06215092a00d400c1d151bea585267b9ff84
Parents: 5d7520d
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Tue Feb 2 12:15:24 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Tue Feb 2 12:16:02 2016 +0530
----------------------------------------------------------------------
fineract-provider/build.gradle | 4 ++--
.../gradle/wrapper/gradle-wrapper.jar | Bin 46742 -> 53636 bytes
.../gradle/wrapper/gradle-wrapper.properties | 4 ++--
fineract-provider/gradlew | 2 +-
fineract-provider/gradlew.bat | 3 ++-
.../ClientLoanIntegrationTest.java | 4 +++-
.../integrationtests/common/CenterHelper.java | 13 ++++++++++---
.../integrationtests/common/OfficeHelper.java | 5 +++--
.../common/PaymentTypeHelper.java | 3 ++-
9 files changed, 25 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/build.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index f915b18..35bf2da 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -27,9 +27,9 @@ apply plugin: 'project-report'
apply plugin: 'java'
/* define the valid syntax level for source files */
-sourceCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = JavaVersion.VERSION_1_8
/* define binary compatibility version */
-targetCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_8
project.ext.springBootVersion = '1.1.6.RELEASE'
project.ext.springVersion = '4.0.7.RELEASE'
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/fineract-provider/gradle/wrapper/gradle-wrapper.jar b/fineract-provider/gradle/wrapper/gradle-wrapper.jar
index faa569a..13372ae 100644
Binary files a/fineract-provider/gradle/wrapper/gradle-wrapper.jar and b/fineract-provider/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/gradle/wrapper/gradle-wrapper.properties b/fineract-provider/gradle/wrapper/gradle-wrapper.properties
index 2b85462..44cca1e 100644
--- a/fineract-provider/gradle/wrapper/gradle-wrapper.properties
+++ b/fineract-provider/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 22 19:36:27 IST 2013
+#Fri Jan 29 13:04:36 IST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/gradlew
----------------------------------------------------------------------
diff --git a/fineract-provider/gradlew b/fineract-provider/gradlew
index 210ae59..b18272c 100755
--- a/fineract-provider/gradlew
+++ b/fineract-provider/gradlew
@@ -10,7 +10,7 @@
DEFAULT_JVM_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8005,server=y,suspend=n"
CATALINA_OPTS="-Xms512m -Xmx2048m"
-JAVA_OPTS="-Xms512m -Xmx2048m -XX:PermSize=256m -XX:MaxPermSize=512m"
+JAVA_OPTS="-Xms512m -Xmx2048m"
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/gradlew.bat
----------------------------------------------------------------------
diff --git a/fineract-provider/gradlew.bat b/fineract-provider/gradlew.bat
index af905cc..bc2c2e8 100644
--- a/fineract-provider/gradlew.bat
+++ b/fineract-provider/gradlew.bat
@@ -12,7 +12,8 @@ if "%OS%"=="Windows_NT" setlocal
set DEFAULT_JVM_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8005,server=y,suspend=n
set CATALINA_OPTS=-Xms512m -Xmx512m
-set JAVA_OPTS=-Xms512m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m
+set JAVA_OPTS=-Xms512m -Xmx512m
+
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
index c27abc3..8b52001 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
@@ -4990,7 +4990,9 @@ public class ClientLoanIntegrationTest {
"inArrearsTolerance", "graceOnArrearsAgeing");
for (String comparisonAttribute : comparisonAttributes) {
- assertEquals(JsonPath.from(loanProductDetails).get(comparisonAttribute), JsonPath.from(loanDetails).get(comparisonAttribute));
+ Object val1 = JsonPath.from(loanProductDetails).get(comparisonAttribute);
+ Object val2 = JsonPath.from(loanDetails).get(comparisonAttribute);
+ assertEquals(val1, val2);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
index f81c64a..4250644 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
@@ -19,9 +19,13 @@
package org.apache.fineract.integrationtests.common;
import java.util.ArrayList;
+
import static org.junit.Assert.assertEquals;
+
import java.util.HashMap;
+
import org.apache.commons.lang3.StringUtils;
+
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification;
@@ -38,7 +42,8 @@ public class CenterHelper {
public static CenterDomain retrieveByID(int id, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String GET_CENTER_BY_ID_URL = CENTERS_URL + "/" + id + "?associations=groupMembers&" + Utils.TENANT_IDENTIFIER;
System.out.println("------------------------ RETRIEVING CENTER AT " + id + "-------------------------");
- final String jsonData = new Gson().toJson(Utils.performServerGet(requestSpec, responseSpec, GET_CENTER_BY_ID_URL, ""));
+ Object get = Utils.performServerGet(requestSpec, responseSpec, GET_CENTER_BY_ID_URL, "");
+ final String jsonData = new Gson().toJson(get);
return new Gson().fromJson(jsonData, new TypeToken<CenterDomain>() {}.getType());
}
@@ -46,14 +51,16 @@ public class CenterHelper {
final ResponseSpecification responseSpec) {
final String GET_CENTER = CENTERS_URL + "?paged=true&limit=-1&" + Utils.TENANT_IDENTIFIER;
System.out.println("------------------------ RETRIEVING CENTERS-------------------------");
- final String jsonData = new Gson().toJson(Utils.performServerGet(requestSpec, responseSpec, GET_CENTER, "pageItems"));
+ Object get = Utils.performServerGet(requestSpec, responseSpec, GET_CENTER, "pageItems");
+ final String jsonData = new Gson().toJson(get);
return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType());
}
public static ArrayList<CenterDomain> listCenters(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
final String GET_CENTER = CENTERS_URL + "?limit=-1&" + Utils.TENANT_IDENTIFIER;
System.out.println("------------------------ RETRIEVING CENTERS-------------------------");
- final String jsonData = new Gson().toJson(Utils.performServerGet(requestSpec, responseSpec, GET_CENTER, ""));
+ Object get = Utils.performServerGet(requestSpec, responseSpec, GET_CENTER, "");
+ final String jsonData = new Gson().toJson(get);
return new Gson().fromJson(jsonData, new TypeToken<ArrayList<CenterDomain>>() {}.getType());
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
index d73c4c6..1571735 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
@@ -38,9 +38,10 @@ public class OfficeHelper {
}
public OfficeDomain retrieveOfficeByID(int id) {
- final String json = new Gson().toJson(Utils.performServerGet(
+ Object get = Utils.performServerGet(
requestSpec, responseSpec, OFFICE_URL + "/" + id + "?"
- + Utils.TENANT_IDENTIFIER, ""));
+ + Utils.TENANT_IDENTIFIER, "");
+ final String json = new Gson().toJson(get);
return new Gson().fromJson(json, new TypeToken<OfficeDomain>() {
}.getType());
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/86ca0621/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
index 50dcad6..c6ab35b 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
@@ -64,7 +64,8 @@ public class PaymentTypeHelper {
final Integer paymentTypeId) {
final String GET_PAYMENTTYPE_URL = PAYMENTTYPE_URL + "/" + paymentTypeId + "?" + Utils.TENANT_IDENTIFIER;
System.out.println("---------------------------------GET PAYMENT TYPE---------------------------------------------");
- final String jsonData = new Gson().toJson(Utils.performServerGet(requestSpec, responseSpec, GET_PAYMENTTYPE_URL, ""));
+ Object get = Utils.performServerGet(requestSpec, responseSpec, GET_PAYMENTTYPE_URL, "");
+ final String jsonData = new Gson().toJson(get);
return new Gson().fromJson(jsonData, new TypeToken<PaymentTypeDomain>() {}.getType());
}