This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 3a2423825e [SYNCOPE-1869] Introducing ClientApp#evaluationOrder (#1028)
3a2423825e is described below
commit 3a2423825e352c2dd9d2a83a3a018dacb08dc0bc
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Mar 18 12:57:54 2025 +0100
[SYNCOPE-1869] Introducing ClientApp#evaluationOrder (#1028)
---
.../client/console/clientapps/ClientAppDirectoryPanel.java | 2 ++
.../console/clientapps/ClientAppModalPanelBuilder.java | 4 ++++
.../console/clientapps/ClientAppDirectoryPanel.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_fr_CA.properties | 1 +
.../console/clientapps/ClientAppDirectoryPanel_it.properties | 1 +
.../console/clientapps/ClientAppDirectoryPanel_ja.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_pt_BR.properties | 1 +
.../console/clientapps/ClientAppDirectoryPanel_ru.properties | 1 +
.../java/org/apache/syncope/common/lib/to/ClientAppTO.java | 12 ++++++++++++
.../syncope/core/persistence/api/entity/am/ClientApp.java | 4 ++++
.../core/persistence/jpa/entity/am/AbstractClientApp.java | 12 ++++++++++++
.../core/provisioning/java/data/ClientAppDataBinderImpl.java | 2 ++
.../syncope/wa/starter/mapping/AbstractClientAppMapper.java | 1 +
13 files changed, 43 insertions(+)
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
index 0b3e90eae1..b0364d7b4f 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
@@ -135,6 +135,8 @@ public abstract class ClientAppDirectoryPanel<T extends
ClientAppTO>
Constants.NAME_FIELD_NAME, Constants.NAME_FIELD_NAME));
columns.add(new PropertyColumn<>(
new StringResourceModel("clientAppId", this), "clientAppId",
"clientAppId"));
+ columns.add(new PropertyColumn<>(
+ new StringResourceModel("evaluationOrder", this),
"evaluationOrder", "evaluationOrder"));
addCustomColumnFields(columns);
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
index 85950b2392..09c2ab81ac 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
@@ -213,6 +213,10 @@ public class ClientAppModalPanelBuilder<T extends
ClientAppTO> extends AbstractM
"field", "clientAppId", Long.class,
new PropertyModel<>(clientAppTO,
"clientAppId")).setRequired(true));
+ fields.add(new AjaxNumberFieldPanel.Builder<Integer>().build(
+ "field", "evaluationOrder", Integer.class,
+ new PropertyModel<>(clientAppTO,
"evaluationOrder")).setRequired(true));
+
fields.add(new AjaxTextFieldPanel(
"field", Constants.DESCRIPTION_FIELD_NAME,
new PropertyModel<>(clientAppTO,
Constants.DESCRIPTION_FIELD_NAME), false));
diff --git
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
index 14d8af8023..229c25a262 100644
---
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
+++
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
@@ -80,3 +80,4 @@ applicationType=Application Type
userInfoSigningAlg=UserInfo Signing Algorithm
userInfoEncryptedResponseAlg=UserInfo Encrypted Response Algorithm
userInfoEncryptedResponseEncoding=UserInfo Encrypted Response Encoding
+evaluationOrder=Evaluation Order
diff --git
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
index 07742eb2a4..b8f5fc8798 100644
---
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
+++
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
@@ -80,3 +80,4 @@ applicationType=Application Type
userInfoSigningAlg=UserInfo Signing Algorithm
userInfoEncryptedResponseAlg=UserInfo Encrypted Response Algorithm
userInfoEncryptedResponseEncoding=UserInfo Encrypted Response Encoding
+evaluationOrder=Evaluation Order
diff --git
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
index 7a6e813c79..90bfaf968a 100644
---
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
+++
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
@@ -80,3 +80,4 @@ applicationType=Tipo applicazione
userInfoSigningAlg=Algoritmo di firma UserInfo
userInfoEncryptedResponseAlg=Algoritmo di cifratura risposta UserInfo
userInfoEncryptedResponseEncoding=Codifica di cifratura risposta UserInfo
+evaluationOrder=Ordine di valutazione
diff --git
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
index 4026612504..428c4dce87 100644
---
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
+++
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
@@ -80,3 +80,4 @@ applicationType=Application Type
userInfoSigningAlg=UserInfo Signing Algorithm
userInfoEncryptedResponseAlg=UserInfo Encrypted Response Algorithm
userInfoEncryptedResponseEncoding=UserInfo Encrypted Response Encoding
+evaluationOrder=Evaluation Order
diff --git
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
index f8ea1d3017..5438363123 100644
---
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
+++
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
@@ -80,3 +80,4 @@ applicationType=Application Type
userInfoSigningAlg=UserInfo Signing Algorithm
userInfoEncryptedResponseAlg=UserInfo Encrypted Response Algorithm
userInfoEncryptedResponseEncoding=UserInfo Encrypted Response Encoding
+evaluationOrder=Evaluation Order
diff --git
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
index f2a04216c2..09307c8825 100644
---
a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
+++
b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
@@ -81,3 +81,4 @@ applicationType=Application Type
userInfoSigningAlg=UserInfo Signing Algorithm
userInfoEncryptedResponseAlg=UserInfo Encrypted Response Algorithm
userInfoEncryptedResponseEncoding=UserInfo Encrypted Response Encoding
+evaluationOrder=Evaluation Order
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
index af36cba358..3bc03d9df4 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
@@ -53,6 +53,8 @@ public abstract class ClientAppTO implements NamedEntityTO {
private Long clientAppId;
+ private int evaluationOrder;
+
private String description;
private String logo;
@@ -121,6 +123,14 @@ public abstract class ClientAppTO implements NamedEntityTO
{
this.clientAppId = clientAppId;
}
+ public int getEvaluationOrder() {
+ return evaluationOrder;
+ }
+
+ public void setEvaluationOrder(final int evaluationOrder) {
+ this.evaluationOrder = evaluationOrder;
+ }
+
public String getDescription() {
return description;
}
@@ -222,6 +232,7 @@ public abstract class ClientAppTO implements NamedEntityTO {
.append(key)
.append(realm)
.append(clientAppId)
+ .append(evaluationOrder)
.append(name)
.append(description)
.append(logo)
@@ -255,6 +266,7 @@ public abstract class ClientAppTO implements NamedEntityTO {
.append(this.key, rhs.key)
.append(this.realm, rhs.realm)
.append(this.clientAppId, rhs.clientAppId)
+ .append(this.evaluationOrder, rhs.evaluationOrder)
.append(this.name, rhs.name)
.append(this.description, rhs.description)
.append(this.logo, rhs.logo)
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java
index 6175f2cc0c..ec8e8ba478 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java
@@ -39,6 +39,10 @@ public interface ClientApp extends Entity {
void setClientAppId(Long clientAppId);
+ int getEvaluationOrder();
+
+ void setEvaluationOrder(int evaluationOrder);
+
String getDescription();
void setDescription(String description);
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java
index 03943b043e..24211e17fa 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java
@@ -60,6 +60,8 @@ public class AbstractClientApp extends
AbstractGeneratedKeyEntity implements Cli
@Column(unique = true, nullable = false)
private Long clientAppId;
+ private int evaluationOrder;
+
private String description;
private String logo;
@@ -104,6 +106,16 @@ public class AbstractClientApp extends
AbstractGeneratedKeyEntity implements Cli
this.clientAppId = clientAppId;
}
+ @Override
+ public int getEvaluationOrder() {
+ return evaluationOrder;
+ }
+
+ @Override
+ public void setEvaluationOrder(final int evaluationOrder) {
+ this.evaluationOrder = evaluationOrder;
+ }
+
@Override
public String getName() {
return name;
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
index c367c66c63..a1de8481f6 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
@@ -158,6 +158,7 @@ public class ClientAppDataBinderImpl implements
ClientAppDataBinder {
clientAppTO.setRealm(Optional.ofNullable(clientApp.getRealm()).map(Realm::getFullPath).orElse(null));
clientAppTO.setName(clientApp.getName());
clientAppTO.setClientAppId(clientApp.getClientAppId());
+ clientAppTO.setEvaluationOrder(clientApp.getEvaluationOrder());
clientAppTO.setDescription(clientApp.getDescription());
clientAppTO.setLogo(clientApp.getLogo());
clientAppTO.setTheme(clientApp.getTheme());
@@ -308,6 +309,7 @@ public class ClientAppDataBinderImpl implements
ClientAppDataBinder {
clientApp.setName(clientAppTO.getName());
clientApp.setClientAppId(clientAppTO.getClientAppId());
+ clientApp.setEvaluationOrder(clientAppTO.getEvaluationOrder());
clientApp.setDescription(clientAppTO.getDescription());
clientApp.setLogo(clientAppTO.getLogo());
clientApp.setTheme(clientAppTO.getTheme());
diff --git
a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java
b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java
index 641273b61f..4f47794716 100644
---
a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java
+++
b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java
@@ -41,6 +41,7 @@ abstract class AbstractClientAppMapper implements
ClientAppMapper {
protected void setCommon(final BaseWebBasedRegisteredService service,
final ClientAppTO clientApp) {
service.setId(clientApp.getClientAppId());
+ service.setEvaluationOrder(clientApp.getEvaluationOrder());
service.setName(clientApp.getName());
service.setDescription(clientApp.getDescription());
service.setLogo(clientApp.getLogo());
