From 3f1673ea97db8609ac0f635d4479ac9e86d38553 Mon Sep 17 00:00:00 2001
From: percyashu <percyayukashu@gmail.com>
Date: Tue, 30 Jun 2020 05:40:43 +0100
Subject: [PATCH] FINERACT-822 Enforce StaticAssignmentInConstructor check

---
 fineract-provider/build.gradle                             | 2 +-
 .../org/apache/fineract/common/RestAssuredFixture.java     | 7 ++-----
 .../core/boot/tests/SpringBootServerLoginTest.java         | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index a829ddf02..4e4b4d8df 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -396,7 +396,6 @@ tasks.withType(JavaCompile) {
                 "ReturnFromVoid",
                 "AlmostJavadoc",
                 "ProtectedMembersInFinalClass",
-                "StaticAssignmentInConstructor",
                 "InvalidBlockTag",
         )
         //TODO gradually enable these checks
@@ -458,6 +457,7 @@ tasks.withType(JavaCompile) {
                 "NonCanonicalType",
                 "InvalidInlineTag",
                 "MutablePublicArray",
+                "StaticAssignmentInConstructor",
                 "OperatorPrecedence",
                 "EqualsGetClass",
                 "EqualsUnsafeCast",
diff --git a/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java b/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java
index 91662eda2..3dd522910 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.common;
 
 import com.google.common.base.Preconditions;
-import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.builder.ResponseSpecBuilder;
 import io.restassured.http.ContentType;
@@ -33,16 +32,14 @@ import io.restassured.specification.ResponseSpecification;
  */
 public class RestAssuredFixture {
 
-    private final int httpPort;
+    private final int httpPort = 8443;
 
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
 
-    public RestAssuredFixture(int httpPort) {
+    public RestAssuredFixture() {
         super();
-        this.httpPort = httpPort;
         Utils.initializeRESTAssured();
-        RestAssured.port = httpPort;
         this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
         this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
         this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java
index e5b69b01b..f17ab7c4f 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java
@@ -41,9 +41,9 @@ public class SpringBootServerLoginTest extends AbstractSpringBootWithMariaDB4jIn
     @Test
     @Disabled("Failing on Cloubees")
     public void hasPlatformStarted() {
-        util = new RestAssuredFixture(8443);
+        util = new RestAssuredFixture();
         List<Map<String, String>> response = util.httpGet("/users");
         assertThat(response.get(0).get("username"), is("mifos"));
     }
 
-}
\ No newline at end of file
+}