Skip to content

Vendor JSON: Remove IUnknownPropertiesConsumer #1749

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 2 commits into from
Oct 8, 2021
Merged

Vendor JSON: Remove IUnknownPropertiesConsumer #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af06c7d
Remove IUnknownPropertiesConsumer
denrase Oct 4, 2021
c9c5006
Merge branch 'feat/vendor-json-writer-reader' into feat/vendor-json-r…
denrase Oct 8, 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
67 changes: 21 additions & 46 deletions sentry/api/sentry.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ public final class io/sentry/Attachment {
public fun getPathname ()Ljava/lang/String;
}

public final class io/sentry/Breadcrumb : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/Breadcrumb : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Ljava/lang/String;)V
public fun <init> (Ljava/util/Date;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public static fun debug (Ljava/lang/String;)Lio/sentry/Breadcrumb;
public static fun error (Ljava/lang/String;)Lio/sentry/Breadcrumb;
public fun getCategory ()Ljava/lang/String;
Expand Down Expand Up @@ -352,10 +351,6 @@ public abstract interface class io/sentry/ITransportFactory {
public abstract fun create (Lio/sentry/SentryOptions;Lio/sentry/RequestDetails;)Lio/sentry/transport/ITransport;
}

public abstract interface class io/sentry/IUnknownPropertiesConsumer {
public abstract fun acceptUnknownProperties (Ljava/util/Map;)V
}

public abstract interface class io/sentry/Integration {
public abstract fun register (Lio/sentry/IHub;Lio/sentry/SentryOptions;)V
}
Expand Down Expand Up @@ -860,11 +855,10 @@ public final class io/sentry/SentryEnvelopeItemHeader$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/SentryEvent : io/sentry/SentryBaseEvent, io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/SentryEvent : io/sentry/SentryBaseEvent, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Ljava/lang/Throwable;)V
public fun <init> (Ljava/util/Date;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getDebugMeta ()Lio/sentry/protocol/DebugMeta;
public fun getExceptions ()Ljava/util/List;
public fun getFingerprints ()Ljava/util/List;
Expand Down Expand Up @@ -1557,10 +1551,9 @@ public abstract interface class io/sentry/hints/SubmissionResult {
public abstract fun setResult (Z)V
}

public final class io/sentry/protocol/App : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/App : 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
public fun getAppBuild ()Ljava/lang/String;
public fun getAppIdentifier ()Ljava/lang/String;
public fun getAppName ()Ljava/lang/String;
Expand Down Expand Up @@ -1597,10 +1590,9 @@ public final class io/sentry/protocol/App$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/Browser : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/Browser : 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
public fun getName ()Ljava/lang/String;
public fun getUnknown ()Ljava/util/Map;
public fun getVersion ()Ljava/lang/String;
Expand Down Expand Up @@ -1648,10 +1640,9 @@ public final class io/sentry/protocol/Contexts$Deserializer : io/sentry/JsonDese
public synthetic fun deserialize (Lio/sentry/JsonObjectReader;Lio/sentry/ILogger;)Ljava/lang/Object;
}

