Upgrading CXF and OpenSearch

Author: ilgrosso

client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/MIMETypesLoader.java

@@ -27,7 +27,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.wicket.util.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +45,7 @@ public class MIMETypesLoader implements Serializable {
     public void load() {
         mimeTypesMap = new HashMap<>();
         try {
-            JsonNode jsonNode = MAPPER.readTree(IOUtils.toString(getClass().getResourceAsStream("/MIMETypes.json")));
+            JsonNode jsonNode = MAPPER.readTree(getClass().getResourceAsStream("/MIMETypes.json").readAllBytes());
             for (JsonNode node : jsonNode) {
                 JsonNode type = node.path("name");
                 JsonNode ext = node.path("extension");

client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/preview/BinaryTextPreviewer.java

@@ -22,6 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import org.apache.syncope.client.ui.commons.annotations.BinaryPreview;
 import org.apache.syncope.common.rest.api.RESTHeaders;
 import org.apache.wicket.Component;
@@ -31,7 +32,6 @@
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.util.io.IOUtils;
 
 @BinaryPreview(mimeTypes = { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
     RESTHeaders.APPLICATION_YAML, "application/x-yaml", "text/x-yaml", "text/yaml" })
@@ -52,7 +52,9 @@ public Component preview(final byte[] uploadedBytes) {
             try {
                 fragment = new Fragment("preview", "previewFragment", this);
                 InputStream stream = new ByteArrayInputStream(uploadedBytes);
-                TextArea<String> previewer = new TextArea<>("previewer", Model.of(IOUtils.toString(stream)));
+                TextArea<String> previewer = new TextArea<>(
+                        "previewer",
+                        Model.of(new String(stream.readAllBytes(), StandardCharsets.UTF_8)));
                 previewer.setOutputMarkupPlaceholderTag(true);
                 previewerId = previewer.getMarkupId();
                 fragment.add(previewer);

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationModalPanel.java

@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -44,7 +45,6 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.wicket.util.io.IOUtils;
 
 public class ImplementationModalPanel extends AbstractModalPanel<ImplementationTO> {
 
@@ -122,9 +122,9 @@ public ImplementationModalPanel(
             if (templateClassName != null) {
                 try {
                     implementation.setBody(StringUtils.substringAfter(
-                            IOUtils.toString(ImplementationModalPanel.class.getResourceAsStream(
+                            new String(ImplementationModalPanel.class.getResourceAsStream(
                                     "/org/apache/syncope/client/console/implementations/" + templateClassName
-                                    + ".groovy")),
+                                    + ".groovy").readAllBytes(), StandardCharsets.UTF_8),
                             "*/\n"));
                 } catch (IOException e) {
                     LOG.error("Could not load the expected Groovy template {} for {}",

client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java

@@ -18,10 +18,10 @@
  */
 package org.apache.syncope.client.console.rest;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.lib.to.JobTO;
 import org.apache.syncope.common.lib.to.MailTemplateTO;
@@ -92,6 +92,6 @@ public String readTemplateFormat(final String key, final MailTemplateFormat form
 
     public void updateTemplateFormat(final String key, final String content, final MailTemplateFormat format) {
         getService(MailTemplateService.class).setFormat(
-                key, format, IOUtils.toInputStream(content, StandardCharsets.UTF_8));
+                key, format, new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)));
     }
 }

client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java

@@ -18,11 +18,11 @@
  */
 package org.apache.syncope.client.console.rest;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.common.lib.SyncopeClientException;
@@ -76,7 +76,7 @@ public String readAnyLayout(final String role) {
 
     public void setAnyLayout(final String roleKey, final String content) {
         getService(RoleService.class).setAnyLayout(
-                roleKey, IOUtils.toInputStream(content, StandardCharsets.UTF_8));
+                roleKey, new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)));
     }
 
     public void removeAnyLayout(final String roleKey) {

client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchResponse.java

@@ -22,12 +22,9 @@
 import jakarta.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxrs.client.ClientConfiguration;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.transport.http.HTTPConduit;
@@ -80,7 +77,7 @@ public static Response poll(
      * @throws IOException if there are issues when reading the response body
      */
     public static List<BatchResponseItem> getItems(final Response response) throws IOException {
-        String body = IOUtils.toString((InputStream) response.getEntity(), StandardCharsets.UTF_8.name());
+        String body = response.readEntity(String.class);
         LOG.debug("Batch response body:\n{}", body);
 
         return BatchPayloadParser.parse(

common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/model/Domain.java

@@ -23,10 +23,10 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.IOException;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.syncope.common.lib.types.CipherAlgorithm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -80,7 +80,7 @@ public D build() {
     protected static String read(final String filename) {
         String read = null;
         try {
-            read = IOUtils.toString(Domain.class.getResourceAsStream('/' + filename));
+            read = new String(Domain.class.getResourceAsStream('/' + filename).readAllBytes(), StandardCharsets.UTF_8);
         } catch (IOException e) {
             LOG.error("Could not read {}", filename, e);
         }

core/idrepo/rest-cxf/src/test/java/org/apache/syncope/core/rest/cxf/service/AnyObjectServiceTest.java

@@ -42,7 +42,6 @@
 import java.util.List;
 import java.util.UUID;
 import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.ext.MessageContext;
@@ -237,7 +236,7 @@ public void jsonList() throws IOException {
         InputStream in = list(MediaType.APPLICATION_JSON_TYPE);
 
         PagedResult<AnyObjectTO> list = new SyncopeJsonMapper().
-                readValue(IOUtils.toString(in), new TypeReference<>() {
+                readValue(in.readAllBytes(), new TypeReference<>() {
                 });
         checkList(list);
     }
@@ -247,7 +246,7 @@ public void xmlList() throws IOException {
         InputStream in = list(MediaType.APPLICATION_XML_TYPE);
 
         PagedResult<AnyObjectTO> list = new SyncopeXmlMapper().
-                readValue(IOUtils.toString(in), new TypeReference<>() {
+                readValue(in.readAllBytes(), new TypeReference<>() {
                 });
         checkList(list);
     }
@@ -257,7 +256,7 @@ public void yamlList() throws IOException {
         InputStream in = list(RESTHeaders.APPLICATION_YAML_TYPE);
 
         PagedResult<AnyObjectTO> list = new SyncopeYAMLMapper().
-                readValue(IOUtils.toString(in), new TypeReference<>() {
+                readValue(in.readAllBytes(), new TypeReference<>() {
                 });
         checkList(list);
     }

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/StartupDomainLoader.java

@@ -19,9 +19,9 @@
 package org.apache.syncope.core.persistence.jpa;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.model.Domain;
 import org.apache.syncope.common.keymaster.client.api.model.JPADomain;
@@ -97,15 +97,15 @@ public void load() {
                         poolMinIdle(domainProps.getPoolMinIdle());
 
                 try {
-                    builder.content(IOUtils.toString(
-                            resourceLoader.getResource(domainProps.getContent()).getInputStream()));
+                    builder.content(new String(resourceLoader.getResource(domainProps.getContent()).
+                            getInputStream().readAllBytes(), StandardCharsets.UTF_8));
                 } catch (IOException e) {
                     LOG.error("While loading {}", domainProps.getContent(), e);
                 }
 
                 try {
-                    builder.keymasterConfParams(IOUtils.toString(
-                            resourceLoader.getResource(domainProps.getKeymasterConfParams()).getInputStream()));
+                    builder.keymasterConfParams(new String(resourceLoader.getResource(domainProps.
+                            getKeymasterConfParams()).getInputStream().readAllBytes(), StandardCharsets.UTF_8));
                 } catch (IOException e) {
                     LOG.error("While loading {}", domainProps.getKeymasterConfParams(), e);
                 }

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentExporter.java

@@ -63,7 +63,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.openjpa.lib.util.collections.BidiMap;
 import org.apache.openjpa.lib.util.collections.DualHashBidiMap;
 import org.apache.syncope.common.lib.SyncopeConstants;
@@ -108,14 +107,14 @@ protected static String getValues(final ResultSet rs, final String columnName, f
                 case Types.LONGVARBINARY:
                     InputStream is = rs.getBinaryStream(columnName);
                     if (is != null) {
-                        value = DatatypeConverter.printHexBinary(IOUtils.toString(is).getBytes());
+                        value = DatatypeConverter.printHexBinary(is.readAllBytes());
                     }
                     break;
 
                 case Types.BLOB:
                     Blob blob = rs.getBlob(columnName);
                     if (blob != null) {
-                        value = DatatypeConverter.printHexBinary(IOUtils.toString(blob.getBinaryStream()).getBytes());
+                        value = DatatypeConverter.printHexBinary(blob.getBinaryStream().readAllBytes());
                     }
                     break;