Skip to content

Commit 558844a

Browse files
rstoyanchevrstoyanchev
committed
Update booking-faces to Jakarta EE
1 parent ee81c79 commit 558844a

File tree

14 files changed

+143
-100
lines changed

14 files changed

+143
-100
lines changed

‎booking-faces/pom.xml‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
<groupId>org.springframework</groupId>
2929
<artifactId>spring-orm</artifactId>
3030
</dependency>
31+
<dependency>
32+
<groupId>org.springframework.webflow</groupId>
33+
<artifactId>spring-binding</artifactId>
34+
<version>${webflow.version}</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.springframework.webflow</groupId>
38+
<artifactId>spring-webflow</artifactId>
39+
<version>${webflow.version}</version>
40+
</dependency>
3141
<dependency>
3242
<groupId>org.springframework.webflow</groupId>
3343
<artifactId>spring-faces</artifactId>
@@ -43,38 +53,41 @@
4353
</dependency>
4454
<!-- Servlet -->
4555
<dependency>
46-
<groupId>javax.servlet</groupId>
47-
<artifactId>javax.servlet-api</artifactId>
56+
<groupId>jakarta.servlet</groupId>
57+
<artifactId>jakarta.servlet-api</artifactId>
4858
<version>${servlet.version}</version>
4959
<scope>provided</scope>
5060
</dependency>
5161
<!-- JSF implementation: Mojarra -->
5262
<dependency>
53-
<groupId>com.sun.faces</groupId>
54-
<artifactId>jsf-api</artifactId>
55-
<version>${mojarra.version}</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.sun.faces</groupId>
59-
<artifactId>jsf-impl</artifactId>
63+
<groupId>org.glassfish</groupId>
64+
<artifactId>jakarta.faces</artifactId>
6065
<version>${mojarra.version}</version>
6166
</dependency>
6267
<!-- JSF implementation: MyFaces (also change DispatcherServletInitializer)
63-
<dependency>
64-
<groupId>org.apache.myfaces.core</groupId>
65-
<artifactId>myfaces-api</artifactId>
66-
<version>${myfaces.version}</version>
67-
</dependency>
6868
<dependency>
6969
<groupId>org.apache.myfaces.core</groupId>
7070
<artifactId>myfaces-impl</artifactId>
7171
<version>${myfaces.version}</version>
7272
</dependency>
7373
-->
74+
<dependency>
75+
<groupId>jakarta.enterprise</groupId>
76+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
77+
<scope>provided</scope>
78+
<version>${cdi-api}</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.jboss.weld.servlet</groupId>
82+
<artifactId>weld-servlet-shaded</artifactId>
83+
<scope>runtime</scope>
84+
<version>${weld.version}</version>
85+
</dependency>
7486
<dependency>
7587
<groupId>org.primefaces</groupId>
7688
<artifactId>primefaces</artifactId>
7789
<version>${primefaces.version}</version>
90+
<classifier>jakarta</classifier>
7891
</dependency>
7992
<!-- Database, JPA -->
8093
<dependency>
@@ -83,14 +96,19 @@
8396
<version>${hsqldb.version}</version>
8497
<scope>runtime</scope>
8598
</dependency>
99+
<dependency>
100+
<groupId>org.hibernate</groupId>
101+
<artifactId>hibernate-core-jakarta</artifactId>
102+
<version>${hibernate.version}</version>
103+
</dependency>
86104
<dependency>
87105
<groupId>org.hibernate</groupId>
88106
<artifactId>hibernate-entitymanager</artifactId>
89107
<version>${hibernate.version}</version>
90108
</dependency>
91109
<!-- JSR 303 with Hibernate Validator -->
92110
<dependency>
93-
<groupId>org.hibernate</groupId>
111+
<groupId>org.hibernate.validator</groupId>
94112
<artifactId>hibernate-validator</artifactId>
95113
<version>${hibernate-validator.version}</version>
96114
</dependency>
@@ -157,8 +175,8 @@
157175
<artifactId>maven-compiler-plugin</artifactId>
158176
<version>3.7.0</version>
159177
<configuration>
160-
<source>1.8</source>
161-
<target>1.8</target>
178+
<source>17</source>
179+
<target>17</target>
162180
</configuration>
163181
</plugin>
164182
<plugin>

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
import java.util.Calendar;
77
import java.util.Date;
88

