Some bugfixes for the MultiPartArticleModel

ccm-cms/src/main/java/org/librecms/pages/PagesController.java

@@ -38,6 +38,7 @@ import org.librecms.contentsection.ContentItemVersion;
 import org.librecms.pages.models.CategoryModel;
 import org.librecms.pages.models.ContentItemModel;
 import org.librecms.pages.models.PagePropertiesModel;
+import org.librecms.pages.models.PageUrlModel;
 import org.librecms.pages.models.SiteInfoModel;
 
 import java.net.URI;
@@ -196,6 +197,9 @@ public class PagesController {
     @Inject
     private PagePropertiesModel pagePropertiesModel;
 
+    @Inject
+    private PageUrlModel pageUrlModel;
+
     @Inject
     private PagesRepository pagesRepo;
 
@@ -242,6 +246,8 @@ public class PagesController {
         final Versions versions = generateFromPreviewParam(preview);
         final String language = determineLanguage(category, versions);
         
+        initPageUrlModel(uriInfo);
+
         final String indexPage = String.format(
             "/index.%s.html%s",
             language,
@@ -271,6 +277,8 @@ public class PagesController {
         final Versions versions = generateFromPreviewParam(preview);
         final String language = determineLanguage(category, versions);
 
+        initPageUrlModel(uriInfo);
+        
         final String itemPage = String.format(
             "/%s.%s.html%s",
             itemName,
@@ -301,6 +309,8 @@ public class PagesController {
         final Versions versions = generateFromPreviewParam(preview);
         final String language = determineLanguage(category, itemName, versions);
         
+        initPageUrlModel(uriInfo);
+
         final String itemPage = String.format(
             "/%s.%s.html", itemName, language
         );
@@ -407,6 +417,8 @@ public class PagesController {
         final Versions versions = generateFromPreviewParam(preview);
         final String language = determineLanguage(category, versions);
         
+        initPageUrlModel(uriInfo);
+
         final String redirectTo;
         if (uriInfo.getPath().endsWith("/")) {
             redirectTo = String.format(
@@ -461,6 +473,8 @@ public class PagesController {
         final Versions versions = generateFromPreviewParam(preview);
         final String language = determineLanguage(category, versions);
         
+        initPageUrlModel(uriInfo);
+
         final String redirectTo;
         if (uriInfo.getPath().endsWith("/")) {
             redirectTo = String.format(
@@ -535,6 +549,7 @@ public class PagesController {
                 .sorted()
                 .collect(Collectors.toList())
         );
+        initPageUrlModel(uriInfo);
         siteInfoModel.setDomain(site.getDomainOfSite());
         siteInfoModel.setHost(domain);
         siteInfoModel.setName(
@@ -806,6 +821,25 @@ public class PagesController {
         }
     }
 
+    private void initPageUrlModel(final UriInfo uriInfo) {
+        pageUrlModel.setHost(uriInfo.getRequestUri().getHost());
+        pageUrlModel.setPath(uriInfo.getPath());
+        pageUrlModel.setPort(uriInfo.getRequestUri().getPort());
+        pageUrlModel.setProtocol(uriInfo.getRequestUri().getScheme());
+        pageUrlModel.setQueryParameters(
+            uriInfo
+                .getQueryParameters()
+                .entrySet()
+                .stream()
+                .collect(
+                    Collectors.toMap(
+                        entry -> entry.getKey(),
+                        entry -> entry.getValue().get(0)
+                    )
+                )
+        );
+    }
+
     /**
      * Encapsulate the result of converting the value of the {@code preview}
      * query parameter.

ccm-cms/src/main/java/org/librecms/pages/models/MultiPartArticleModel.java

@@ -130,6 +130,7 @@ public class MultiPartArticleModel implements ProcessesContentItem {
                 .ofNullable(mpa.getSummary())
                 .map(globalizationHelper::getValueFromLocalizedString)
                 .orElse(null);
+
             sectionTitles = Optional
                 .ofNullable(mpa.getSections())
                 .map(
@@ -156,15 +157,21 @@ public class MultiPartArticleModel implements ProcessesContentItem {
                         .build()
                 );
             }
-            currentSectionTitle = Optional
-                .ofNullable(mpa.getSections().get(currentSection).getTitle())
-                .map(globalizationHelper::getValueFromLocalizedString)
-                .orElse("");
 
-            currentSectionText = Optional
+            if (mpa.getSections().isEmpty()) {
-                .ofNullable(mpa.getSections().get(currentSection).getText())
+                currentSectionTitle = "";
-                .map(globalizationHelper::getValueFromLocalizedString)
+                currentSectionText = "";
-                .orElse("");
+            } else {
+                currentSectionTitle = Optional
+                    .ofNullable(mpa.getSections().get(currentSection).getTitle())
+                    .map(globalizationHelper::getValueFromLocalizedString)
+                    .orElse("");
+
+                currentSectionText = Optional
+                    .ofNullable(mpa.getSections().get(currentSection).getText())
+                    .map(globalizationHelper::getValueFromLocalizedString)
+                    .orElse("");
+            }
 
             sections = mpa
                 .getSections()