Author: remm
Date: Tue Oct 30 09:32:10 2018
New Revision: 1845207
URL: http://svn.apache.org/viewvc?rev=1845207&view=rev
Log:
Remove StringUtils use.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
tomcat/trunk/res/checkstyle/org-import-control.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java?rev=1845207&r1=1845206&r2=1845207&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
Tue Oct 30 09:32:10 2018
@@ -36,7 +36,6 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.codec.binary.StringUtils;
import org.apache.tomcat.util.json.JSONParser;
@@ -82,7 +81,7 @@ public class KubernetesMembershipProvide
saTokenFile =
"/var/run/secrets/kubernetes.io/serviceaccount/token";
}
byte[] bytes =
Files.readAllBytes(FileSystems.getDefault().getPath(saTokenFile));
- streamProvider = new
TokenStreamProvider(StringUtils.newStringUsAscii(bytes), caCertFile);
+ streamProvider = new TokenStreamProvider(new String(bytes,
StandardCharsets.US_ASCII), caCertFile);
} else {
if (protocol == null) {
protocol = "http";
Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1845207&r1=1845206&r2=1845207&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Tue Oct 30 09:32:10 2018
@@ -83,7 +83,6 @@
<allow pkg="org.apache.catalina.tribes"/>
<subpackage name="membership">
<subpackage name="cloud">
- <allow class="org.apache.tomcat.util.codec.binary.StringUtils"/>
<allow class="org.apache.tomcat.util.net.jsse.PEMFile"/>
<allow class="org.apache.tomcat.util.json.JSONParser"/>
</subpackage>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
