#287: Changed to use Optional.ofNullable to deal with nulls

bsorrentino · Jun 23, 2023 · 5997ce7 · 5997ce7
1 parent 622ae47
commit 5997ce7
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/core/src/main/java/org/bsc/confluence/model/SiteProcessor.java b/core/src/main/java/org/bsc/confluence/model/SiteProcessor.java
@@ -310,20 +310,14 @@ public Optional<Site.Page> getPage() {
 
             @Override
             public Optional<String> getPagePrefixToApply() {
-                if (pagePrefixToApply == null)
-                    return MarkdownParserContext.super.getPagePrefixToApply();
-
-                return Optional.of(pagePrefixToApply);
+                return Optional.ofNullable(pagePrefixToApply);
             }
 
             @Override
             public boolean isLinkPrefixEnabled() {
                 if( child.isIgnoreVariables() ) return false;
 
-                if (page == null)
-                    return MarkdownParserContext.super.isLinkPrefixEnabled();
-
-                return Optional.of(page).map( p -> !p.getTitle().contains("[") ).orElse(true);
+                return Optional.ofNullable(page).map( p -> !p.getTitle().contains("[") ).orElse(true);
 
             }
         }, content);