Skip to content

Commit 2ec1d00

Browse files
authored
fix: Switch commons-codec Base64 to java.util.Base64 (#60)
* fix: Switch commons-codec Base64 to java.util.Base64 * version bump
1 parent f58cfec commit 2ec1d00

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ or [JVM](https://github.com/Eppo-exp/java-server-sdk) SDKs.
1010

1111
```groovy
1212
dependencies {
13-
implementation 'cloud.eppo:sdk-common-jvm:3.4.0'
13+
implementation 'cloud.eppo:sdk-common-jvm:3.4.1'
1414
}
1515
```
1616

@@ -49,6 +49,6 @@ repositories {
4949
}
5050
5151
dependencies {
52-
implementation 'cloud.eppo:sdk-common-jvm:3.0.3-SNAPSHOT'
52+
implementation 'cloud.eppo:sdk-common-jvm:3.4.2-SNAPSHOT'
5353
}
5454
```

build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group = 'cloud.eppo'
9-
version = '3.4.0'
9+
version = '3.4.1'
1010
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
1111

1212
java {
@@ -20,12 +20,8 @@ dependencies {
2020
implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
2121
implementation 'com.github.zafarkhaja:java-semver:0.10.2'
2222
implementation "com.squareup.okhttp3:okhttp:4.12.0"
23-
2423
// For LRU and expiring maps
25-
implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
26-
27-
// For UFC DTOs
28-
implementation 'commons-codec:commons-codec:1.17.1'
24+
implementation 'org.apache.commons:commons-collections4:4.4'
2925
implementation 'org.slf4j:slf4j-api:2.0.16'
3026
testImplementation 'org.slf4j:slf4j-simple:2.0.16'
3127
testImplementation platform('org.junit:junit-bom:5.10.3')

src/main/java/cloud/eppo/Utils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import java.security.NoSuchAlgorithmException;
77
import java.text.ParseException;
88
import java.text.SimpleDateFormat;
9+
import java.util.Base64;
910
import java.util.Date;
1011
import java.util.Locale;
11-
import org.apache.commons.codec.binary.Base64;
1212
import org.slf4j.Logger;
1313
import org.slf4j.LoggerFactory;
1414

@@ -105,14 +105,14 @@ public static String base64Encode(String input) {
105105
if (input == null) {
106106
return null;
107107
}
108-
return Base64.encodeBase64String(input.getBytes(StandardCharsets.UTF_8));
108+
return new String(Base64.getEncoder().encode(input.getBytes(StandardCharsets.UTF_8)));
109109
}
110110

111111
public static String base64Decode(String input) {
112112
if (input == null) {
113113
return null;
114114
}
115-
byte[] decodedBytes = Base64.decodeBase64(input);
115+
byte[] decodedBytes = Base64.getDecoder().decode(input);
116116
if (decodedBytes.length == 0 && !input.isEmpty()) {
117117
throw new RuntimeException(
118118
"zero byte output from Base64; if not running on Android hardware be sure to use RobolectricTestRunner");

0 commit comments

Comments
 (0)