9-
import javax.persistence.Basic;
10-
import javax.persistence.Entity;
11-
import javax.persistence.GeneratedValue;
12-
import javax.persistence.GenerationType;
13-
import javax.persistence.Id;
14-
import javax.persistence.ManyToOne;
15-
import javax.persistence.Temporal;
16-
import javax.persistence.TemporalType;
17-
import javax.persistence.Transient;
18-
import javax.validation.constraints.Future;
19-
import javax.validation.constraints.NotNull;
20-
import javax.validation.constraints.Pattern;
9+
import jakarta.persistence.Basic;
10+
import jakarta.persistence.Entity;
11+
import jakarta.persistence.GeneratedValue;
12+
import jakarta.persistence.GenerationType;
13+
import jakarta.persistence.Id;
14+
import jakarta.persistence.ManyToOne;
15+
import jakarta.persistence.Temporal;
16+
import jakarta.persistence.TemporalType;
17+
import jakarta.persistence.Transient;
18+
import jakarta.validation.constraints.Future;
19+
import jakarta.validation.constraints.NotNull;
20+
import jakarta.validation.constraints.Pattern;
2121

2222
import org.hibernate.validator.constraints.NotEmpty;
2323
import org.springframework.binding.message.MessageBuilder;

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.io.Serializable;
44
import java.math.BigDecimal;
55

6-
import javax.persistence.Column;
7-
import javax.persistence.Entity;
8-
import javax.persistence.GeneratedValue;
9-
import javax.persistence.Id;
6+
import jakarta.persistence.Column;
7+
import jakarta.persistence.Entity;
8+
import jakarta.persistence.GeneratedValue;
9+
import jakarta.persistence.Id;
1010