public final class io/sentry/protocol/DebugImage : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/DebugImage : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public static final field PROGUARD Ljava/lang/String;
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getArch ()Ljava/lang/String;
public fun getCodeFile ()Ljava/lang/String;
public fun getCodeId ()Ljava/lang/String;
Expand Down Expand Up @@ -1695,9 +1686,8 @@ public final class io/sentry/protocol/DebugImage$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/DebugMeta : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/DebugMeta : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getImages ()Ljava/util/List;
public fun getSdkInfo ()Lio/sentry/protocol/SdkInfo;
public fun getUnknown ()Ljava/util/Map;
Expand All @@ -1719,10 +1709,9 @@ public final class io/sentry/protocol/DebugMeta$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/Device : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/Device : 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
public fun getArchs ()[Ljava/lang/String;
public fun getBatteryLevel ()Ljava/lang/Float;
public fun getBatteryTemperature ()Ljava/lang/Float;
Expand Down Expand Up @@ -1842,10 +1831,9 @@ public final class io/sentry/protocol/Device$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/Gpu : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/Gpu : 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
public fun getApiType ()Ljava/lang/String;
public fun getId ()Ljava/lang/Integer;
public fun getMemorySize ()Ljava/lang/Integer;
Expand Down Expand Up @@ -1905,10 +1893,9 @@ public final class io/sentry/protocol/MeasurementValue$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/Mechanism : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/Mechanism : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Ljava/lang/Thread;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getData ()Ljava/util/Map;
public fun getDescription ()Ljava/lang/String;
public fun getHelpLink ()Ljava/lang/String;
Expand Down Expand Up @@ -1945,9 +1932,8 @@ public final class io/sentry/protocol/Mechanism$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/Message : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/Message : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getFormatted ()Ljava/lang/String;
public fun getMessage ()Ljava/lang/String;
public fun getParams ()Ljava/util/List;
Expand All @@ -1972,10 +1958,9 @@ public final class io/sentry/protocol/Message$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/OperatingSystem : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/OperatingSystem : 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
public fun getBuild ()Ljava/lang/String;
public fun getKernelVersion ()Ljava/lang/String;
public fun getName ()Ljava/lang/String;
Expand Down Expand Up @@ -2009,10 +1994,9 @@ public final class io/sentry/protocol/OperatingSystem$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/Request : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/Request : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Lio/sentry/protocol/Request;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getCookies ()Ljava/lang/String;
public fun getData ()Ljava/lang/Object;
public fun getEnvs ()Ljava/util/Map;
Expand Down Expand Up @@ -2052,9 +2036,8 @@ public final class io/sentry/protocol/Request$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/SdkInfo : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SdkInfo : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getSdkName ()Ljava/lang/String;
public fun getUnknown ()Ljava/util/Map;
public fun getVersionMajor ()Ljava/lang/Integer;
Expand Down Expand Up @@ -2082,10 +2065,9 @@ public final class io/sentry/protocol/SdkInfo$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/SdkVersion : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SdkVersion : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun addIntegration (Ljava/lang/String;)V
public fun addPackage (Ljava/lang/String;Ljava/lang/String;)V
public fun getIntegrations ()Ljava/util/List;
Expand Down Expand Up @@ -2114,9 +2096,8 @@ public final class io/sentry/protocol/SdkVersion$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/SentryException : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SentryException : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getMechanism ()Lio/sentry/protocol/Mechanism;
public fun getModule ()Ljava/lang/String;
public fun getStacktrace ()Lio/sentry/protocol/SentryStackTrace;
Expand Down Expand Up @@ -2167,10 +2148,9 @@ public final class io/sentry/protocol/SentryId$Deserializer : io/sentry/JsonDese
public synthetic fun deserialize (Lio/sentry/JsonObjectReader;Lio/sentry/ILogger;)Ljava/lang/Object;
}

public final class io/sentry/protocol/SentryPackage : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SentryPackage : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getName ()Ljava/lang/String;
public fun getUnknown ()Ljava/util/Map;
public fun getVersion ()Ljava/lang/String;
Expand All @@ -2192,10 +2172,9 @@ public final class io/sentry/protocol/SentryPackage$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/SentryRuntime : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SentryRuntime : 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
public fun getName ()Ljava/lang/String;
public fun getRawDescription ()Ljava/lang/String;
public fun getUnknown ()Ljava/util/Map;
Expand Down Expand Up @@ -2260,9 +2239,8 @@ public final class io/sentry/protocol/SentrySpan$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/SentryStackFrame : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SentryStackFrame : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getAbsPath ()Ljava/lang/String;
public fun getColno ()Ljava/lang/Integer;
public fun getContextLine ()Ljava/lang/String;
Expand Down Expand Up @@ -2331,10 +2309,9 @@ public final class io/sentry/protocol/SentryStackFrame$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/SentryStackTrace : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SentryStackTrace : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Ljava/util/List;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getFrames ()Ljava/util/List;
public fun getRegisters ()Ljava/util/Map;
public fun getSnapshot ()Ljava/lang/Boolean;
Expand All @@ -2359,9 +2336,8 @@ public final class io/sentry/protocol/SentryStackTrace$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/SentryThread : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/SentryThread : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getId ()Ljava/lang/Long;
public fun getName ()Ljava/lang/String;
public fun getPriority ()Ljava/lang/Integer;
Expand Down Expand Up @@ -2434,10 +2410,9 @@ public final class io/sentry/protocol/SentryTransaction$JsonKeys {
public fun <init> ()V
}

