Skip to content

Vendor JSON Writer/Reader: Device #1675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denrase merged 9 commits into from
Aug 26, 2021
Merged

Vendor JSON Writer/Reader: Device #1675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
39139ab
move unknwn getter/setter requirement to own interface
denrase Aug 5, 2021
8eda7f6
mark interface as public
denrase Aug 5, 2021
ecc145e
generate api dump
denrase Aug 5, 2021
1f3f3ca
implement app serialization
denrase Aug 5, 2021
685d910
test date serialization
denrase Aug 5, 2021
674f2f5
test date reading
denrase Aug 5, 2021
cccc197
implement device serialization
denrase Aug 23, 2021
0ff647b
add tests for timezone serialization/deserialization
denrase Aug 23, 2021
3766734
Merge branch 'feat/vendor-json-writer-reader' into feat/vendor-json-w…
denrase Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 54 additions & 2 deletions sentry/api/sentry.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,12 @@ public final class io/sentry/JsonObjectReader : io/sentry/vendor/gson/stream/Jso
public fun nextBooleanOrNull ()Ljava/lang/Boolean;
public fun nextDateOrNull (Lio/sentry/ILogger;)Ljava/util/Date;
public fun nextDoubleOrNull ()Ljava/lang/Double;
public fun nextFloatOrNull ()Ljava/lang/Float;
public fun nextIntegerOrNull ()Ljava/lang/Integer;
public fun nextLongOrNull ()Ljava/lang/Long;
public fun nextObjectOrNull ()Ljava/lang/Object;
public fun nextStringOrNull ()Ljava/lang/String;
public fun nextTimeZoneOrNull (Lio/sentry/ILogger;)Ljava/util/TimeZone;
public fun nextUnknown (Lio/sentry/ILogger;Ljava/util/Map;Ljava/lang/String;)V
}

Expand Down Expand Up @@ -1509,7 +1511,7 @@ public final class io/sentry/protocol/DebugMeta : io/sentry/IUnknownPropertiesCo
public fun setSdkInfo (Lio/sentry/protocol/SdkInfo;)V
}