1111
/**
1212
* A hotel where users may book stays.

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import org.primefaces.model.FilterMeta;
77
import org.primefaces.model.LazyDataModel;
8+
import org.primefaces.model.SortMeta;
89
import org.primefaces.model.SortOrder;
910

1011
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +33,21 @@ public void setSearchCriteria(SearchCriteria searchCriteria) {
3233
}
3334

3435
@Override
35-
public List<Hotel> load(int first, int pageSize, String sortField, SortOrder order, Map<String, FilterMeta> filterBy) {
36+
public int count(Map<String, FilterMeta> filterBy) {
37+
return bookingService.getNumberOfHotels(this.searchCriteria);
38+
}
39+
40+
@Override
41+
public List<Hotel> load(int first, int pageSize, Map<String, SortMeta> sortBy, Map<String, FilterMeta> filterBy) {
3642
this.searchCriteria.setCurrentPage(first / pageSize + 1);
37-
this.hotels = bookingService.findHotels(searchCriteria, first, sortField, order.equals(SortOrder.ASCENDING));
43+
String sortField = null;
44+
SortOrder sortOrder = SortOrder.ASCENDING;
45+
if (!sortBy.isEmpty()) {
46+
SortMeta sortMeta = sortBy.values().iterator().next();
47+
sortField = sortMeta.getField();
48+
sortOrder = sortMeta.getOrder();
49+
}
50+
this.hotels = bookingService.findHotels(searchCriteria, first, sortField, !sortOrder.equals(SortOrder.DESCENDING));
3851
return hotels;
3952
}
4053

@@ -49,8 +62,8 @@ public Hotel getRowData(String rowKey) {
4962
}
5063

5164
@Override
52-
public Object getRowKey(Hotel hotel) {
53-
return hotel.getId();
65+
public String getRowKey(Hotel hotel) {
66+
return String.valueOf(hotel.getId());
5467
}
5568

5669
@Override

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.io.Serializable;
44
import java.util.List;
55

6-
import javax.persistence.EntityManager;
7-
import javax.persistence.PersistenceContext;
6+
import jakarta.persistence.EntityManager;
7+
import jakarta.persistence.PersistenceContext;
88

99
import org.springframework.stereotype.Repository;
1010
import org.springframework.stereotype.Service;

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Calendar;
55
import java.util.List;
66

7-
import javax.faces.model.SelectItem;
7+
import jakarta.faces.model.SelectItem;
88

99
import org.springframework.stereotype.Service;
1010

@@ -23,17 +23,17 @@ public class ReferenceData {
2323

2424
public List<SelectItem> getBedOptions() {
2525
if (bedOptions == null) {
26-
bedOptions = new ArrayList<SelectItem>();
27-
bedOptions.add(new SelectItem(new Integer(1), "One king-size bed"));
28-
bedOptions.add(new SelectItem(new Integer(2), "Two double beds"));
29-
bedOptions.add(new SelectItem(new Integer(3), "Three beds"));
26+
bedOptions = new ArrayList<>();
27+
bedOptions.add(new SelectItem(1, "One king-size bed"));
28+
bedOptions.add(new SelectItem(2, "Two double beds"));
29+
bedOptions.add(new SelectItem(3, "Three beds"));
3030
}
3131
return bedOptions;
3232
}
3333

3434
public List<SelectItem> getSmokingOptions() {
3535
if (smokingOptions == null) {
36-
smokingOptions = new ArrayList<SelectItem>();
36+
smokingOptions = new ArrayList<>();
3737
smokingOptions.add(new SelectItem(Boolean.TRUE, "Smoking"));
3838
smokingOptions.add(new SelectItem(Boolean.FALSE, "Non-Smoking"));
3939
}
@@ -42,42 +42,42 @@ public List<SelectItem> getSmokingOptions() {
4242

4343
public List<SelectItem> getCreditCardExpMonths() {
4444
if (creditCardExpMonths == null) {
45-
creditCardExpMonths = new ArrayList<SelectItem>();
46-
creditCardExpMonths.add(new SelectItem(new Integer(1), "Jan"));
47-
creditCardExpMonths.add(new SelectItem(new Integer(2), "Feb"));
48-
creditCardExpMonths.add(new SelectItem(new Integer(3), "Mar"));
49-
creditCardExpMonths.add(new SelectItem(new Integer(4), "Apr"));
50-
creditCardExpMonths.add(new SelectItem(new Integer(5), "May"));
51-
creditCardExpMonths.add(new SelectItem(new Integer(6), "Jun"));
52-
creditCardExpMonths.add(new SelectItem(new Integer(7), "Jul"));
53-
creditCardExpMonths.add(new SelectItem(new Integer(8), "Aug"));
54-
creditCardExpMonths.add(new SelectItem(new Integer(9), "Sep"));
55-
creditCardExpMonths.add(new SelectItem(new Integer(10), "Oct"));
56-
creditCardExpMonths.add(new SelectItem(new Integer(11), "Nov"));
57-
creditCardExpMonths.add(new SelectItem(new Integer(12), "Dec"));
45+
creditCardExpMonths = new ArrayList<>();
46+
creditCardExpMonths.add(new SelectItem(1, "Jan"));
47+
creditCardExpMonths.add(new SelectItem(2, "Feb"));
48+
creditCardExpMonths.add(new SelectItem(3, "Mar"));
49+
creditCardExpMonths.add(new SelectItem(4, "Apr"));
50+
creditCardExpMonths.add(new SelectItem(5, "May"));
51+
creditCardExpMonths.add(new SelectItem(6, "Jun"));
52+
creditCardExpMonths.add(new SelectItem(7, "Jul"));
53+
creditCardExpMonths.add(new SelectItem(8, "Aug"));
54+
creditCardExpMonths.add(new SelectItem(9, "Sep"));
55+
creditCardExpMonths.add(new SelectItem(10, "Oct"));
56+
creditCardExpMonths.add(new SelectItem(11, "Nov"));
57+
creditCardExpMonths.add(new SelectItem(12, "Dec"));
5858
}
5959
return creditCardExpMonths;
6060
}
6161

6262
public List<SelectItem> getCreditCardExpYears() {
6363
if (creditCardExpYears == null) {
64-
creditCardExpYears = new ArrayList<SelectItem>();
64+
creditCardExpYears = new ArrayList<>();
6565
Calendar cal = Calendar.getInstance();
6666
int year = cal.get(Calendar.YEAR);
67-
creditCardExpYears.add(new SelectItem(new Integer(year), String.valueOf(year++)));
68-
creditCardExpYears.add(new SelectItem(new Integer(year), String.valueOf(year++)));
69-
creditCardExpYears.add(new SelectItem(new Integer(year), String.valueOf(year++)));
70-
creditCardExpYears.add(new SelectItem(new Integer(year), String.valueOf(year++)));
71-
creditCardExpYears.add(new SelectItem(new Integer(year), String.valueOf(year++))); }
67+
creditCardExpYears.add(new SelectItem(year, String.valueOf(year++)));
68+
creditCardExpYears.add(new SelectItem(year, String.valueOf(year++)));
69+
creditCardExpYears.add(new SelectItem(year, String.valueOf(year++)));
70+
creditCardExpYears.add(new SelectItem(year, String.valueOf(year++)));
71+
creditCardExpYears.add(new SelectItem(year, String.valueOf(year++))); }
7272
return creditCardExpYears;
7373
}
7474

7575
public List<SelectItem> getPageSizeOptions() {
7676
if (pageSizeOptions == null) {
77-
pageSizeOptions = new ArrayList<SelectItem>();
78-
pageSizeOptions.add(new SelectItem(new Integer(5), "5"));
79-
pageSizeOptions.add(new SelectItem(new Integer(10), "10"));
80-
pageSizeOptions.add(new SelectItem(new Integer(20), "20"));
77+
pageSizeOptions = new ArrayList<>();
78+
pageSizeOptions.add(new SelectItem(5, "5"));
79+
pageSizeOptions.add(new SelectItem(10, "10"));
80+
pageSizeOptions.add(new SelectItem(20, "20"));
8181
}
8282
return pageSizeOptions;
8383
}

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/User.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.Serializable;
44

5-
import javax.persistence.Entity;
6-
import javax.persistence.Id;
7-
import javax.persistence.Table;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.Id;
7+
import jakarta.persistence.Table;
88

99
/**
1010
* A user who can book hotels.

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DataAccessConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Collections;
44

5-
import javax.persistence.EntityManagerFactory;
5+
import jakarta.persistence.EntityManagerFactory;
66
import javax.sql.DataSource;
77

88
import org.springframework.context.annotation.Bean;

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.springframework.webflow.samples.booking.config;
22

3-
import javax.servlet.Filter;
4-
import javax.servlet.ServletContext;
5-
import javax.servlet.ServletException;
3+
import jakarta.servlet.Filter;
4+
import jakarta.servlet.ServletContext;
5+
import jakarta.servlet.ServletException;
66

77
import org.springframework.web.filter.CharacterEncodingFilter;
88
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -34,13 +34,13 @@ protected Filter[] getServletFilters() {
3434
public void onStartup(ServletContext servletContext) throws ServletException {
3535

3636
// Use JSF view templates saved as *.xhtml, for use with Facelets
37-
servletContext.setInitParameter("javax.faces.DEFAULT_SUFFIX", ".xhtml");
37+
servletContext.setInitParameter("jakarta.faces.DEFAULT_SUFFIX", ".xhtml");
3838
// Enable special Facelets debug output during development
39-
servletContext.setInitParameter("javax.faces.PROJECT_STAGE", "Development");
39+
servletContext.setInitParameter("jakarta.faces.PROJECT_STAGE", "Development");
4040
// Causes Facelets to refresh templates during development
41-
servletContext.setInitParameter("javax.faces.FACELETS_REFRESH_PERIOD", "1");
41+
servletContext.setInitParameter("jakarta.faces.FACELETS_REFRESH_PERIOD", "1");
4242
// Declare Spring Security Facelets tag library
43-
servletContext.setInitParameter("javax.faces.FACELETS_LIBRARIES", "/WEB-INF/springsecurity.taglib.xml");
43+
servletContext.setInitParameter("jakarta.faces.FACELETS_LIBRARIES", "/WEB-INF/springsecurity.taglib.xml");
4444

4545
// Comment out if not using Mojarra
4646
servletContext.addListener(com.sun.faces.config.ConfigureListener.class);

0 commit comments

Comments
 (0)