Skip to content

Commit

Permalink
Use native base64 impl + add Utils aliases for all custom Type conver…
Browse files Browse the repository at this point in the history 
…ters
  • Loading branch information
@mythz
mythz committed Mar 9, 2021
1 parent b4313f2 commit 8b88926
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 208 deletions.
Binary file modified src/AndroidClient/.idea/caches/build_file_checksums.ser
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/AndroidClient/.idea/modules/android/AndroidClient.android.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/AndroidClient/.idea/modules/client/AndroidClient.client.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/AndroidClient/android/src/main/java/net/servicestack/client/ByteArray.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ public class ByteArray {
public static byte[] parse(String base64) {
return Base64.getDecoder().decode(base64);
}

public static String toString(String source) {
return toString(Utils.toUtf8Bytes(source));
}

public static String toString(byte[] bytes) {
return Base64.getEncoder().encodeToString(bytes);
}
Expand Down
8 changes: 4 additions & 4 deletions src/AndroidClient/android/src/main/java/net/servicestack/client/TimeSpan.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ public static TimeSpan parse(String xsdDuration){
}

double totalSecs = 0
+ (days * 24 * 60 * 60)
+ (hours * 60 * 60)
+ (minutes * 60)
+ (seconds);
+ (days * 24 * 60 * 60)
+ (hours * 60 * 60)
+ (minutes * 60)
+ (seconds);

double interval = totalSecs + ms;

Expand Down
125 changes: 26 additions & 99 deletions src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ public static ResponseStatus createResponseStatus(Object obj) {
}
return null;
}

