You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2022/12/24 15:55:24 UTC
[myfaces] branch main updated: RAT fixes
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new 62eb93997 RAT fixes
62eb93997 is described below
commit 62eb9399776ce86769913ce9496faa80a4e2c0c7
Author: melloware <me...@gmail.com>
AuthorDate: Sat Dec 24 09:49:09 2022 -0500
RAT fixes
---
.gitignore | 1 +
extensions/quarkus/showcase/pom.xml | 12 ++-
.../core/extensions/quarkus/showcase/view/Car.java | 63 ++++++++-----
.../quarkus/showcase/view/CarService.java | 104 ++++++++++++---------
.../extensions/quarkus/showcase/view/FileView.java | 21 +++--
.../quarkus/showcase/view/InputController.java | 16 ++--
.../quarkus/showcase/view/LazyCarDataModel.java | 67 ++++++++-----
.../quarkus/showcase/view/LazySorter.java | 38 +++++---
.../extensions/quarkus/showcase/view/LazyView.java | 31 ++++--
.../showcase/view/MethodHandleELResolverBean.java | 44 +++++----
.../quarkus/showcase/view/MyBacking.java | 19 ++--
.../quarkus/showcase/view/MyCollection.java | 2 +-
.../quarkus/showcase/view/MyCollectionModel.java | 6 +-
.../quarkus/showcase/view/MyConverter.java | 15 +--
.../quarkus/showcase/view/MyConverterManaged.java | 15 +--
.../quarkus/showcase/view/MyValidator.java | 14 +--
.../quarkus/showcase/view/SocketView.java | 37 +++++---
.../quarkus/showcase/QuarkusMyFacesNativeIT.java | 4 +-
.../showcase/QuarkusMyFacesShowcaseTest.java | 18 ++--
pom.xml | 2 +
20 files changed, 330 insertions(+), 199 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5af57ff22..798486617 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.iml
+*.log
*.ipr
*.iws
.classpath
diff --git a/extensions/quarkus/showcase/pom.xml b/extensions/quarkus/showcase/pom.xml
index afd5db8b8..ffbcdc94b 100644
--- a/extensions/quarkus/showcase/pom.xml
+++ b/extensions/quarkus/showcase/pom.xml
@@ -18,15 +18,19 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <groupId>org.apache.myfaces.core.extensions</groupId>
+ <artifactId>myfaces-quarkus</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-myfaces-showcase</artifactId>
- <version>1.0-SNAPSHOT</version>
<name>Apache MyFaces Core 4.0 - Extensions - Quarkus - Showcase</name>
<properties>
- <quarkus.version>3.0.0.Alpha2</quarkus.version>
- <myfaces.version>4.0.0-SNAPSHOT</myfaces.version>
<failsafe.version>2.22.0</failsafe.version>
<surefire.version>2.22.0</surefire.version>
@@ -54,7 +58,7 @@
<dependency>
<groupId>org.apache.myfaces.core.extensions.quarkus</groupId>
<artifactId>myfaces-quarkus</artifactId>
- <version>${myfaces.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/Car.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/Car.java
index e896fde70..6404adc87 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/Car.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/Car.java
@@ -20,7 +20,8 @@ package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.io.Serializable;
-public class Car implements Serializable {
+public class Car implements Serializable
+{
public String id;
public String brand;
@@ -29,17 +30,20 @@ public class Car implements Serializable {
public int price;
public boolean sold;
- public Car() {
+ public Car()
+ {
}
- public Car(String id, String brand, int year, String color) {
+ public Car(String id, String brand, int year, String color)
+ {
this.id = id;
this.brand = brand;
this.year = year;
this.color = color;
}
- public Car(String id, String brand, int year, String color, int price, boolean sold) {
+ public Car(String id, String brand, int year, String color, int price, boolean sold)
+ {
this.id = id;
this.brand = brand;
this.year = year;
@@ -48,71 +52,88 @@ public class Car implements Serializable {
this.sold = sold;
}
- public String getId() {
+ public String getId()
+ {
return id;
}
- public void setId(String id) {
+ public void setId(String id)
+ {
this.id = id;
}
- public String getBrand() {
+ public String getBrand()
+ {
return brand;
}
- public void setBrand(String brand) {
+ public void setBrand(String brand)
+ {
this.brand = brand;
}
- public int getYear() {
+ public int getYear()
+ {
return year;
}
- public void setYear(int year) {
+ public void setYear(int year)
+ {
this.year = year;
}
- public String getColor() {
+ public String getColor()
+ {
return color;
}
- public void setColor(String color) {
+ public void setColor(String color)
+ {
this.color = color;
}
- public int getPrice() {
+ public int getPrice()
+ {
return price;
}
- public void setPrice(int price) {
+ public void setPrice(int price)
+ {
this.price = price;
}
- public boolean isSold() {
+ public boolean isSold()
+ {
return sold;
}
- public void setSold(boolean sold) {
+ public void setSold(boolean sold)
+ {
this.sold = sold;
}
@Override
- public int hashCode() {
+ public int hashCode()
+ {
int hash = 7;
hash = 59 * hash + (this.id != null ? this.id.hashCode() : 0);
return hash;
}
@Override
- public boolean equals(Object obj) {
- if (obj == null) {
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
return false;
}
- if (getClass() != obj.getClass()) {
+ if (getClass() != obj.getClass())
+ {
return false;
}
final Car other = (Car) obj;
- if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) {
+ if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id))
+ {
return false;
}
return true;
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java
index 0ede7bd83..c2add6654 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java
@@ -22,81 +22,95 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
+
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Named;
@Named("carService")
@ApplicationScoped
-public class CarService {
-
- private final static String[] colors;
-
- private final static String[] brands;
-
- static {
- colors = new String[10];
- colors[0] = "Black";
- colors[1] = "White";
- colors[2] = "Green";
- colors[3] = "Red";
- colors[4] = "Blue";
- colors[5] = "Orange";
- colors[6] = "Silver";
- colors[7] = "Yellow";
- colors[8] = "Brown";
- colors[9] = "Maroon";
-
- brands = new String[10];
- brands[0] = "BMW";
- brands[1] = "Mercedes";
- brands[2] = "Volvo";
- brands[3] = "Audi";
- brands[4] = "Renault";
- brands[5] = "Fiat";
- brands[6] = "Volkswagen";
- brands[7] = "Honda";
- brands[8] = "Jaguar";
- brands[9] = "Ford";
+public class CarService
+{
+
+ private final static String[] COLORS;
+
+ private final static String[] BRANDS;
+
+ static
+ {
+ COLORS = new String[10];
+ COLORS[0] = "Black";
+ COLORS[1] = "White";
+ COLORS[2] = "Green";
+ COLORS[3] = "Red";
+ COLORS[4] = "Blue";
+ COLORS[5] = "Orange";
+ COLORS[6] = "Silver";
+ COLORS[7] = "Yellow";
+ COLORS[8] = "Brown";
+ COLORS[9] = "Maroon";
+
+ BRANDS = new String[10];
+ BRANDS[0] = "BMW";
+ BRANDS[1] = "Mercedes";
+ BRANDS[2] = "Volvo";
+ BRANDS[3] = "Audi";
+ BRANDS[4] = "Renault";
+ BRANDS[5] = "Fiat";
+ BRANDS[6] = "Volkswagen";
+ BRANDS[7] = "Honda";
+ BRANDS[8] = "Jaguar";
+ BRANDS[9] = "Ford";
}
- public List<Car> createCars(int size) {
+ public List<Car> createCars(int size)
+ {
List<Car> list = new ArrayList<Car>();
- for (int i = 0; i < size; i++) {
- list.add(new Car(getRandomId(), getRandomBrand(), getRandomYear(), getRandomColor(), getRandomPrice(), getRandomSoldState()));
+ for (int i = 0; i < size; i++)
+ {
+ list.add(new Car(getRandomId(), getRandomBrand(), getRandomYear(),
+ getRandomColor(), getRandomPrice(), getRandomSoldState()));
}
return list;
}
- private String getRandomId() {
+ private String getRandomId()
+ {
return UUID.randomUUID().toString().substring(0, 8);
}
- private int getRandomYear() {
+ private int getRandomYear()
+ {
return (int) (Math.random() * 50 + 1960);
}
- private String getRandomColor() {
- return colors[(int) (Math.random() * 10)];
+ private String getRandomColor()
+ {
+ return COLORS[(int) (Math.random() * 10)];
}
- private String getRandomBrand() {
- return brands[(int) (Math.random() * 10)];
+ private String getRandomBrand()
+ {
+ return BRANDS[(int) (Math.random() * 10)];
}
- private int getRandomPrice() {
+ private int getRandomPrice()
+ {
return (int) (Math.random() * 100000);
}
- private boolean getRandomSoldState() {
+ private boolean getRandomSoldState()
+ {
return Math.random() > 0.5;
}
- public List<String> getColors() {
- return Arrays.asList(colors);
+ public List<String> getColors()
+ {
+ return Arrays.asList(COLORS);
}
- public List<String> getBrands() {
- return Arrays.asList(brands);
+ public List<String> getBrands()
+ {
+ return Arrays.asList(BRANDS);
}
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java
index 3d097aa26..3b3ec35f2 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java
@@ -23,11 +23,13 @@ import org.primefaces.model.file.UploadedFile;
import jakarta.enterprise.context.RequestScoped;
import jakarta.inject.Named;
+
import java.io.Serializable;
@RequestScoped
@Named
-public class FileView implements Serializable {
+public class FileView implements Serializable
+{
private UploadedFile file;
@@ -35,24 +37,29 @@ public class FileView implements Serializable {
{
return "blub";
}
-
- public void upload() {
+
+ public void upload()
+ {
System.out.println("simple file upload start");
- if (file != null) {
+ if (file != null)
+ {
System.out.println(file.getFileName());
}
}
- public void handleFileUpload(FileUploadEvent event){
+ public void handleFileUpload(FileUploadEvent event)
+ {
System.out.println("auto file upload start");
System.out.println(event.getFile().getFileName());
}
- public UploadedFile getFile() {
+ public UploadedFile getFile()
+ {
return file;
}
- public void setFile(UploadedFile file) {
+ public void setFile(UploadedFile file)
+ {
this.file = file;
}
}
\ No newline at end of file
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java
index defdfb76b..1598fbf90 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java
@@ -19,6 +19,7 @@
package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.io.Serializable;
+
import jakarta.enterprise.context.SessionScoped;
import jakarta.faces.annotation.ManagedProperty;
import jakarta.inject.Inject;
@@ -26,21 +27,24 @@ import jakarta.inject.Named;
@Named
@SessionScoped
-public class InputController implements Serializable{
-
+public class InputController implements Serializable
+{
+
@Inject
@ManagedProperty(value = "#{carService}")
CarService carService;
-
+
private String val;
- public String getVal() {
+ public String getVal()
+ {
System.err.println("carService: " + carService);
return val;
}
- public void setVal(String val) {
+ public void setVal(String val)
+ {
this.val = val;
}
-
+
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyCarDataModel.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyCarDataModel.java
index bab071b1b..77e29639d 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyCarDataModel.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyCarDataModel.java
@@ -23,26 +23,31 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import org.primefaces.model.FilterMeta;
import org.primefaces.model.LazyDataModel;
import org.primefaces.model.SortMeta;
-import org.primefaces.model.SortOrder;
/**
* Dummy implementation of LazyDataModel that uses a list to mimic a real datasource like a database.
*/
-public class LazyCarDataModel extends LazyDataModel<Car> {
+public class LazyCarDataModel extends LazyDataModel<Car>
+{
private List<Car> datasource;
- public LazyCarDataModel(List<Car> datasource) {
+ public LazyCarDataModel(List<Car> datasource)
+ {
this.datasource = datasource;
}
@Override
- public Car getRowData(String rowKey) {
- for (Car car : datasource) {
- if (car.getId().equals(rowKey)) {
+ public Car getRowData(String rowKey)
+ {
+ for (Car car : datasource)
+ {
+ if (car.getId().equals(rowKey))
+ {
return car;
}
}
@@ -51,48 +56,59 @@ public class LazyCarDataModel extends LazyDataModel<Car> {
}
@Override
- public String getRowKey(Car car) {
+ public String getRowKey(Car car)
+ {
return car.getId();
}
@Override
- public List<Car> load(int first, int pageSize, Map<String, SortMeta> sortMeta, Map<String, FilterMeta> filterMeta) {
+ public List<Car> load(int first, int pageSize, Map<String, SortMeta> sortMeta, Map<String, FilterMeta> filterMeta)
+ {
List<Car> data = new ArrayList<Car>();
//filter
- for (Car car : datasource) {
+ for (Car car : datasource)
+ {
boolean match = true;
- if (filterMeta != null) {
- for (Iterator<String> it = filterMeta.keySet().iterator(); it.hasNext();) {
- try {
+ if (filterMeta != null)
+ {
+ for (Iterator<String> it = filterMeta.keySet().iterator(); it.hasNext(); )
+ {
+ try
+ {
String filterProperty = it.next();
Object filterValue = filterMeta.get(filterProperty).getFilterValue();
String fieldValue = String.valueOf(car.getClass().getField(filterProperty).get(car));
- if (filterValue == null || fieldValue.startsWith(filterValue.toString())) {
+ if (filterValue == null || fieldValue.startsWith(filterValue.toString()))
+ {
match = true;
}
- else {
+ else
+ {
match = false;
break;
}
}
- catch (Exception e) {
+ catch (Exception e)
+ {
match = false;
}
}
}
- if (match) {
+ if (match)
+ {
data.add(car);
}
}
//sort
- if (sortMeta != null) {
+ if (sortMeta != null)
+ {
for (SortMeta current : sortMeta.values())
- {
+ {
Collections.sort(data, new LazySorter(current.getField(), current.getOrder()));
}
}
@@ -102,21 +118,26 @@ public class LazyCarDataModel extends LazyDataModel<Car> {
this.setRowCount(dataSize);
//paginate
- if (dataSize > pageSize) {
- try {
+ if (dataSize > pageSize)
+ {
+ try
+ {
return data.subList(first, first + pageSize);
}
- catch (IndexOutOfBoundsException e) {
+ catch (IndexOutOfBoundsException e)
+ {
return data.subList(first, first + (dataSize % pageSize));
}
}
- else {
+ else
+ {
return data;
}
}
@Override
- public int count(Map<String, FilterMeta> map) {
+ public int count(Map<String, FilterMeta> map)
+ {
return 0;
}
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazySorter.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazySorter.java
index 0338c6339..094200937 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazySorter.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazySorter.java
@@ -19,38 +19,46 @@
package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.util.Comparator;
+
import org.primefaces.model.SortOrder;
-public class LazySorter implements Comparator<Car> {
-
+public class LazySorter implements Comparator<Car>
+{
+
private String sortField;
private SortOrder sortOrder;
-
- public LazySorter(String sortField, SortOrder sortOrder) {
+
+ public LazySorter(String sortField, SortOrder sortOrder)
+ {
this.sortField = sortField;
this.sortOrder = sortOrder;
}
-
+
@Override
- public int compare(Car car1, Car car2) {
- try {
+ public int compare(Car car1, Car car2)
+ {
+ try
+ {
Object value1 = Car.class.getMethod("get" + capitalize(this.sortField)).invoke(car1);
Object value2 = Car.class.getMethod("get" + capitalize(this.sortField)).invoke(car2);
-
+
int value = ((Comparable) value1).compareTo(value2);
-
+
return SortOrder.ASCENDING.equals(sortOrder) ? value : -1 * value;
- }
- catch (Exception e) {
+ }
+ catch (Exception e)
+ {
throw new RuntimeException(e);
}
}
-
- public String capitalize(String value) {
- if (value == null || value.trim().isEmpty()) {
+
+ public String capitalize(String value)
+ {
+ if (value == null || value.trim().isEmpty())
+ {
return null;
}
-
+
return value.substring(0, 1).toUpperCase() + value.substring(1);
}
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java
index d644c1096..0cdc26d9e 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java
@@ -19,6 +19,7 @@
package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.io.Serializable;
+
import jakarta.annotation.PostConstruct;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
@@ -30,7 +31,8 @@ import org.primefaces.model.LazyDataModel;
@Named("dtLazyView")
@ViewScoped
-public class LazyView implements Serializable {
+public class LazyView implements Serializable
+{
private LazyDataModel<Car> lazyModel;
@@ -42,40 +44,49 @@ public class LazyView implements Serializable {
CarService service;
@PostConstruct
- public void init() {
+ public void init()
+ {
lazyModel = new LazyCarDataModel(service.createCars(200));
}
- public LazyDataModel<Car> getLazyModel() {
+ public LazyDataModel<Car> getLazyModel()
+ {
return lazyModel;
}
- public Car getSelectedCar() {
+ public Car getSelectedCar()
+ {
return selectedCar;
}
- public void setSelectedCar(Car selectedCar) {
+ public void setSelectedCar(Car selectedCar)
+ {
this.selectedCar = selectedCar;
}
- public void setService(CarService service) {
+ public void setService(CarService service)
+ {
this.service = service;
}
- public void onRowSelect(SelectEvent event) {
+ public void onRowSelect(SelectEvent event)
+ {
FacesMessage msg = new FacesMessage("Car Selected", ((Car) event.getObject()).getId());
FacesContext.getCurrentInstance().addMessage(null, msg);
}
- public String getInputVal() {
+ public String getInputVal()
+ {
return inputVal;
}
- public void setInputVal(String inputVal) {
+ public void setInputVal(String inputVal)
+ {
this.inputVal = inputVal;
}
- public void saveInput() {
+ public void saveInput()
+ {
System.out.println("Input val is: " + inputVal);
System.out.println("Input val is null?" + (inputVal == null));
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java
index d26642499..67730d13c 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java
@@ -20,6 +20,7 @@ package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.io.Serializable;
import java.util.List;
+
import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.faces.event.PhaseEvent;
@@ -30,59 +31,70 @@ import jakarta.inject.Named;
@Named
@ApplicationScoped
-public class MethodHandleELResolverBean implements Serializable, PhaseListener {
+public class MethodHandleELResolverBean implements Serializable, PhaseListener
+{
@Inject
CarService service;
-
+
private List<Car> cars;
-
+
private int test;
private String test2;
-
+
private long start;
@PostConstruct
- public void init() {
+ public void init()
+ {
cars = service.createCars(20000);
}
- public List<Car> getCars() {
+ public List<Car> getCars()
+ {
return cars;
}
- public void setCars(List<Car> cars) {
+ public void setCars(List<Car> cars)
+ {
this.cars = cars;
}
-
- public int getTest() {
+
+ public int getTest()
+ {
return test;
}
- public void setTest(int test) {
+ public void setTest(int test)
+ {
this.test = test;
}
- public String getTest2() {
+ public String getTest2()
+ {
return test2;
}
- public void setTest2(String test2) {
+ public void setTest2(String test2)
+ {
this.test2 = test2;
}
-
+
@Override
- public void afterPhase(PhaseEvent event) {
+ public void afterPhase(PhaseEvent event)
+ {
System.err.println((System.currentTimeMillis() - start) + "ms");
}
@Override
- public void beforePhase(PhaseEvent event) {
+ public void beforePhase(PhaseEvent event)
+ {
start = System.currentTimeMillis();
}
@Override
- public PhaseId getPhaseId() {
+ public PhaseId getPhaseId()
+ {
return PhaseId.RENDER_RESPONSE;
}
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java
index 7314c9264..d8c43dfcd 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java
@@ -25,13 +25,14 @@ import jakarta.inject.Named;
@Named
@RequestScoped
-public class MyBacking {
-
+public class MyBacking
+{
+
@Inject
CarService carService;
-
+
private MyCollection<Car> cars;
-
+
@PostConstruct
public void init()
{
@@ -42,13 +43,15 @@ public class MyBacking {
}
}
- public MyCollection<Car> getCars() {
+ public MyCollection<Car> getCars()
+ {
return cars;
}
- public void setCars(MyCollection<Car> cars) {
+ public void setCars(MyCollection<Car> cars)
+ {
this.cars = cars;
}
-
-
+
+
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollection.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollection.java
index ad06dddbd..920f07cc3 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollection.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollection.java
@@ -22,5 +22,5 @@ import java.util.ArrayList;
public class MyCollection<T> extends ArrayList<T>
{
-
+
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollectionModel.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollectionModel.java
index c5408dfa8..148d54368 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollectionModel.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyCollectionModel.java
@@ -19,12 +19,14 @@
package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.util.List;
+
import jakarta.faces.model.FacesDataModel;
import jakarta.faces.model.ListDataModel;
@FacesDataModel(forClass = MyCollection.class)
-public class MyCollectionModel<E> extends ListDataModel<E> {
-
+public class MyCollectionModel<E> extends ListDataModel<E>
+{
+
public MyCollectionModel()
{
super();
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverter.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverter.java
index ae6c986f7..9028df029 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverter.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverter.java
@@ -25,15 +25,18 @@ import jakarta.faces.convert.ConverterException;
import jakarta.faces.convert.FacesConverter;
@FacesConverter(managed = false, value = "myConverter")
-public class MyConverter implements Converter<Object>{
+public class MyConverter implements Converter<Object>
+{
@Override
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
}
-
+
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverterManaged.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverterManaged.java
index e3df8f32c..3df70cf3f 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverterManaged.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyConverterManaged.java
@@ -25,15 +25,18 @@ import jakarta.faces.convert.ConverterException;
import jakarta.faces.convert.FacesConverter;
@FacesConverter(managed = true, value = "myConverterManaged")
-public class MyConverterManaged implements Converter<Object>{
+public class MyConverterManaged implements Converter<Object>
+{
@Override
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
}
-
+
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java
index 188f65074..a6cd39757 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java
@@ -26,18 +26,20 @@ import jakarta.faces.validator.ValidatorException;
import jakarta.inject.Inject;
@FacesValidator(value = "myVal", managed = true)
-public class MyValidator implements Validator<String>{
-
+public class MyValidator implements Validator<String>
+{
+
@Inject
CarService carService;
-
+
public MyValidator()
{
}
-
+
@Override
- public void validate(FacesContext context, UIComponent component, String value) throws ValidatorException {
+ public void validate(FacesContext context, UIComponent component, String value) throws ValidatorException
+ {
System.err.println("############### validate: " + value + " (carService=" + carService + ")");
}
-
+
}
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java
index 8e17f45b1..4db92bbd3 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import jakarta.faces.push.Push;
import jakarta.faces.push.PushContext;
import jakarta.faces.view.ViewScoped;
@@ -30,36 +31,42 @@ import jakarta.inject.Named;
@ViewScoped
@Named
-public class SocketView implements Serializable {
-
+public class SocketView implements Serializable
+{
+
private static final Logger LOG = Logger.getLogger(SocketView.class.getName());
-
+
@Inject
@Push
PushContext helloChannel;
-
+
String message;
-
- public void sendMessage() {
+
+ public void sendMessage()
+ {
LOG.log(Level.INFO, "send push message");
this.sendPushMessage("hello");
}
-
- private void sendPushMessage(Object message) {
+
+ private void sendPushMessage(Object message)
+ {
helloChannel.send("" + message + " at " + LocalDateTime.now());
}
-
- public String getMessage() {
+
+ public String getMessage()
+ {
return message;
}
-
- public void setMessage(String message) {
+
+ public void setMessage(String message)
+ {
this.message = message;
}
-
- public void sendMessage2() {
+
+ public void sendMessage2()
+ {
LOG.log(Level.INFO, "send push message from input box::" + this.message);
this.sendPushMessage(this.message);
}
-
+
}
diff --git a/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesNativeIT.java b/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesNativeIT.java
index 4ec83b93e..a18dbd033 100644
--- a/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesNativeIT.java
+++ b/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesNativeIT.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.core.extensions.quarkus.showcase;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
-@NativeImageTest
+@QuarkusIntegrationTest
public class QuarkusMyFacesNativeIT extends QuarkusMyFacesShowcaseTest {
}
diff --git a/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesShowcaseTest.java b/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesShowcaseTest.java
index 5a3e20be7..5e7d6dbbb 100644
--- a/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesShowcaseTest.java
+++ b/extensions/quarkus/showcase/src/test/java/org/apache/myfaces/core/extensions/quarkus/showcase/QuarkusMyFacesShowcaseTest.java
@@ -38,7 +38,8 @@ import java.net.URL;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@QuarkusTest
-public class QuarkusMyFacesShowcaseTest {
+public class QuarkusMyFacesShowcaseTest
+{
@TestHTTPResource
URL url;
@@ -46,7 +47,8 @@ public class QuarkusMyFacesShowcaseTest {
private static WebClient webClient;
@BeforeAll
- public static void initWebClient() {
+ public static void initWebClient()
+ {
webClient = new WebClient(BrowserVersion.CHROME);
webClient.getOptions().setJavaScriptEnabled(true);
webClient.getOptions().setCssEnabled(false);
@@ -57,15 +59,18 @@ public class QuarkusMyFacesShowcaseTest {
}
@AfterAll
- public static void closeWebClient() {
- if (webClient != null) {
+ public static void closeWebClient()
+ {
+ if (webClient != null)
+ {
webClient.close();
}
}
@Test
- public void shouldOpenIndexPage() throws Exception {
+ public void shouldOpenIndexPage() throws Exception
+ {
final HtmlPage page = webClient.getPage(url + "/index.xhtml");
final HtmlDivision datatable = (HtmlDivision) page.getElementById("form:carTable");
assertThat(datatable).isNotNull();
@@ -75,7 +80,8 @@ public class QuarkusMyFacesShowcaseTest {
@Test
@Disabled("Check HtmlUnit websocket support, for now this test is not working")
- public void shouldCallWebSocket() throws IOException {
+ public void shouldCallWebSocket() throws IOException
+ {
HtmlPage page = webClient.getPage(url + "/socket.xhtml");
final HtmlSubmitInput sendMessageBtn = (HtmlSubmitInput) page.getElementById("form:sendMessage");
page = sendMessageBtn.click();
diff --git a/pom.xml b/pom.xml
index afa7a151e..a3395dd02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,8 @@
<configuration>
<excludes>
<exclude>**/*.md</exclude>
+ <exclude>**/*.log*</exclude>
+ <exclude>debug.log</exclude>
<exclude>**/*/MANIFEST.MF</exclude>
<exclude>**/*.iml</exclude>
<exclude>src/main/resources/META-INF/licenses/*-LICENSE.txt</exclude>