public final class io/sentry/protocol/Device : io/sentry/IUnknownPropertiesConsumer {
public final class io/sentry/protocol/Device : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public static final field TYPE Ljava/lang/String;
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
Expand Down Expand Up @@ -1538,11 +1540,13 @@ public final class io/sentry/protocol/Device : io/sentry/IUnknownPropertiesConsu
public fun getScreenWidthPixels ()Ljava/lang/Integer;
public fun getStorageSize ()Ljava/lang/Long;
public fun getTimezone ()Ljava/util/TimeZone;
public fun getUnknown ()Ljava/util/Map;
public fun getUsableMemory ()Ljava/lang/Long;
public fun isCharging ()Ljava/lang/Boolean;
public fun isLowMemory ()Ljava/lang/Boolean;
public fun isOnline ()Ljava/lang/Boolean;
public fun isSimulator ()Ljava/lang/Boolean;
public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
public fun setArchs ([Ljava/lang/String;)V
public fun setBatteryLevel (Ljava/lang/Float;)V
public fun setBatteryTemperature (Ljava/lang/Float;)V
Expand Down Expand Up @@ -1572,16 +1576,64 @@ public final class io/sentry/protocol/Device : io/sentry/IUnknownPropertiesConsu
public fun setSimulator (Ljava/lang/Boolean;)V
public fun setStorageSize (Ljava/lang/Long;)V
public fun setTimezone (Ljava/util/TimeZone;)V
public fun setUnknown (Ljava/util/Map;)V
public fun setUsableMemory (Ljava/lang/Long;)V
}

public final class io/sentry/protocol/Device$DeviceOrientation : java/lang/Enum {
public final class io/sentry/protocol/Device$Deserializer : io/sentry/JsonDeserializer {
public fun <init> ()V
public fun deserialize (Lio/sentry/JsonObjectReader;Lio/sentry/ILogger;)Lio/sentry/protocol/Device;
public synthetic fun deserialize (Lio/sentry/JsonObjectReader;Lio/sentry/ILogger;)Ljava/lang/Object;
}

public final class io/sentry/protocol/Device$DeviceOrientation : java/lang/Enum, io/sentry/JsonSerializable {
public static final field LANDSCAPE Lio/sentry/protocol/Device$DeviceOrientation;
public static final field PORTRAIT Lio/sentry/protocol/Device$DeviceOrientation;
public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
public static fun valueOf (Ljava/lang/String;)Lio/sentry/protocol/Device$DeviceOrientation;
public static fun values ()[Lio/sentry/protocol/Device$DeviceOrientation;
}

public final class io/sentry/protocol/Device$DeviceOrientation$Deserializer : io/sentry/JsonDeserializer {
public fun <init> ()V
public fun deserialize (Lio/sentry/JsonObjectReader;Lio/sentry/ILogger;)Lio/sentry/protocol/Device$DeviceOrientation;
public synthetic fun deserialize (Lio/sentry/JsonObjectReader;Lio/sentry/ILogger;)Ljava/lang/Object;
}

public final class io/sentry/protocol/Device$JsonKeys {
public static final field ARCHS Ljava/lang/String;
public static final field BATTERY_LEVEL Ljava/lang/String;
public static final field BATTERY_TEMPERATURE Ljava/lang/String;
public static final field BOOT_TIME Ljava/lang/String;
public static final field BRAND Ljava/lang/String;
public static final field CHARGING Ljava/lang/String;
public static final field CONNECTION_TYPE Ljava/lang/String;
public static final field EXTERNAL_FREE_STORAGE Ljava/lang/String;
public static final field EXTERNAL_STORAGE_SIZE Ljava/lang/String;
public static final field FAMILY Ljava/lang/String;
public static final field FREE_MEMORY Ljava/lang/String;
public static final field FREE_STORAGE Ljava/lang/String;
public static final field ID Ljava/lang/String;
public static final field LANGUAGE Ljava/lang/String;
public static final field LOW_MEMORY Ljava/lang/String;
public static final field MANUFACTURER Ljava/lang/String;
public static final field MEMORY_SIZE Ljava/lang/String;
public static final field MODEL Ljava/lang/String;
public static final field MODEL_ID Ljava/lang/String;
public static final field NAME Ljava/lang/String;
public static final field ONLINE Ljava/lang/String;
public static final field ORIENTATION Ljava/lang/String;
public static final field SCREEN_DENSITY Ljava/lang/String;
public static final field SCREEN_DPI Ljava/lang/String;
public static final field SCREEN_HEIGHT_PIXELS Ljava/lang/String;
public static final field SCREEN_WIDTH_PIXELS Ljava/lang/String;
public static final field SIMULATOR Ljava/lang/String;
public static final field STORAGE_SIZE Ljava/lang/String;
public static final field TIMEZONE Ljava/lang/String;
public static final field USABLE_MEMORY Ljava/lang/String;
public fun <init> ()V
}

public final class io/sentry/protocol/Gpu : io/sentry/IUnknownPropertiesConsumer {
public static final field TYPE Ljava/lang/String;
public fun <init> ()V
Expand Down
17 changes: 17 additions & 0 deletions sentry/src/main/java/io/sentry/JsonObjectReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.io.Reader;
import java.util.Date;
import java.util.Map;
import java.util.TimeZone;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;

Expand All @@ -24,6 +25,10 @@ public JsonObjectReader(Reader in) {
return peek() == JsonToken.NULL ? null : nextDouble();
}

public @Nullable Float nextFloatOrNull() throws IOException {
return peek() == JsonToken.NULL ? null : (float) nextDouble();
}

public @Nullable Long nextLongOrNull() throws IOException {
return peek() == JsonToken.NULL ? null : nextLong();
}
Expand Down Expand Up @@ -65,6 +70,18 @@ public void nextUnknown(ILogger logger, Map<String, Object> unknown, String name
return null;
}

public @Nullable TimeZone nextTimeZoneOrNull(ILogger logger) throws IOException {
if (peek() == JsonToken.NULL) {
return null;
}
try {
return TimeZone.getTimeZone(nextString());
} catch (Exception e) {
logger.log(SentryLevel.ERROR, "Error when deserializing TimeZone", e);
}
return null;
}

/**
* Decodes JSON into Java primitives/objects (null, boolean, int, long, double, String, Map, List)
* with full nesting support. To be used at the root level or after calling `nextName()`.
Expand Down
14 changes: 14 additions & 0 deletions sentry/src/main/java/io/sentry/JsonObjectSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.Map;
import java.util.TimeZone;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand All @@ -27,6 +28,8 @@ public void serialize(
writer.value((Number) object);
} else if (object instanceof Date) {
serializeDate(writer, logger, (Date) object);
} else if (object instanceof TimeZone) {
serializeTimeZone(writer, logger, (TimeZone) object);
} else if (object instanceof Collection) {
serializeCollection(writer, logger, (Collection<?>) object);
} else if (object.getClass().isArray()) {
Expand Down Expand Up @@ -54,6 +57,17 @@ private void serializeDate(
}
}

private void serializeTimeZone(
@NotNull JsonObjectWriter writer, @NotNull ILogger logger, @NotNull TimeZone timeZone)
throws IOException {
try {
writer.value(timeZone.getID());
} catch (Exception e) {
logger.log(SentryLevel.ERROR, "Error when serializing TimeZone", e);
writer.nullValue(); // Fallback.
}
}

private void serializeCollection(
@NotNull JsonObjectWriter writer, @NotNull ILogger logger, @NotNull Collection<?> collection)
throws IOException {
Expand Down
3 changes: 1 addition & 2 deletions sentry/src/main/java/io/sentry/protocol/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,7 @@ public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
if (unknown != null) {
for (String key : unknown.keySet()) {
Object value = unknown.get(key);
writer.name(key);
writer.value(logger, value);
writer.name(key).value(logger, value);
}
}
writer.endObject();
Expand Down
Loading