public final class io/sentry/protocol/User : io/sentry/IUnknownPropertiesConsumer, io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public final class io/sentry/protocol/User : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
public fun <init> ()V
public fun <init> (Lio/sentry/protocol/User;)V
public fun acceptUnknownProperties (Ljava/util/Map;)V
public fun getEmail ()Ljava/lang/String;
public fun getId ()Ljava/lang/String;
public fun getIpAddress ()Ljava/lang/String;
Expand Down
13 changes: 1 addition & 12 deletions sentry/src/main/java/io/sentry/Breadcrumb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.jetbrains.annotations.Nullable;

/** Series of application events */
public final class Breadcrumb implements IUnknownPropertiesConsumer, JsonUnknown, JsonSerializable {
public final class Breadcrumb implements JsonUnknown, JsonSerializable {

/** A timestamp representing when the breadcrumb occurred. */
private final @NotNull Date timestamp;
Expand Down Expand Up @@ -349,17 +349,6 @@ public void setLevel(@Nullable SentryLevel level) {
this.level = level;
}

/**
* Sets the unknown fields, internal usage only
*
* @param unknown the unknown's map
*/
@ApiStatus.Internal
@Override
public void acceptUnknownProperties(@NotNull Map<String, Object> unknown) {
this.unknown = new ConcurrentHashMap<>(unknown);
}

// region json

@Nullable
Expand Down
10 changes: 0 additions & 10 deletions sentry/src/main/java/io/sentry/IUnknownPropertiesConsumer.java
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions sentry/src/main/java/io/sentry/SentryEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;

public final class SentryEvent extends SentryBaseEvent
implements IUnknownPropertiesConsumer, JsonUnknown, JsonSerializable {
public final class SentryEvent extends SentryBaseEvent implements JsonUnknown, JsonSerializable {
/**
* Timestamp when the event was created.
*
Expand Down Expand Up @@ -176,12 +174,6 @@ public void setFingerprints(final @Nullable List<String> fingerprint) {
this.fingerprint = fingerprint != null ? new ArrayList<>(fingerprint) : null;
}

@ApiStatus.Internal
@Override
public void acceptUnknownProperties(final @NotNull Map<String, Object> unknown) {
this.unknown = unknown;
}

@Nullable
Map<String, String> getModules() {
return modules;
Expand Down
10 changes: 1 addition & 9 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
@@ -1,7 +1,6 @@
package io.sentry.protocol;

import io.sentry.ILogger;
import io.sentry.IUnknownPropertiesConsumer;
import io.sentry.JsonDeserializer;
import io.sentry.JsonObjectReader;
import io.sentry.JsonObjectWriter;
Expand All @@ -13,11 +12,10 @@
import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public final class App implements IUnknownPropertiesConsumer, JsonUnknown, JsonSerializable {
public final class App implements JsonUnknown, JsonSerializable {
public static final String TYPE = "app";

/** Version-independent application identifier, often a dotted bundle ID. */
Expand Down Expand Up @@ -113,12 +111,6 @@ public void setAppBuild(final @Nullable String appBuild) {
this.appBuild = appBuild;
}

@ApiStatus.Internal
@Override
public void acceptUnknownProperties(@NotNull Map<String, Object> unknown) {
this.unknown = new ConcurrentHashMap<>(unknown);
}

// region json

@Nullable
Expand Down
10 changes: 1 addition & 9 deletions sentry/src/main/java/io/sentry/protocol/Browser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.sentry.protocol;

import io.sentry.ILogger;
import io.sentry.IUnknownPropertiesConsumer;
import io.sentry.JsonDeserializer;
import io.sentry.JsonObjectReader;
import io.sentry.JsonObjectWriter;
Expand All @@ -12,11 +11,10 @@
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public final class Browser implements IUnknownPropertiesConsumer, JsonUnknown, JsonSerializable {
public final class Browser implements JsonUnknown, JsonSerializable {
public static final String TYPE = "browser";
/** Display name of the browser application. */
private @Nullable String name;
Expand Down Expand Up @@ -50,12 +48,6 @@ public void setVersion(final @Nullable String version) {
this.version = version;
}

@ApiStatus.Internal
@Override
public void acceptUnknownProperties(final @NotNull Map<String, Object> unknown) {
this.unknown = new ConcurrentHashMap<>(unknown);
}

// region json

@Nullable
Expand Down
Loading