diff --git a/library/src/main/java/ru/noties/markwon/Markwon.java b/library/src/main/java/ru/noties/markwon/Markwon.java index e8f4afa7..aa0f566b 100644 --- a/library/src/main/java/ru/noties/markwon/Markwon.java +++ b/library/src/main/java/ru/noties/markwon/Markwon.java @@ -2,8 +2,6 @@ package ru.noties.markwon; import android.content.Context; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.widget.TextView; @@ -61,7 +59,7 @@ public abstract class Markwon { public static void setMarkdown( @NonNull TextView view, @NonNull SpannableConfiguration configuration, - @Nullable String markdown + @NonNull String markdown ) { setText(view, markdown(configuration, markdown)); @@ -98,16 +96,10 @@ public abstract class Markwon { * @return parsed markdown * @since 1.0.0 */ - @Nullable - public static CharSequence markdown(@NonNull Context context, @Nullable String markdown) { - final CharSequence out; - if (TextUtils.isEmpty(markdown)) { - out = null; - } else { - final SpannableConfiguration configuration = SpannableConfiguration.create(context); - out = markdown(configuration, markdown); - } - return out; + @NonNull + public static CharSequence markdown(@NonNull Context context, @NonNull String markdown) { + final SpannableConfiguration configuration = SpannableConfiguration.create(context); + return markdown(configuration, markdown); } /** @@ -119,18 +111,12 @@ public abstract class Markwon { * @see SpannableConfiguration * @since 1.0.0 */ - @Nullable - public static CharSequence markdown(@NonNull SpannableConfiguration configuration, @Nullable String markdown) { - final CharSequence out; - if (TextUtils.isEmpty(markdown)) { - out = null; - } else { - final Parser parser = createParser(); - final Node node = parser.parse(markdown); - final SpannableRenderer renderer = new SpannableRenderer(); - out = renderer.render(configuration, node); - } - return out; + @NonNull + public static CharSequence markdown(@NonNull SpannableConfiguration configuration, @NonNull String markdown) { + final Parser parser = createParser(); + final Node node = parser.parse(markdown); + final SpannableRenderer renderer = new SpannableRenderer(); + return renderer.render(configuration, node); } /** diff --git a/library/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java b/library/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java index f7b75939..32d620dd 100644 --- a/library/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java +++ b/library/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java @@ -1,7 +1,6 @@ package ru.noties.markwon.renderer; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import org.commonmark.node.Node; @@ -10,16 +9,10 @@ import ru.noties.markwon.SpannableConfiguration; public class SpannableRenderer { - @Nullable - public CharSequence render(@NonNull SpannableConfiguration configuration, @Nullable Node node) { - final CharSequence out; - if (node == null) { - out = null; - } else { - final SpannableBuilder builder = new SpannableBuilder(); - node.accept(new SpannableMarkdownVisitor(configuration, builder)); - out = builder.text(); - } - return out; + @NonNull + public CharSequence render(@NonNull SpannableConfiguration configuration, @NonNull Node node) { + final SpannableBuilder builder = new SpannableBuilder(); + node.accept(new SpannableMarkdownVisitor(configuration, builder)); + return builder.text(); } }