Fix several deprecations in AssertJ custom assertions

Author: uhafner

etc/assertj-templates/assertion_class_template.txt

@@ -20,7 +20,7 @@ public class ${custom_assertion_class} extends AbstractObjectAssert<${custom_ass
    * @param actual the ${class_to_assert} we want to make assertions on.
    * @return a new <code>{@link ${custom_assertion_class}}</code>
    */
-  @org.assertj.core.util.CheckReturnValue
+  @org.assertj.core.annotation.CheckReturnValue
   public static ${custom_assertion_class} assertThat(${class_to_assert} actual) {
     return new ${custom_assertion_class}(actual);
   }

etc/assertj-templates/assertions_entry_point_method_template.txt

@@ -0,0 +1,10 @@
+  /**
+   * Creates a new instance of <code>{@link ${custom_assertion_class}}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created assertion object.
+   */
+  @org.assertj.core.annotation.CheckReturnValue
+  public static ${custom_assertion_class} assertThat(${class_to_assert} actual) {
+    return new ${custom_assertion_class}(actual);
+  }

etc/assertj-templates/soft_assertions_entry_point_class_template.txt

@@ -3,7 +3,6 @@ package ${package};
 /**
  * Entry point for soft assertions of different data types.
  */
-@edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
 @edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
 public class SoftAssertions extends org.assertj.core.api.AutoCloseableSoftAssertions {
 ${all_assertions_entry_points}

etc/assertj-templates/soft_assertions_entry_point_method_template.txt

@@ -0,0 +1,10 @@
+  /**
+   * Creates a new "soft" instance of <code>{@link ${custom_assertion_class}}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created "soft" assertion object.
+   */
+  @org.assertj.core.annotation.CheckReturnValue
+  public ${custom_assertion_class} assertThat(${class_to_assert} actual) {
+    return proxy(${custom_assertion_class}.class, ${class_to_assert}.class, actual);
+  }