NoIssue - code cleanup, especially assertj stuff

src/test/java/com/restfb/ConnectionTest.java

@@ -39,6 +39,14 @@
 
 class ConnectionTest extends AbstractJsonMapperTests {
 
+  private void createConnectionNull() {
+    new Connection<>(new DefaultFacebookClient(Version.LATEST), null, User.class);
+  }
+
+  private void createConnectionJson() {
+    new Connection<>(new DefaultFacebookClient(Version.LATEST), "{", User.class);
+  }
+
   @Test
   void checkV1_0() {
     Connection<User> con = new Connection<>(new DefaultFacebookClient(Version.LATEST),
@@ -76,14 +84,12 @@ void checkNoData() {
 
   @Test
   void checkNullJson() {
-    assertThrows(FacebookJsonMappingException.class,
-      () -> new Connection<>(new DefaultFacebookClient(Version.LATEST), null, User.class));
+    assertThrows(FacebookJsonMappingException.class, this::createConnectionNull);
   }
 
   @Test
   void checkInvalidJson() {
-    assertThrows(FacebookJsonMappingException.class,
-      () -> new Connection<>(new DefaultFacebookClient(Version.LATEST), "{", User.class));
+    assertThrows(FacebookJsonMappingException.class, this::createConnectionJson);
   }
 
   @Test
@@ -183,7 +189,8 @@ public Response executeGet(String url) {
         return new Response(HTTP_OK, url);
       }
     };
-    DefaultFacebookClient facebookClient = new DefaultFacebookClient("token", fakeWebRequestor, new DefaultJsonMapper(), Version.VERSION_3_2);
+    DefaultFacebookClient facebookClient =
+        new DefaultFacebookClient("token", fakeWebRequestor, new DefaultJsonMapper(), Version.VERSION_3_2);
 
     ConnectionIterator<JsonObject> it = facebookClient.fetchConnection("/me/adaccounts", JsonObject.class).iterator();
     assertThat(it).isNotNull();

src/test/java/com/restfb/FacebookClientTest.java

@@ -180,8 +180,7 @@ void fetchDeviceCodeLatest() {
     } catch (FacebookJsonMappingException ignored) {
 
     }
-    assertThat(requestor).isSavedUrlEqualTo("https://graph.facebook.com/v3.1/device/login");
-    assertThat(requestor)
+    assertThat(requestor).isSavedUrlEqualTo("https://graph.facebook.com/v3.1/device/login")
       .isParametersEqualTo("type=device_code&scope=public_profile&access_token=accesstoken&format=json");
   }
 
@@ -199,8 +198,7 @@ void sendTextMessage() {
     } catch (FacebookJsonMappingException ignored) {
 
     }
-    assertThat(requestor).isSavedUrlEqualTo("https://graph.facebook.com/v3.1/me/messages");
-    assertThat(requestor).isParametersEqualTo(
+    assertThat(requestor).isSavedUrlEqualTo("https://graph.facebook.com/v3.1/me/messages").isParametersEqualTo(
       "recipient=%7B%22id%22%3A%22968155906638513%22%7D&message=%7B%22text%22%3A%22That%27s+funny+%5Cud83d%5Cude03%22%7D&access_token=accesstoken&format=json");
   }
 
@@ -217,8 +215,8 @@ void checkfetchObjects() throws URISyntaxException {
 
     fbc.fetchObjects(idList, String.class);
 
-    assertThat(requestor.getSavedUrl()).contains("123456789", "abcdefghijkl", "m_mid%3A35723r72%24bfehZFDEBDET");
-    assertThat(requestor.getSavedUrl()).contains("ids=%5B", "%5D&");
+    assertThat(requestor.getSavedUrl()).contains("123456789", "abcdefghijkl", "m_mid%3A35723r72%24bfehZFDEBDET")
+      .contains("ids=%5B", "%5D&");
     URI savedURL = new URI(requestor.getSavedUrl());
     for (String id : idList) {
       assertThat(savedURL.getQuery()).contains('"' + id.trim() + '"');
@@ -249,7 +247,8 @@ void checkfetchObjects_idsAsParameter() {
     idList.add("abcdefghijkl");
     idList.add("m_mid:35723r72$bfehZFDEBDET");
 
-    assertThrows(IllegalArgumentException.class, () -> fbc.fetchObjects(idList, String.class, Parameter.with("ids", "something")));
+    assertThrows(IllegalArgumentException.class,
+      () -> fbc.fetchObjects(idList, String.class, Parameter.with("ids", "something")));
   }
 
   @Test

src/test/java/com/restfb/JsonMapperMultiFieldTest.java

@@ -36,8 +36,7 @@ void check1_object() {
     TestClass1 test1 = mapper.toJavaObject("{\"mydata\":{}}", TestClass1.class);
 
     assertThat(test1.dataString).isEqualTo("{}");
-    assertThat(test1.dataObject).isNotNull();
-    assertThat(test1.dataObject.toString()).isEqualTo("{}");
+    assertThat(test1.dataObject).isNotNull().hasToString("{}");
   }
 
   @Test
@@ -57,8 +56,7 @@ void check2_object() {
     TestClass2 test2 = mapper.toJavaObject("{\"mydata\":{}}", TestClass2.class);
 
     assertThat(test2.dataString).isEqualTo("{}");
-    assertThat(test2.dataObject).isNotNull();
-    assertThat(test2.dataObject.toString()).isEqualTo("{}");
+    assertThat(test2.dataObject).isNotNull().hasToString("{}");
   }
 
   @Test
@@ -77,10 +75,8 @@ void check3_object() {
 
     TestClass3 test1 = mapper.toJavaObject("{\"mydata\":{}}", TestClass3.class);
 
-    assertThat(test1.dataObject1).isNotNull();
-    assertThat(test1.dataObject2).isNotNull();
-    assertThat(test1.dataObject1.toString()).isEqualTo("{}");
-    assertThat(test1.dataObject2.toString()).isEqualTo("{}");
+    assertThat(test1.dataObject1).isNotNull().hasToString("{}");
+    assertThat(test1.dataObject2).isNotNull().hasToString("{}");
   }
 
   private static class TestClass3 {

src/test/java/com/restfb/JsonMapperToJavaTest.java

@@ -97,8 +97,7 @@ void simplePrimitiveNumber() {
   @Test
   void simplePrimitiveList() {
     List<String> tags = createJsonMapper().toJavaList(jsonFromClasspath("tags"), String.class);
-    assertThat(tags).hasSize(3);
-    assertThat(tags).containsExactly("Good", "Better", "Best");
+    assertThat(tags).hasSize(3).containsExactly("Good", "Better", "Best");
   }
 
   /**
@@ -107,8 +106,7 @@ void simplePrimitiveList() {
   @Test
   void simplePrimitiveNumericList() {
     List<Integer> numbers = createJsonMapper().toJavaList(jsonFromClasspath("numbers"), Integer.class);
-    assertThat(numbers).hasSize(3);
-    assertThat(numbers).contains(1234, 5678, 9012);
+    assertThat(numbers).hasSize(3).contains(1234, 5678, 9012);
   }
 
   /**
@@ -255,7 +253,7 @@ void conversation() {
   @Test
   void emptyArray() {
     BasicUser user = createJsonMapper().toJavaObject(jsonFromClasspath("empty-array-as-string"), BasicUser.class);
-    assertThat(user.name).isEqualTo("");
+    assertThat(user.name).isEmpty();
   }
 
   /**
@@ -269,8 +267,7 @@ void accountTest() {
     assertThat(account.getAccessToken()).isEqualTo("{access-token}");
     assertThat(account.getId()).isEqualTo("1234567890");
     assertThat(account.getName()).isEqualTo("Sample Page");
-    assertThat(account.getPerms()).hasSize(6);
-    assertThat(account.getPerms()).contains("ADMINISTER", "EDIT_PROFILE", "CREATE_CONTENT", "MODERATE_CONTENT",
+    assertThat(account.getPerms()).hasSize(6).contains("ADMINISTER", "EDIT_PROFILE", "CREATE_CONTENT", "MODERATE_CONTENT",
       "CREATE_ADS", "BASIC_ADMIN");
   }
 
@@ -449,9 +446,7 @@ void jsonObjectToMap() {
     String jsonString = "{ \"my_map\": { \"key1\": 1, \"key2\": 2}}";
     MapTestType object = createJsonMapper().toJavaObject(jsonString, MapTestType.class);
     assertThat(object).isNotNull();
-    assertThat(object.myMap).isNotNull();
-    assertThat(object.myMap.get("key1")).isEqualTo(1L);
-    assertThat(object.myMap.get("key2")).isEqualTo(2L);
+    assertThat(object.myMap).isNotNull().containsEntry("key1", 1L).containsEntry("key2", 2L);
   }
 
   @Test
@@ -466,14 +461,10 @@ void jsonObjectToBadMap() {
   void jsonToObjectWithOptionals() {
     String jsonString = "{ \"text\": \"justsometext\", \"number\": 123456, \"emptyNumberButNull\":null}";
     JavaTypeWithOptionalField obj = createJsonMapper().toJavaObject(jsonString, JavaTypeWithOptionalField.class);
-    assertThat(obj.number).isInstanceOf(Optional.class);
-    assertThat(obj.number).hasValue(123456);
-    assertThat(obj.text).isInstanceOf(Optional.class);
-    assertThat(obj.text).hasValue("justsometext");
-    assertThat(obj.emptyNumber).isInstanceOf(Optional.class);
-    assertThat(obj.emptyNumber).isEmpty();
-    assertThat(obj.emptyNumberButNull).isInstanceOf(Optional.class);
-    assertThat(obj.emptyNumberButNull).isEmpty();
+    assertThat(obj.number).isInstanceOf(Optional.class).hasValue(123456);
+    assertThat(obj.text).isInstanceOf(Optional.class).hasValue("justsometext");
+    assertThat(obj.emptyNumber).isInstanceOf(Optional.class).isEmpty();
+    assertThat(obj.emptyNumberButNull).isInstanceOf(Optional.class).isEmpty();
   }
 
   static class MapTestType {

src/test/java/com/restfb/ParameterTest.java

@@ -44,8 +44,7 @@ void correctKeyCheck() {
 
     Parameter testParam = Parameter.with(key, val);
 
-    assertThat(testParam).hasName(key);
-    assertThat(testParam).hasValue(val);
+    assertThat(testParam).hasName(key).hasValue(val);
   }
 
   @Test
@@ -60,8 +59,7 @@ void correctKeyWithWsCheck() {
 
     Parameter testParam = Parameter.with(key, val);
 
-    assertThat(testParam).hasName(key.trim());
-    assertThat(testParam).hasValue(val);
+    assertThat(testParam).hasName(key.trim()).hasValue(val);
   }
 
   @Test

src/test/java/com/restfb/SpecialCommentHandlingTest.java

@@ -41,7 +41,7 @@ class SpecialCommentHandlingTest extends AbstractJsonMapperTests {
   @Test
   void emptyArrayTest() {
     Post post = createJsonMapper().toJavaObject(jsonFromClasspath("post-with-empty-comments"), Post.class);
-    assertThat(post.getComments().getTotalCount()).isEqualTo(0);
+    assertThat(post.getComments().getTotalCount()).isZero();
     assertThat(post.getComments().getData()).isEmpty();
   }
 

src/test/java/com/restfb/StatusExceptionTest.java

@@ -47,7 +47,7 @@ void statusException() {
       assertThat(fe.getErrorMessage()).isEqualTo("Message describing the error");
       assertThat(fe.getRawErrorJson()).isNotNull();
       AssertJson.assertEquals(jsonErrorString, fe.getRawErrorJson().toString());
-      assertThat(fe.getFbtraceId()).isEqualTo("");
+      assertThat(fe.getFbtraceId()).isEmpty();
     }
   }
 

src/test/java/com/restfb/batch/BatchRequestTest.java

@@ -32,60 +32,49 @@ class BatchRequestTest {
   @Test
   void checkBatchRequest_me() {
     BatchRequest meRequest = new BatchRequest.BatchRequestBuilder("me").build();
-    assertThat(meRequest).hasMethod("GET");
-    assertThat(meRequest).hasRelativeUrl("me");
+    assertThat(meRequest).hasMethod("GET").hasRelativeUrl("me");
   }
 
   @Test
   void checkBatchRequest_withHeader() {
     BatchHeader header = new BatchHeader("If-None-Match", "478fb2358f700");
     BatchRequest meRequest = new BatchRequest.BatchRequestBuilder("me").headers(header).build();
-    assertThat(meRequest).hasMethod("GET");
-    assertThat(meRequest).hasRelativeUrl("me");
+    assertThat(meRequest).hasMethod("GET").hasRelativeUrl("me");
     assertThat(meRequest.getHeaders()).containsExactly(header);
   }
 
   @Test
   void checkBatchRequest_withName() {
     BatchRequest meRequest = new BatchRequest.BatchRequestBuilder("me").name("req1").build();
-    assertThat(meRequest).hasMethod("GET");
-    assertThat(meRequest).hasRelativeUrl("me");
-    assertThat(meRequest).hasName("req1");
+    assertThat(meRequest).hasMethod("GET").hasRelativeUrl("me").hasName("req1");
   }
 
   @Test
   void checkBatchRequest_withParams() {
     BatchRequest m83musicRequest =
         new BatchRequest.BatchRequestBuilder("m83music/feed").parameters(Parameter.with("limit", 5)).build();
-    assertThat(m83musicRequest).hasMethod("GET");
-    assertThat(m83musicRequest).hasRelativeUrl("m83music/feed?limit=5");
+    assertThat(m83musicRequest).hasMethod("GET").hasRelativeUrl("m83music/feed?limit=5");
   }
 
   @Test
   void checkBatchRequest_withFiles() {
     BatchRequest withFiles = new BatchRequest.BatchRequestBuilder("me/photos").attachedFiles("cat-pic").build();
-    assertThat(withFiles).hasMethod("GET");
-    assertThat(withFiles).hasRelativeUrl("me/photos");
-    assertThat(withFiles).hasAttachedFiles("cat-pic");
+    assertThat(withFiles).hasMethod("GET").hasRelativeUrl("me/photos").hasAttachedFiles("cat-pic");
   }
 
   @Test
   void checkBatchRequest_post() {
     BatchRequest postRequest = new BatchRequest.BatchRequestBuilder("me/feed").method("POST")
       .body(Parameter.with("message", "Testing!")).build();
-    assertThat(postRequest).hasMethod("POST");
-    assertThat(postRequest).hasRelativeUrl("me/feed");
-    assertThat(postRequest).hasBody("message=Testing%21");
+    assertThat(postRequest).hasMethod("POST").hasRelativeUrl("me/feed").hasBody("message=Testing%21");
   }
 
   @Test
   void checkBatchRequest_post_omitResponse() {
     BatchRequest postRequest = new BatchRequest.BatchRequestBuilder("me/feed").method("POST")
       .body(Parameter.with("message", "Testing!")).omitResponseOnSuccess(true).build();
-    assertThat(postRequest).hasMethod("POST");
-    assertThat(postRequest).hasRelativeUrl("me/feed");
-    assertThat(postRequest).hasBody("message=Testing%21");
-    assertThat(postRequest).isOmitResponseOnSuccess();
+    assertThat(postRequest).hasMethod("POST").hasRelativeUrl("me/feed").hasBody("message=Testing%21")
+      .isOmitResponseOnSuccess();
   }
 
 }

src/test/java/com/restfb/integration/DebugTokenITCase.java

@@ -29,10 +29,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class DebugTokenITCase extends RestFbIntegrationTestBase {
+class DebugTokenITCase extends RestFbIntegrationTestBase {
 
   @Test
-  public void checkDebugToken() {
+  void checkDebugToken() {
     DefaultFacebookClient client = new DefaultFacebookClient(getTestSettings().getUserAccessToken(), Version.VERSION_3_1);
     FacebookClient.DebugTokenInfo debugTokenInfo = client.debugToken("abc");
     assertNotNull(debugTokenInfo);

src/test/java/com/restfb/integration/TestUserITCase.java

@@ -32,7 +32,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestUserITCase extends RestFbIntegrationTestBase {
+class TestUserITCase extends RestFbIntegrationTestBase {
 
   @Test
   void createAndRemoveTestUser() {

src/test/java/com/restfb/types/InsightTest.java

@@ -87,7 +87,7 @@ void checkIssue1082() {
     exampleInsight.stream().forEach(insight -> {
       assertThat(insight.getValues()).isNotNull();
       assertThat(insight.getValues()).hasSize(1);
-      assertThat(insight.getValues().get(0).get("value").asInt()).isGreaterThan(0);
+      assertThat(insight.getValues().get(0).get("value").asInt()).isPositive();
     });
   }
 

src/test/java/com/restfb/types/oembed/OembedTest.java

@@ -28,7 +28,7 @@
 
 import com.restfb.AbstractJsonMapperTests;
 
-public class OembedTest extends AbstractJsonMapperTests {
+class OembedTest extends AbstractJsonMapperTests {
 
   @Test
   void oembedPage() {