remove java Optional methods from EL expressions since they are resolved

automatically
intranda · Jan 23, 2025 · 03c4ad5 · 03c4ad5
1 parent 562556a
commit 03c4ad5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...-viewer-core/src/main/resources/META-INF/resources/resources/cms/adminCmsRecordNote.xhtml b/...-viewer-core/src/main/resources/META-INF/resources/resources/cms/adminCmsRecordNote.xhtml
@@ -398,8 +398,8 @@
 										<div class="admin__record-notes-info-box">
 											<div class="admin__record-notes-image-wrapper">
 												<img class="admin__record-notes-image"
-													alt="#{note.recordTitle.getValue(navigationHelper.locale).orElse('')}"
-													title="#{note.recordTitle.getValue(navigationHelper.locale).orElse('')}"
+													alt="#{note.recordTitle.getValue(navigationHelper.locale)}"
+													title="#{note.recordTitle.getValue(navigationHelper.locale)}"
 													src="#{cmsRecordNotesBean.getThumbnailUrl(note, 350, 420)}" />
 											</div>
 											<div class="admin__record-notes-metadata">

diff --git a/...er-core/src/main/resources/META-INF/resources/resources/cms/adminCmsWidgetsOverview.xhtml b/...er-core/src/main/resources/META-INF/resources/resources/cms/adminCmsWidgetsOverview.xhtml
@@ -77,7 +77,7 @@
 
 
                                         <!-- DESCRIPTION -->
-                                        <p class="admin__boxed-entry-description">#{widget.description.getValue(navigationHelper.locale).orElse("")}</p>
+                                        <p class="admin__boxed-entry-description">#{widget.description.getValue(navigationHelper.locale)}</p>
 
                                         <!-- INFOS + DATA -->
 										<div class="cms-widgets-overview__single-widget-info-wrapper">
@@ -122,7 +122,7 @@
 			                                        <div class="row admin__boxed-entry-actions">
 			                                            <div class="col-3 d-flex">
 			                                                <!-- EDIT -->
-			                                                <a href="#{request.contextPath}/admin/cms/maps/edit/#{widget.id}/" class="admin__boxed-entry-actions-edit" aria-label="#{msg.edit}: #{widget.title.getValue(navigationHelper.locale).orElse('')}">#{msg.edit}</a>
+			                                                <a href="#{request.contextPath}/admin/cms/maps/edit/#{widget.id}/" class="admin__boxed-entry-actions-edit" aria-label="#{msg.edit}: #{widget.title.getValue(navigationHelper.locale)}">#{msg.edit}</a>
 			                                            </div>
 			                                        </div>
 
@@ -135,7 +135,7 @@
                                         <div class="row admin__boxed-entry-actions">
                                             <div class="col-3 d-flex">
                                                 <!-- EDIT -->
-                                                <a href="#{navigationHelper.applicationUrl}admin/cms/widgets/edit/#{widget.id}/" class="admin__boxed-entry-actions-edit" aria-label="#{msg.edit}: #{widget.title.getValue(navigationHelper.locale).orElse('')}">#{msg.edit}</a>
+                                                <a href="#{navigationHelper.applicationUrl}admin/cms/widgets/edit/#{widget.id}/" class="admin__boxed-entry-actions-edit" aria-label="#{msg.edit}: #{widget.title.getValue(navigationHelper.locale)}">#{msg.edit}</a>
 
                                                 <!-- DELETE -->
                                                 <ui:fragment  rendered="#{empty widget.embeddingPages}">
@@ -144,7 +144,7 @@
 	                                                    data-require-confirmation="true"
 	                                                    data-confirmation-text="#{navigationHelper.getTranslationWithParamsUnescaped(msg.cms_widget__delete_this_widget, widget.title.getTextOrDefault())}"
 	                                                    jsf:action="#{cmsSidebarWidgetsBean.deleteWidget(widget.id)}"
-	                                                    aria-label="#{msg.delete}: #{widget.title.getValue(navigationHelper.locale).orElse('')}" >
+	                                                    aria-label="#{msg.delete}: #{widget.title.getValue(navigationHelper.locale)}" >
 	                                                    #{msg.delete}
 	                                                </button>
                                                 </ui:fragment>

diff --git a/...-core/src/main/resources/META-INF/resources/resources/components/thumbnailPaginator.xhtml b/...-core/src/main/resources/META-INF/resources/resources/components/thumbnailPaginator.xhtml
@@ -20,7 +20,7 @@
 	<composite:implementation>
 		<div class="thumbnail-paginator">
 			<ui:repeat var="order" value="#{activeDocumentBean.viewManager.getPageRangeAroundPage(cc.attrs.currentPageOrder, cc.attrs.range, true)}">
-				<ui:param name="page" value="#{activeDocumentBean.viewManager.getPage(order).orElse(null)}"></ui:param>
+				<ui:param name="page" value="#{activeDocumentBean.viewManager.getPage(order)}"></ui:param>
 				<div class="thumbnail-paginator__item #{order == cc.attrs.currentPageOrder ? '-activePage' : ''}">
 					<ui:fragment rendered="#{page != null}">
 						<h:outputLink styleClass="thumbnail-paginator__link" value="#{activeDocumentBean.getPageUrl(order)}">