public static ResponseStatus createResponseStatus(JsonObject obj) {
ResponseStatus status = new ResponseStatus();
for (Map.Entry<String, JsonElement> jsonElementEntry : obj.entrySet()) {
Expand Down Expand Up @@ -615,6 +616,10 @@ public static ResponseStatus createResponseStatus(JsonObject obj) {
return status;
}

private static String getAsStringOrNull(JsonElement jsonElement) {
return jsonElement.isJsonNull() ? null : jsonElement.getAsString();
}

public static <T> ArrayList<T> toList(Iterable<T> iterable) {
ArrayList<T> to = new ArrayList<>();
for (T item : iterable) {
Expand Down Expand Up @@ -710,118 +715,40 @@ public static <K,V> HashMap<K,ArrayList<V>> createMap(ArrayList<V> xs, Function<
return to;
}

//From: http://iharder.sourceforge.net/current/java/base64/ (Public Domain)
public static String toBase64String(String source) {
return toBase64String(toUtf8Bytes(source));
public static String fromDateTime(Date date) {
return DateTime.toString(date);
}

public static String toBase64String(byte[] source) {
byte[] encoded = toBase64Bytes(source);
try {
return new String(encoded, "US-ASCII");
} catch (UnsupportedEncodingException e) {
return new String(encoded);
}
public static Date toDateTime(String jsonDate) {
return DateTime.parse(jsonDate);
}

public static byte[] toBase64Bytes(byte[] source) {
return toBase64Bytes(source, 0, source.length);
public static String fromTimeSpan(TimeSpan timeSpan) {
return TimeSpan.toString(timeSpan);
}

public static byte[] toBase64Bytes(byte[] source, int off, int len) {
if (source == null)
throw new NullPointerException("Cannot serialize a null array.");

if (off < 0)
throw new IllegalArgumentException("Cannot have negative offset: " + off);

if (len < 0)
throw new IllegalArgumentException("Cannot have length offset: " + len);

if (off + len > source.length)
throw new IllegalArgumentException(String.format(
"Cannot have offset of %d and length of %d with array of length %d", off, len, source.length));

int encLen = (len / 3) * 4 + (len % 3 > 0 ? 4 : 0); // Bytes needed for actual encoding
byte[] outBuff = new byte[encLen];

int d = 0;
int e = 0;
int len2 = len - 2;
for (; d < len2; d += 3, e += 4) {
encode3to4(source, d + off, 3, outBuff, e);
}

if (d < len) {
encode3to4(source, d + off, len - d, outBuff, e);
e += 4;
}

// Only resize array if we didn't guess it right.
if (e <= outBuff.length - 1) {
byte[] finalOut = new byte[e];
System.arraycopy(outBuff, 0, finalOut, 0, e);
return finalOut;
} else {
return outBuff;
}
public static TimeSpan toTimeSpan(String xsdDuration) {
return TimeSpan.parse(xsdDuration);
}

private static String getAsStringOrNull(JsonElement jsonElement) {
return jsonElement.isJsonNull() ? null : jsonElement.getAsString();
public static String fromGuid(UUID uuid) {
return Guid.toString(uuid);
}

private final static byte EQUALS_SIGN = (byte)'=';

private final static byte[] _STANDARD_ALPHABET = {
(byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
(byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
(byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
(byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
(byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
(byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
(byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
(byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
(byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
(byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
};

private static byte[] encode3to4(
byte[] source, int srcOffset, int numSigBytes,
byte[] destination, int destOffset) {
public static UUID toGuid(String guid) {
return Guid.parse(guid);
}

byte[] ALPHABET = _STANDARD_ALPHABET;
public static byte[] toByteArray(String base64) {
return ByteArray.parse(base64);
}

int inBuff = ( numSigBytes > 0 ? ((source[ srcOffset ] << 24) >>> 8) : 0 )
| ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
| ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
public static String toBase64String(String source) {
return ByteArray.toString(source);
}

switch (numSigBytes)
{
case 3:
destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
destination[ destOffset + 3 ] = ALPHABET[ (inBuff ) & 0x3f ];
return destination;

case 2:
destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
destination[ destOffset + 3 ] = EQUALS_SIGN;
return destination;

case 1:
destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
destination[ destOffset + 2 ] = EQUALS_SIGN;
destination[ destOffset + 3 ] = EQUALS_SIGN;
return destination;

default:
return destination;
}
public static String fromByteArray(byte[] bytes) {
return ByteArray.toString(bytes);
}

public static String addQueryParam(String url, String key, String value) {
Expand Down
5 changes: 5 additions & 0 deletions src/AndroidClient/client/src/main/java/net/servicestack/client/ByteArray.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ public class ByteArray {
public static byte[] parse(String base64) {
return Base64.getDecoder().decode(base64);
}

public static String toString(String source) {
return toString(Utils.toUtf8Bytes(source));
}

public static String toString(byte[] bytes) {
return Base64.getEncoder().encodeToString(bytes);
}
Expand Down
8 changes: 4 additions & 4 deletions src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ public static TimeSpan parse(String xsdDuration){
}

double totalSecs = 0
+ (days * 24 * 60 * 60)
+ (hours * 60 * 60)
+ (minutes * 60)
+ (seconds);
+ (days * 24 * 60 * 60)
+ (hours * 60 * 60)
+ (minutes * 60)
+ (seconds);

double interval = totalSecs + ms;

Expand Down
125 changes: 26 additions & 99 deletions src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ public static ResponseStatus createResponseStatus(Object obj) {
}
return null;
}

public static ResponseStatus createResponseStatus(JsonObject obj) {
ResponseStatus status = new ResponseStatus();
for (Map.Entry<String, JsonElement> jsonElementEntry : obj.entrySet()) {
Expand Down Expand Up @@ -615,6 +616,10 @@ public static ResponseStatus createResponseStatus(JsonObject obj) {
return status;
}

private static String getAsStringOrNull(JsonElement jsonElement) {
return jsonElement.isJsonNull() ? null : jsonElement.getAsString();
}

public static <T> ArrayList<T> toList(Iterable<T> iterable) {
ArrayList<T> to = new ArrayList<>();
for (T item : iterable) {
Expand Down Expand Up @@ -710,118 +715,40 @@ public static <K,V> HashMap<K,ArrayList<V>> createMap(ArrayList<V> xs, Function<
return to;
}

//From: http://iharder.sourceforge.net/current/java/base64/ (Public Domain)
public static String toBase64String(String source) {
return toBase64String(toUtf8Bytes(source));
public static String fromDateTime(Date date) {
return DateTime.toString(date);
}

public static String toBase64String(byte[] source) {
byte[] encoded = toBase64Bytes(source);
try {
return new String(encoded, "US-ASCII");
} catch (UnsupportedEncodingException e) {
return new String(encoded);
}
public static Date toDateTime(String jsonDate) {
return DateTime.parse(jsonDate);
}

public static byte[] toBase64Bytes(byte[] source) {
return toBase64Bytes(source, 0, source.length);
public static String fromTimeSpan(TimeSpan timeSpan) {
return TimeSpan.toString(timeSpan);
}

public static byte[] toBase64Bytes(byte[] source, int off, int len) {
if (source == null)
throw new NullPointerException("Cannot serialize a null array.");

if (off < 0)
throw new IllegalArgumentException("Cannot have negative offset: " + off);

if (len < 0)
throw new IllegalArgumentException("Cannot have length offset: " + len);

if (off + len > source.length)
throw new IllegalArgumentException(String.format(
"Cannot have offset of %d and length of %d with array of length %d", off, len, source.length));

int encLen = (len / 3) * 4 + (len % 3 > 0 ? 4 : 0); // Bytes needed for actual encoding
byte[] outBuff = new byte[encLen];

int d = 0;
int e = 0;
int len2 = len - 2;
for (; d < len2; d += 3, e += 4) {
encode3to4(source, d + off, 3, outBuff, e);
}

if (d < len) {
encode3to4(source, d + off, len - d, outBuff, e);
e += 4;
}

// Only resize array if we didn't guess it right.
if (e <= outBuff.length - 1) {
byte[] finalOut = new byte[e];
System.arraycopy(outBuff, 0, finalOut, 0, e);
return finalOut;
} else {
return outBuff;
}
public static TimeSpan toTimeSpan(String xsdDuration) {
return TimeSpan.parse(xsdDuration);
}

private static String getAsStringOrNull(JsonElement jsonElement) {
return jsonElement.isJsonNull() ? null : jsonElement.getAsString();
public static String fromGuid(UUID uuid) {
return Guid.toString(uuid);
}

private final static byte EQUALS_SIGN = (byte)'=';

private final static byte[] _STANDARD_ALPHABET = {
(byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
(byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
(byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
(byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
(byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
(byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
(byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
(byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
(byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
(byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
};

private static byte[] encode3to4(
byte[] source, int srcOffset, int numSigBytes,
byte[] destination, int destOffset) {
public static UUID toGuid(String guid) {
return Guid.parse(guid);
}

byte[] ALPHABET = _STANDARD_ALPHABET;
public static byte[] toByteArray(String base64) {
return ByteArray.parse(base64);
}

int inBuff = ( numSigBytes > 0 ? ((source[ srcOffset ] << 24) >>> 8) : 0 )
| ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
| ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
public static String toBase64String(String source) {
return ByteArray.toString(source);
}

switch (numSigBytes)
{
case 3:
destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
destination[ destOffset + 3 ] = ALPHABET[ (inBuff ) & 0x3f ];
return destination;

case 2:
destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
destination[ destOffset + 3 ] = EQUALS_SIGN;
return destination;

case 1:
destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
destination[ destOffset + 2 ] = EQUALS_SIGN;
destination[ destOffset + 3 ] = EQUALS_SIGN;
return destination;

default:
return destination;
}
public static String fromByteArray(byte[] bytes) {
return ByteArray.toString(bytes);
}

public static String addQueryParam(String url, String key, String value) {
Expand Down

0 comments on commit 8b88926

Please sign in to comment.