This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 2bdf899eae Upgrading Tika
2bdf899eae is described below
commit 2bdf899eae654c9b9c8d28925dde9eaf51e20529
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Sat Aug 22 08:35:43 2026 +0200
Upgrading Tika
---
.../apache/syncope/common/lib/EntityTOUtils.java | 1 -
.../apache/syncope/common/lib/request/AnyCR.java | 2 ++
.../apache/syncope/common/lib/request/AnyUR.java | 2 ++
.../org/apache/syncope/common/lib/to/AnyTO.java | 2 ++
.../syncope/common/lib/SerializationTest.java | 31 ++++++++++++++++++++++
.../core/provisioning/java/data/AnyDataBinder.java | 1 -
pom.xml | 4 +--
7 files changed, 39 insertions(+), 4 deletions(-)
diff --git
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/EntityTOUtils.java
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/EntityTOUtils.java
index b810721a2c..ef42fc15e1 100644
---
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/EntityTOUtils.java
+++
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/EntityTOUtils.java
@@ -106,7 +106,6 @@ public final class EntityTOUtils {
userTO.getMemberships().addAll(userCR.getMemberships());
userTO.getRoles().addAll(userCR.getRoles());
} else if (anyTO instanceof final GroupTO groupTO && anyCR instanceof
final GroupCR groupCR) {
-
groupTO.setName(groupCR.getName());
groupTO.getTypeExtensions().addAll(groupCR.getTypeExtensions());
} else if (anyTO instanceof final AnyObjectTO anyObjectTO && anyCR
instanceof final AnyObjectCR anyObjectCR) {
diff --git
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyCR.java
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyCR.java
index a21bab0a96..b081ee701b 100644
---
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyCR.java
+++
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyCR.java
@@ -155,8 +155,10 @@ public abstract class AnyCR implements BaseBean,
RealmMember, RelatableTO {
private String realm;
+ @JsonProperty
private String uManager;
+ @JsonProperty
private String gManager;
private final Set<String> auxClasses = new HashSet<>();
diff --git
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyUR.java
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyUR.java
index 7b29a19578..fe79500c86 100644
---
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyUR.java
+++
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/request/AnyUR.java
@@ -158,8 +158,10 @@ public abstract class AnyUR implements BaseBean {
private StringReplacePatchItem realm;
+ @JsonProperty
private StringReplacePatchItem uManager;
+ @JsonProperty
private StringReplacePatchItem gManager;
private final Set<StringPatchItem> auxClasses = new HashSet<>();
diff --git
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
index 8d8853b3c5..30f84e736e 100644
---
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
+++
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
@@ -75,8 +75,10 @@ public abstract class AnyTO implements EntityTO,
RealmMember, RelatableTO {
private String realm;
+ @JsonProperty
private String uManager;
+ @JsonProperty
private String gManager;
private String status;
diff --git
a/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/SerializationTest.java
b/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/SerializationTest.java
index 0716e8be9f..7019ddb067 100644
---
a/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/SerializationTest.java
+++
b/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/SerializationTest.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.UUID;
import org.apache.syncope.common.lib.jackson.SyncopeJsonMapper;
import org.apache.syncope.common.lib.request.AnyObjectCR;
+import org.apache.syncope.common.lib.request.GroupCR;
import org.apache.syncope.common.lib.request.GroupUR;
import org.apache.syncope.common.lib.request.PasswordPatch;
import org.apache.syncope.common.lib.request.StringPatchItem;
@@ -148,4 +149,34 @@ public class SerializationTest {
});
assertEquals(original, actual);
}
+
+ @Test
+ public void manager() {
+ GroupCR originalCR = new GroupCR();
+ originalCR.setgManager("manager");
+
+ StringWriter writer = new StringWriter();
+ MAPPER.writeValue(writer, originalCR);
+
+ GroupCR actualCR = MAPPER.readValue(writer.toString(), GroupCR.class);
+ assertEquals(originalCR, actualCR);
+
+ GroupUR original = new GroupUR();
+ original.setgManager(new
StringReplacePatchItem.Builder().value("manager").build());
+
+ writer = new StringWriter();
+ MAPPER.writeValue(writer, original);
+
+ GroupUR actualUR = MAPPER.readValue(writer.toString(), GroupUR.class);
+ assertEquals(original, actualUR);
+
+ GroupTO originalTO = new GroupTO();
+ originalTO.setgManager("manager");
+
+ writer = new StringWriter();
+ MAPPER.writeValue(writer, originalTO);
+
+ GroupTO actualTO = MAPPER.readValue(writer.toString(), GroupTO.class);
+ assertEquals(originalTO, actualTO);
+ }
}
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyDataBinder.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyDataBinder.java
index 7ae3ba0d17..719aac7d59 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyDataBinder.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyDataBinder.java
@@ -647,7 +647,6 @@ abstract class AnyDataBinder extends AttributableDataBinder
{
final SyncopeClientCompositeException scce) {
// 0. manager
- // owner
if (anyCR.getuManager() != null) {
userDAO.findById(anyCR.getuManager()).ifPresentOrElse(any::setuManager,
() -> LOG.warn("Ignoring invalid user specified as
manager: {}", anyCR.getuManager()));
diff --git a/pom.xml b/pom.xml
index 3c6e3e7a5a..5254cc3dc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -945,7 +945,7 @@ under the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>4.0.0-beta-1</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
@@ -2188,7 +2188,7 @@ under the License.
<link>https://nightlies.apache.org/wicket/apidocs/10.x/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
<link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
- <link>https://tika.apache.org/4.0.0-beta-1/api/</link>
+ <link>https://tika.apache.org/4.0.0/api/</link>
<link>https://docs.hibernate.org/orm/7.3/javadocs/</link>
<link>https://docs.spring.io/spring-boot/4.0/api/java/</link>
<link>https://docs.spring.io/spring-framework/docs/7.0.x/javadoc-api/</link>
