Remove java 7 support for StandardCharsets.

Remove org.eclipse.californium.elements.util.StandardCharsets. Signed-off-by: Achim Kraus <[email protected]>
boaks · Nov 7, 2024 · 73aa1f0 · 73aa1f0
1 parent 25ed41e
commit 73aa1f0
Show file tree

Hide file tree

Showing 38 changed files with 42 additions and 76 deletions.
diff --git a/MIGRATION_HINTS_4.md b/MIGRATION_HINTS_4.md
@@ -61,6 +61,8 @@ The http-client 5.4 follows [RFC 7540, 8.1.2.3, Request Pseudo-Header Fields](ht
 
 Removed `StringUtil.toHostString()` (support Java 6). Java 8 is the minimum supported version for runtime, therefore use `InetSocketAddress.getHostString()` directly.
 
+Removed `org.eclipse.californium.elements.util.StandardCharsets`, obsoleted by java 8 `java.nio.charset.StandardCharsets`.
+
 ### Scandium:
 
 The removing of the deprecated function `DTLSConnector.onInitializeHandshaker` showed, that a single custom `SessionListener` is not enough, if a derived class has overridden it. Therefore `DTLSConnector.addSessionListener` has been added.

diff --git a/californium-core/src/main/java/org/eclipse/californium/core/coap/CoAP.java b/californium-core/src/main/java/org/eclipse/californium/core/coap/CoAP.java
@@ -31,10 +31,10 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.californium.elements.util.StandardCharsets;
 
 /**
  * CoAP defines several constants.

diff --git a/...re/src/test/java/org/eclipse/californium/core/server/ServerPersistenceComponentsTest.java b/...re/src/test/java/org/eclipse/californium/core/server/ServerPersistenceComponentsTest.java
@@ -27,6 +27,7 @@
 import java.io.OutputStream;
 import java.net.DatagramPacket;
 import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
@@ -48,7 +49,6 @@
 import org.eclipse.californium.elements.util.EncryptedPersistentComponentUtil;
 import org.eclipse.californium.elements.util.PersistentComponentUtil;
 import org.eclipse.californium.elements.util.SerializationUtil;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.rule.CoapNetworkRule;
 import org.eclipse.californium.rule.CoapThreadsRule;
 import org.junit.ClassRule;

diff --git a/...ium-proxy2/src/main/java/org/eclipse/californium/proxy2/http/CrossProtocolTranslator.java b/...ium-proxy2/src/main/java/org/eclipse/californium/proxy2/http/CrossProtocolTranslator.java
@@ -15,8 +15,8 @@
  ******************************************************************************/
 package org.eclipse.californium.proxy2.http;
 
-import static org.eclipse.californium.elements.util.StandardCharsets.ISO_8859_1;
-import static org.eclipse.californium.elements.util.StandardCharsets.UTF_8;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/...fornium-proxy2/src/main/java/org/eclipse/californium/proxy2/http/Http2CoapTranslator.java b/...fornium-proxy2/src/main/java/org/eclipse/californium/proxy2/http/Http2CoapTranslator.java
@@ -17,6 +17,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Locale;
 
@@ -39,7 +40,6 @@
 import org.eclipse.californium.core.coap.OptionNumberRegistry;
 import org.eclipse.californium.core.coap.Request;
 import org.eclipse.californium.core.coap.Response;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.proxy2.InvalidFieldException;
 import org.eclipse.californium.proxy2.TranslationException;
 import org.slf4j.Logger;

diff --git a/californium-proxy2/src/main/java/org/eclipse/californium/proxy2/http/server/HttpServer.java b/californium-proxy2/src/main/java/org/eclipse/californium/proxy2/http/server/HttpServer.java
@@ -15,7 +15,7 @@
  ******************************************************************************/
 package org.eclipse.californium.proxy2.http.server;
 
-import static org.eclipse.californium.elements.util.StandardCharsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/...ium-proxy2/src/test/java/org/eclipse/californium/proxy2/http/Http2CoapTranslatorTest.java b/...ium-proxy2/src/test/java/org/eclipse/californium/proxy2/http/Http2CoapTranslatorTest.java
@@ -16,8 +16,8 @@
  ******************************************************************************/
 package org.eclipse.californium.proxy2.http;
 
-import static org.eclipse.californium.elements.util.StandardCharsets.ISO_8859_1;
-import static org.eclipse.californium.elements.util.StandardCharsets.UTF_8;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;

diff --git a/...ty-tests/src/test/java/org/eclipse/californium/interoperability/test/CaliforniumUtil.java b/...ty-tests/src/test/java/org/eclipse/californium/interoperability/test/CaliforniumUtil.java
@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -48,7 +49,6 @@
 import org.eclipse.californium.elements.MapBasedEndpointContext;
 import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.elements.exception.ConnectorException;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.dtls.cipher.CipherSuite;
 

diff --git a/...ornium/interoperability/test/openssl/OpenSslClientAuthenticationInteroperabilityTest.java b/...ornium/interoperability/test/openssl/OpenSslClientAuthenticationInteroperabilityTest.java
@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -46,7 +47,6 @@
 import org.eclipse.californium.elements.util.Bytes;
 import org.eclipse.californium.elements.util.JceNames;
 import org.eclipse.californium.elements.util.JceProviderUtil;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.interoperability.test.ConnectorUtil;
 import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult;

diff --git a/...ornium/interoperability/test/openssl/OpenSslServerAuthenticationInteroperabilityTest.java b/...ornium/interoperability/test/openssl/OpenSslServerAuthenticationInteroperabilityTest.java
@@ -36,13 +36,13 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 
 import org.eclipse.californium.elements.auth.RawPublicKeyIdentity;
 import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.elements.rule.TestNameLoggerRule;
 import org.eclipse.californium.elements.util.Bytes;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.interoperability.test.ConnectorUtil;
 import org.eclipse.californium.interoperability.test.ScandiumUtil;

diff --git a/cf-oscore/src/main/java/org/eclipse/californium/cose/Message.java b/cf-oscore/src/main/java/org/eclipse/californium/cose/Message.java
@@ -40,9 +40,10 @@
  ******************************************************************************/
 package org.eclipse.californium.cose;
 
+import java.nio.charset.StandardCharsets;
+
 import com.upokecenter.cbor.CBORObject;
 import com.upokecenter.cbor.CBORType;
-import org.eclipse.californium.elements.util.StandardCharsets;
 
 /**
  * The Message class provides a common class that all of the COSE message classes

diff --git a/...ps/cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/http/HttpService.java b/...ps/cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/http/HttpService.java
@@ -23,6 +23,7 @@
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.Principal;
 import java.security.PrivateKey;
@@ -58,7 +59,6 @@
 import org.eclipse.californium.elements.util.Bytes;
 import org.eclipse.californium.elements.util.SslContextUtil;
 import org.eclipse.californium.elements.util.SslContextUtil.Credentials;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.elements.util.SystemResourceMonitors.SystemResourceMonitor;
 import org.slf4j.Logger;

diff --git a/...-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/CredentialsStore.java b/...-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/CredentialsStore.java
@@ -19,6 +19,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -35,7 +36,6 @@
 import org.eclipse.californium.elements.util.PemReader;
 import org.eclipse.californium.elements.util.SslContextUtil;
 import org.eclipse.californium.elements.util.SslContextUtil.Credentials;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.elements.util.SystemResourceMonitors.FileMonitor;
 import org.eclipse.californium.elements.util.SystemResourceMonitors.SystemResourceCheckReady;

diff --git a/...s/cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/DeviceParser.java b/...s/cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/DeviceParser.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -43,7 +44,6 @@
 import org.eclipse.californium.elements.util.Bytes;
 import org.eclipse.californium.elements.util.DatagramReader;
 import org.eclipse.californium.elements.util.JceProviderUtil;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.scandium.dtls.cipher.RandomManager;
 import org.eclipse.californium.scandium.util.SecretUtil;

diff --git a/...apps/cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/Formatter.java b/...apps/cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/Formatter.java
@@ -14,10 +14,9 @@
  ********************************************************************************/
 package org.eclipse.californium.cloud.util;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import org.eclipse.californium.elements.util.StandardCharsets;
-
 import com.upokecenter.cbor.CBORObject;
 
 /**

diff --git a/.../cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/ResourceStore.java b/.../cf-cloud-demo-server/src/main/java/org/eclipse/californium/cloud/util/ResourceStore.java
@@ -24,6 +24,7 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.concurrent.Semaphore;
 
@@ -34,7 +35,6 @@
 import org.eclipse.californium.cloud.util.ResultConsumer.ResultCode;
 import org.eclipse.californium.elements.util.Bytes;
 import org.eclipse.californium.elements.util.EncryptedStreamUtil;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.elements.util.SystemResourceMonitors.FileMonitor;
 import org.eclipse.californium.elements.util.SystemResourceMonitors.SystemResourceCheckReady;

diff --git a/...-plugtest-server/src/main/java/org/eclipse/californium/plugtests/resources/MyContext.java b/...-plugtest-server/src/main/java/org/eclipse/californium/plugtests/resources/MyContext.java
@@ -24,6 +24,7 @@
 import static org.eclipse.californium.core.coap.MediaTypeRegistry.UNDEFINED;
 
 import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 
 import org.eclipse.californium.core.CoapResource;
@@ -37,7 +38,6 @@
 import org.eclipse.californium.elements.EndpointContext;
 import org.eclipse.californium.elements.TlsEndpointContext;
 import org.eclipse.californium.elements.config.Configuration;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.scandium.config.DtlsConfig;
 

diff --git a/demo-apps/cf-proxy2/src/main/java/org/eclipse/californium/examples/ExampleHttpServer.java b/demo-apps/cf-proxy2/src/main/java/org/eclipse/californium/examples/ExampleHttpServer.java
@@ -16,7 +16,7 @@
 
 package org.eclipse.californium.examples;
 
-import static org.eclipse.californium.elements.util.StandardCharsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...ps/cf-proxy2/src/main/java/org/eclipse/californium/examples/util/CoapResponsePrinter.java b/...ps/cf-proxy2/src/main/java/org/eclipse/californium/examples/util/CoapResponsePrinter.java
@@ -16,7 +16,7 @@
 
 package org.eclipse.californium.examples.util;
 
-import static org.eclipse.californium.elements.util.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
 import java.util.List;
 

diff --git a/...erver/src/main/java/org/eclipse/californium/cloud/s3/http/AuthorizedCoapProxyHandler.java b/...erver/src/main/java/org/eclipse/californium/cloud/s3/http/AuthorizedCoapProxyHandler.java
@@ -18,6 +18,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -37,7 +38,6 @@
 import org.eclipse.californium.core.CoapServer;
 import org.eclipse.californium.core.coap.LinkFormat;
 import org.eclipse.californium.core.server.resources.Resource;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...f-s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/http/Aws4Authorizer.java b/...f-s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/http/Aws4Authorizer.java
@@ -20,6 +20,7 @@
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.Principal;
@@ -48,7 +49,6 @@
 import org.eclipse.californium.elements.util.ClockUtil;
 import org.eclipse.californium.elements.util.LeastRecentlyUpdatedCache;
 import org.eclipse.californium.elements.util.LeastRecentlyUpdatedCache.Timestamped;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.scandium.dtls.cipher.ThreadLocalMac;
 import org.eclipse.californium.scandium.dtls.cipher.ThreadLocalMessageDigest;

diff --git a/...oxy-server/src/main/java/org/eclipse/californium/cloud/s3/http/SinglePageApplication.java b/...oxy-server/src/main/java/org/eclipse/californium/cloud/s3/http/SinglePageApplication.java
@@ -16,14 +16,14 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.californium.cloud.http.HttpService;
 import org.eclipse.californium.cloud.s3.proxy.S3AsyncProxyClient;
 import org.eclipse.californium.cloud.s3.proxy.S3ProxyClient;
 import org.eclipse.californium.cloud.s3.proxy.S3ProxyRequest;
 import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.Request;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...proxy-server/src/main/java/org/eclipse/californium/cloud/s3/proxy/S3AsyncProxyClient.java b/...proxy-server/src/main/java/org/eclipse/californium/cloud/s3/proxy/S3AsyncProxyClient.java
@@ -25,6 +25,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -48,7 +49,6 @@
 import org.eclipse.californium.core.coap.option.StandardOptionRegistry;
 import org.eclipse.californium.elements.util.ClockUtil;
 import org.eclipse.californium.elements.util.LeastRecentlyUpdatedCache;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../cf-s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/proxy/S3Processor.java b/.../cf-s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/proxy/S3Processor.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -47,7 +48,6 @@
 import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.elements.util.CounterStatisticManager;
 import org.eclipse.californium.elements.util.LeastRecentlyUpdatedCache;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...f-s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/resources/S3Devices.java b/...f-s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/resources/S3Devices.java
@@ -32,6 +32,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
@@ -78,7 +79,6 @@
 import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.elements.util.Bytes;
 import org.eclipse.californium.elements.util.LeastRecentlyUpdatedCache;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.proxy2.http.Coap2HttpProxy;
 import org.slf4j.Logger;

diff --git a/...s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/util/WebAppUserParser.java b/...s3-proxy-server/src/main/java/org/eclipse/californium/cloud/s3/util/WebAppUserParser.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,7 +29,6 @@
 import javax.security.auth.DestroyFailedException;
 
 import org.eclipse.californium.cloud.util.ResourceParser;
-import org.eclipse.californium.elements.util.StandardCharsets;
 import org.eclipse.californium.elements.util.StringUtil;
 import org.eclipse.californium.scandium.util.SecretUtil;
 import org.slf4j.Logger;

diff --git a/element-connector/src/main/java/org/eclipse/californium/elements/util/Asn1DerDecoder.java b/element-connector/src/main/java/org/eclipse/californium/elements/util/Asn1DerDecoder.java
@@ -17,6 +17,7 @@
 
 import java.math.BigInteger;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
 import java.security.KeyPairGenerator;

diff --git a/element-connector/src/main/java/org/eclipse/californium/elements/util/SerializationUtil.java b/element-connector/src/main/java/org/eclipse/californium/elements/util/SerializationUtil.java
@@ -21,6 +21,7 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;