Use StandardCharsets.UTF_8 instead of String based UTF-8 for getting …

…String bytes
filiphr · Nov 30, 2023 · eecd492 · eecd492
1 parent cd50dac
commit eecd492
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 122 deletions.
diff --git a/...in/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java b/...in/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java
@@ -15,8 +15,8 @@
 import static org.flowable.common.rest.api.PaginateListUtil.paginateList;
 
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -242,11 +242,7 @@ public Map<String, String> splitQueryString(String queryString) {
 
     protected String decode(String string) {
         if (string != null) {
-            try {
-                return URLDecoder.decode(string, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new IllegalStateException("JVM does not support UTF-8 encoding.", uee);
-            }
+            return URLDecoder.decode(string, StandardCharsets.UTF_8);
         }
         return null;
     }

diff --git a/...e-app-engine-rest/src/test/java/org/flowable/app/rest/service/BaseSpringRestTestCase.java b/...e-app-engine-rest/src/test/java/org/flowable/app/rest/service/BaseSpringRestTestCase.java
@@ -16,7 +16,6 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
@@ -301,11 +300,7 @@ protected void closeHttpConnections() {
 
     protected String encode(String string) {
         if (string != null) {
-            try {
-                return URLEncoder.encode(string, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new IllegalStateException("JVM does not support UTF-8 encoding.", uee);
-            }
+            return URLEncoder.encode(string, StandardCharsets.UTF_8);
         }
         return null;
     }

diff --git a/...ngine/src/main/java/org/flowable/app/engine/impl/repository/AppDeploymentBuilderImpl.java b/...ngine/src/main/java/org/flowable/app/engine/impl/repository/AppDeploymentBuilderImpl.java
@@ -14,7 +14,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -31,8 +31,6 @@
 
 public class AppDeploymentBuilderImpl implements AppDeploymentBuilder {
 
-    protected static final String DEFAULT_ENCODING = "UTF-8";
-
     protected transient AppRepositoryServiceImpl repositoryService;
     protected transient AppResourceEntityManager resourceEntityManager;
 
@@ -93,11 +91,7 @@ public AppDeploymentBuilder addString(String resourceName, String text) {
 
         AppResourceEntity resource = resourceEntityManager.create();
         resource.setName(resourceName);
-        try {
-            resource.setBytes(text.getBytes(DEFAULT_ENCODING));
-        } catch (UnsupportedEncodingException e) {
-            throw new FlowableException("Unable to get bytes.", e);
-        }
+        resource.setBytes(text.getBytes(StandardCharsets.UTF_8));
         deployment.addResource(resource);
         return this;
     }

diff --git a/...ine/src/main/java/org/flowable/cmmn/engine/impl/repository/CmmnDeploymentBuilderImpl.java b/...ine/src/main/java/org/flowable/cmmn/engine/impl/repository/CmmnDeploymentBuilderImpl.java
@@ -14,7 +14,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -32,8 +32,6 @@
 
 public class CmmnDeploymentBuilderImpl implements CmmnDeploymentBuilder {
 
-    protected static final String DEFAULT_ENCODING = "UTF-8";
-
     protected transient CmmnRepositoryServiceImpl repositoryService;
     protected transient CmmnResourceEntityManager resourceEntityManager;
 
@@ -93,11 +91,7 @@ public CmmnDeploymentBuilder addString(String resourceName, String text) {
 
         CmmnResourceEntity resource = resourceEntityManager.create();
         resource.setName(resourceName);
-        try {
-            resource.setBytes(text.getBytes(DEFAULT_ENCODING));
-        } catch (UnsupportedEncodingException e) {
-            throw new FlowableException("Unable to get bytes.", e);
-        }
+        resource.setBytes(text.getBytes(StandardCharsets.UTF_8));
         deployment.addResource(resource);
         return this;
     }

diff --git a/...main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentCollectionResource.java b/...main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentCollectionResource.java
@@ -16,8 +16,8 @@
 import static org.flowable.common.rest.api.PaginateListUtil.paginateList;
 
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -257,11 +257,7 @@ public Map<String, String> splitQueryString(String queryString) {
 
     protected String decode(String string) {
         if (string != null) {
-            try {
-                return URLDecoder.decode(string, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new IllegalStateException("JVM does not support UTF-8 encoding.", uee);
-            }
+            return URLDecoder.decode(string, StandardCharsets.UTF_8);
         }
         return null;
     }

diff --git a/...owable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java b/...owable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java
@@ -16,7 +16,6 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
@@ -337,11 +336,7 @@ protected void closeHttpConnections() {
 
     protected String encode(String string) {
         if (string != null) {
-            try {
-                return URLEncoder.encode(string, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new IllegalStateException("JVM does not support UTF-8 encoding.", uee);
-            }
+            return URLEncoder.encode(string, StandardCharsets.UTF_8);
         }
         return null;
     }

diff --git a/...ngine/src/main/java/org/flowable/dmn/engine/impl/repository/DmnDeploymentBuilderImpl.java b/...ngine/src/main/java/org/flowable/dmn/engine/impl/repository/DmnDeploymentBuilderImpl.java
@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.IOUtils;
@@ -37,7 +36,6 @@
 public class DmnDeploymentBuilderImpl implements DmnDeploymentBuilder, Serializable {
 
     private static final long serialVersionUID = 1L;
-    protected static final String DEFAULT_ENCODING = "UTF-8";
 
     protected transient DmnRepositoryServiceImpl repositoryService;
     protected transient DmnResourceEntityManager resourceEntityManager;
@@ -98,11 +96,7 @@ public DmnDeploymentBuilder addString(String resourceName, String text) {
 
         DmnResourceEntity resource = resourceEntityManager.create();
         resource.setName(resourceName);
-        try {
-            resource.setBytes(text.getBytes(DEFAULT_ENCODING));
-        } catch (UnsupportedEncodingException e) {
-            throw new FlowableException("Unable to get decision table bytes.", e);
-        }
+        resource.setBytes(text.getBytes(StandardCharsets.UTF_8));
         deployment.addResource(resource);
         return this;
     }

diff --git a/...e-dmn-rest/src/test/java/org/flowable/dmn/rest/service/api/BaseSpringDmnRestTestCase.java b/...e-dmn-rest/src/test/java/org/flowable/dmn/rest/service/api/BaseSpringDmnRestTestCase.java
@@ -15,7 +15,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -223,11 +222,7 @@ protected void closeHttpConnections() {
 
     protected String encode(String string) {
         if (string != null) {
-            try {
-                return URLEncoder.encode(string, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new IllegalStateException("JVM does not support UTF-8 encoding.", uee);
-            }
+            return URLEncoder.encode(string, StandardCharsets.UTF_8);
         }
         return null;
     }

diff --git a/...gine-common/src/main/java/org/flowable/common/engine/impl/util/io/StringStreamSource.java b/...gine-common/src/main/java/org/flowable/common/engine/impl/util/io/StringStreamSource.java
@@ -14,34 +14,34 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.flowable.common.engine.api.FlowableException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 /**
  * @author Tom Baeyens
  */
 public class StringStreamSource implements StreamSource {
 
-    String string;
-    String byteArrayEncoding = "utf-8";
+    protected final String string;
+    protected final Charset byteArrayEncoding;
 
     public StringStreamSource(String string) {
-        this.string = string;
+        this(string, StandardCharsets.UTF_8);
     }
 
     public StringStreamSource(String string, String byteArrayEncoding) {
+        this.string = string;
+        this.byteArrayEncoding = Charset.forName(byteArrayEncoding);
+    }
+
+    public StringStreamSource(String string, Charset byteArrayEncoding) {
         this.string = string;
         this.byteArrayEncoding = byteArrayEncoding;
     }
 
     @Override
     public InputStream getInputStream() {
-        try {
-            return new ByteArrayInputStream(byteArrayEncoding == null ? string.getBytes() : string.getBytes(byteArrayEncoding));
-        } catch (UnsupportedEncodingException e) {
-            throw new FlowableException("Unsupported encoding for string", e);
-        }
+        return new ByteArrayInputStream(byteArrayEncoding == null ? string.getBytes() : string.getBytes(byteArrayEncoding));
     }
 
     @Override

diff --git a/...wable-engine/src/main/java/org/flowable/engine/impl/repository/DeploymentBuilderImpl.java b/...wable-engine/src/main/java/org/flowable/engine/impl/repository/DeploymentBuilderImpl.java
@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.HashMap;
@@ -44,7 +43,6 @@
 public class DeploymentBuilderImpl implements DeploymentBuilder, Serializable {
 
     private static final long serialVersionUID = 1L;
-    protected static final String DEFAULT_ENCODING = "UTF-8";
 
     protected transient RepositoryServiceImpl repositoryService;
     protected transient ResourceEntityManager resourceEntityManager;
@@ -96,11 +94,7 @@ public DeploymentBuilder addString(String resourceName, String text) {
         }
         ResourceEntity resource = resourceEntityManager.create();
         resource.setName(resourceName);
-        try {
-            resource.setBytes(text.getBytes(DEFAULT_ENCODING));
-        } catch (UnsupportedEncodingException e) {
-            throw new FlowableException("Unable to get process bytes.", e);
-        }
+        resource.setBytes(text.getBytes(StandardCharsets.UTF_8));
         deployment.addResource(resource);
         return this;
     }

diff --git a/...e-engine/src/test/java/org/flowable/engine/test/bpmn/deployment/ParsedDeploymentTest.java b/...e-engine/src/test/java/org/flowable/engine/test/bpmn/deployment/ParsedDeploymentTest.java
@@ -15,7 +15,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
@@ -72,7 +71,7 @@ public void tearDown() {
     }
 
     @Test
-    public void testCreateAndQuery() throws UnsupportedEncodingException {
+    public void testCreateAndQuery() {
         DeploymentEntity entity = assembleUnpersistedDeploymentEntity();
 
         ParsedDeploymentBuilderFactory builderFactory = processEngineConfiguration.getParsedDeploymentBuilderFactory();
@@ -111,14 +110,14 @@ private ProcessDefinitionEntity getProcessDefinitionEntityFromList(List<ProcessD
         return null;
     }
 
-    private DeploymentEntity assembleUnpersistedDeploymentEntity() throws UnsupportedEncodingException {
+    private DeploymentEntity assembleUnpersistedDeploymentEntity() {
         DeploymentEntity entity = new DeploymentEntityImpl();
         entity.addResource(buildResource(IDR_XML_NAME, IDR_PROCESS_XML));
         entity.addResource(buildResource(EN_XML_NAME, EN_PROCESS_XML));
         return entity;
     }
 
-    private ResourceEntity buildResource(String name, String text) throws UnsupportedEncodingException {
+    private ResourceEntity buildResource(String name, String text) {
         ResourceEntityImpl result = new ResourceEntityImpl();
         result.setName(name);
         result.setBytes(text.getBytes(StandardCharsets.UTF_8));

diff --git a/...-engine/src/test/java/org/flowable/standalone/validation/DefaultProcessValidatorTest.java b/...-engine/src/test/java/org/flowable/standalone/validation/DefaultProcessValidatorTest.java
@@ -18,7 +18,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -260,7 +259,7 @@ public void verifyValidation() throws Exception {
     }
 
     @Test
-    public void testWarningError() throws UnsupportedEncodingException, XMLStreamException {
+    public void testWarningError() throws XMLStreamException {
         String flowWithoutConditionNoDefaultFlow = "<?xml version='1.0' encoding='UTF-8'?>"
                 + "<definitions id='definitions' xmlns='http://www.omg.org/spec/BPMN/20100524/MODEL' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:activiti='http://activiti.org/bpmn' targetNamespace='Examples'>"
                 + "  <process id='exclusiveGwDefaultSequenceFlow'> " + "    <startEvent id='theStart' /> "

diff --git a/.../org/flowable/eventregistry/rest/service/api/repository/DeploymentCollectionResource.java b/.../org/flowable/eventregistry/rest/service/api/repository/DeploymentCollectionResource.java
@@ -16,8 +16,8 @@
 import static org.flowable.common.rest.api.PaginateListUtil.paginateList;
 
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -246,11 +246,7 @@ public Map<String, String> splitQueryString(String queryString) {
 
     protected String decode(String string) {
         if (string != null) {
-            try {
-                return URLDecoder.decode(string, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new IllegalStateException("JVM does not support UTF-8 encoding.", uee);
-            }
+            return URLDecoder.decode(string, StandardCharsets.UTF_8);
         }
         return null;
     }

diff --git a/...ry-rest/src/test/java/org/flowable/eventregistry/rest/service/BaseSpringRestTestCase.java b/...ry-rest/src/test/java/org/flowable/eventregistry/rest/service/BaseSpringRestTestCase.java
@@ -16,7 +16,6 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
@@ -343,11 +342,7 @@ protected void closeHttpConnections() {
 
     protected String encode(String string) {
         if (string != null) {
-            try {
-                return URLEncoder.encode(string, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new IllegalStateException("JVM does not support UTF-8 encoding.", uee);
-            }
+            return URLEncoder.encode(string, StandardCharsets.UTF_8);
         }
         return null;
     }

diff --git a/.../src/main/java/org/flowable/eventregistry/impl/repository/EventDeploymentBuilderImpl.java b/.../src/main/java/org/flowable/eventregistry/impl/repository/EventDeploymentBuilderImpl.java
@@ -15,7 +15,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.IOUtils;
 import org.flowable.common.engine.api.FlowableException;
@@ -34,7 +34,6 @@
 public class EventDeploymentBuilderImpl implements EventDeploymentBuilder, Serializable {
 
     private static final long serialVersionUID = 1L;
-    protected static final String DEFAULT_ENCODING = "UTF-8";
 
     protected transient EventRepositoryServiceImpl repositoryService;
     protected transient EventResourceEntityManager resourceEntityManager;
@@ -94,11 +93,7 @@ public EventDeploymentBuilder addString(String resourceName, String text) {
 
         EventResourceEntity resource = resourceEntityManager.create();
         resource.setName(resourceName);
-        try {
-            resource.setBytes(text.getBytes(DEFAULT_ENCODING));
-        } catch (UnsupportedEncodingException e) {
-            throw new FlowableException("Unable to get event definition bytes.", e);
-        }
+        resource.setBytes(text.getBytes(StandardCharsets.UTF_8));
         deployment.addResource(resource);
         return this;
     }