Skip to content

Commit 280318a

Browse files
therepanictherepanic
committed
Replace the deprecated use of new JsonParser with the use of its static methods
1 parent ffc847f commit 280318a

File tree

928 files changed

+2778
-4903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

928 files changed

+2778
-4903
lines changed

‎src/main/java/com/facebook/ads/sdk/ALMAdAccountInfo.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,8 @@ public String getId() {
129129
public static ALMAdAccountInfo loadJSON(String json, APIContext context, String header) {
130130
ALMAdAccountInfo almAdAccountInfo = getGson().fromJson(json, ALMAdAccountInfo.class);
131131
if (context.isDebug()) {
132-
JsonParser parser = new JsonParser();
133-
JsonElement o1 = parser.parse(json);
134-
JsonElement o2 = parser.parse(almAdAccountInfo.toString());
132+
JsonElement o1 = JsonParser.parseString(json);
133+
JsonElement o2 = JsonParser.parseString(almAdAccountInfo.toString());
135134
if (o1.getAsJsonObject().get("__fb_trace_id__") != null) {
136135
o2.getAsJsonObject().add("__fb_trace_id__", o1.getAsJsonObject().get("__fb_trace_id__"));
137136
}
@@ -151,10 +150,9 @@ public static APINodeList<ALMAdAccountInfo> parseResponse(String json, APIContex
151150
APINodeList<ALMAdAccountInfo> almAdAccountInfos = new APINodeList<ALMAdAccountInfo>(request, json, header);
152151
JsonArray arr;
153152
JsonObject obj;
154-
JsonParser parser = new JsonParser();
155153
Exception exception = null;
156154
try{
157-
JsonElement result = parser.parse(json);
155+
JsonElement result = JsonParser.parseString(json);
158156
if (result.isJsonArray()) {
159157
// First, check if it's a pure JSON Array
160158
arr = result.getAsJsonArray();

‎src/main/java/com/facebook/ads/sdk/ALMEndAdvertiserInfo.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ public String getId() {
121121
public static ALMEndAdvertiserInfo loadJSON(String json, APIContext context, String header) {
122122
ALMEndAdvertiserInfo almEndAdvertiserInfo = getGson().fromJson(json, ALMEndAdvertiserInfo.class);
123123
if (context.isDebug()) {
124-
JsonParser parser = new JsonParser();
125-
JsonElement o1 = parser.parse(json);
126-
JsonElement o2 = parser.parse(almEndAdvertiserInfo.toString());
124+
JsonElement o1 = JsonParser.parseString(json);
125+
JsonElement o2 = JsonParser.parseString(almEndAdvertiserInfo.toString());
127126
if (o1.getAsJsonObject().get("__fb_trace_id__") != null) {
128127
o2.getAsJsonObject().add("__fb_trace_id__", o1.getAsJsonObject().get("__fb_trace_id__"));
129128
}
@@ -143,10 +142,9 @@ public static APINodeList<ALMEndAdvertiserInfo> parseResponse(String json, APICo
143142
APINodeList<ALMEndAdvertiserInfo> almEndAdvertiserInfos = new APINodeList<ALMEndAdvertiserInfo>(request, json, header);
144143
JsonArray arr;
145144
JsonObject obj;
146-
JsonParser parser = new JsonParser();
147145
Exception exception = null;
148146
try{
149-
JsonElement result = parser.parse(json);
147+
JsonElement result = JsonParser.parseString(json);
150148
if (result.isJsonArray()) {
151149
// First, check if it's a pure JSON Array
152150
arr = result.getAsJsonArray();

‎src/main/java/com/facebook/ads/sdk/ALMEvent.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@ public String getId() {
135135
public static ALMEvent loadJSON(String json, APIContext context, String header) {
136136
ALMEvent almEvent = getGson().fromJson(json, ALMEvent.class);
137137
if (context.isDebug()) {
138-
JsonParser parser = new JsonParser();
139-
JsonElement o1 = parser.parse(json);
140-
JsonElement o2 = parser.parse(almEvent.toString());
138+
JsonElement o1 = JsonParser.parseString(json);
139+
JsonElement o2 = JsonParser.parseString(almEvent.toString());
141140
if (o1.getAsJsonObject().get("__fb_trace_id__") != null) {
142141
o2.getAsJsonObject().add("__fb_trace_id__", o1.getAsJsonObject().get("__fb_trace_id__"));
143142
}
@@ -157,10 +156,9 @@ public static APINodeList<ALMEvent> parseResponse(String json, APIContext contex
157156
APINodeList<ALMEvent> almEvents = new APINodeList<ALMEvent>(request, json, header);
158157
JsonArray arr;
159158
JsonObject obj;
160-
JsonParser parser = new JsonParser();
161159
Exception exception = null;
162160
try{
163-
JsonElement result = parser.parse(json);
161+
JsonElement result = JsonParser.parseString(json);
164162
if (result.isJsonArray()) {
165163
// First, check if it's a pure JSON Array
166164
arr = result.getAsJsonArray();

‎src/main/java/com/facebook/ads/sdk/ALMGuidance.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ public String getId() {
6060
public static ALMGuidance loadJSON(String json, APIContext context, String header) {
6161
ALMGuidance almGuidance = getGson().fromJson(json, ALMGuidance.class);
6262
if (context.isDebug()) {
63-
JsonParser parser = new JsonParser();
64-
JsonElement o1 = parser.parse(json);
65-
JsonElement o2 = parser.parse(almGuidance.toString());
63+
JsonElement o1 = JsonParser.parseString(json);
64+
JsonElement o2 = JsonParser.parseString(almGuidance.toString());
6665
if (o1.getAsJsonObject().get("__fb_trace_id__") != null) {
6766
o2.getAsJsonObject().add("__fb_trace_id__", o1.getAsJsonObject().get("__fb_trace_id__"));
6867
}
@@ -82,10 +81,9 @@ public static APINodeList<ALMGuidance> parseResponse(String json, APIContext con
8281
APINodeList<ALMGuidance> almGuidances = new APINodeList<ALMGuidance>(request, json, header);
8382
JsonArray arr;
8483
JsonObject obj;
85-
JsonParser parser = new JsonParser();
8684
Exception exception = null;
8785
try{
88-
JsonElement result = parser.parse(json);
86+
JsonElement result = JsonParser.parseString(json);
8987
if (result.isJsonArray()) {
9088
// First, check if it's a pure JSON Array
9189
arr = result.getAsJsonArray();

‎src/main/java/com/facebook/ads/sdk/ALMGuidanceMetrics.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ public String getId() {
7878
public static ALMGuidanceMetrics loadJSON(String json, APIContext context, String header) {
7979
ALMGuidanceMetrics almGuidanceMetrics = getGson().fromJson(json, ALMGuidanceMetrics.class);
8080
if (context.isDebug()) {
81-
JsonParser parser = new JsonParser();
82-
JsonElement o1 = parser.parse(json);
83-
JsonElement o2 = parser.parse(almGuidanceMetrics.toString());
81+
JsonElement o1 = JsonParser.parseString(json);
82+
JsonElement o2 = JsonParser.parseString(almGuidanceMetrics.toString());
8483
if (o1.getAsJsonObject().get("__fb_trace_id__") != null) {
8584
o2.getAsJsonObject().add("__fb_trace_id__", o1.getAsJsonObject().get("__fb_trace_id__"));
8685
}
@@ -100,10 +99,9 @@ public static APINodeList<ALMGuidanceMetrics> parseResponse(String json, APICont
10099
APINodeList<ALMGuidanceMetrics> almGuidanceMetricss = new APINodeList<ALMGuidanceMetrics>(request, json, header);
101100
JsonArray arr;
102101
JsonObject obj;
103-
JsonParser parser = new JsonParser();
104102
Exception exception = null;
105103
try{
106-
JsonElement result = parser.parse(json);
104+
JsonElement result = JsonParser.parseString(json);
107105
if (result.isJsonArray()) {
108106
// First, check if it's a pure JSON Array
109107
arr = result.getAsJsonArray();

‎src/main/java/com/facebook/ads/sdk/AMOneshopSettings.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ public String getId() {
5252
public static AMOneshopSettings loadJSON(String json, APIContext context, String header) {
5353
AMOneshopSettings amOneshopSettings = getGson().fromJson(json, AMOneshopSettings.class);
5454
if (context.isDebug()) {
55-
JsonParser parser = new JsonParser();
56-
JsonElement o1 = parser.parse(json);
57-
JsonElement o2 = parser.parse(amOneshopSettings.toString());
55+
JsonElement o1 = JsonParser.parseString(json);
56+
JsonElement o2 = JsonParser.parseString(amOneshopSettings.toString());
5857
if (o1.getAsJsonObject().get("__fb_trace_id__") != null) {
5958
o2.getAsJsonObject().add("__fb_trace_id__", o1.getAsJsonObject().get("__fb_trace_id__"));
6059
}
@@ -74,10 +73,9 @@ public static APINodeList<AMOneshopSettings> parseResponse(String json, APIConte
7473
APINodeList<AMOneshopSettings> amOneshopSettingss = new APINodeList<AMOneshopSettings>(request, json, header);
7574
JsonArray arr;
7675
JsonObject obj;
77-
JsonParser parser = new JsonParser();
7876
Exception exception = null;
7977
try{
80-
JsonElement result = parser.parse(json);
78+
JsonElement result = JsonParser.parseString(json);
8179
if (result.isJsonArray()) {
8280
// First, check if it's a pure JSON Array
8381
arr = result.getAsJsonArray();

‎src/main/java/com/facebook/ads/sdk/ANBlockedBICategory.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ public String getId() {
5454
public static ANBlockedBICategory loadJSON(String json, APIContext context, String header) {
5555
ANBlockedBICategory anBlockedBICategory = getGson().fromJson(json, ANBlockedBICategory.class);
5656
if (context.isDebug()) {
57-
JsonParser parser = new JsonParser();
58-
JsonElement o1 = parser.parse(json);
59-
JsonElement o2 = parser.parse(anBlockedBICategory.toString());
57+
JsonElement o1 = JsonParser.parseString(json);
58+
JsonElement o2 = JsonParser.parseString(anBlockedBICategory.toString());
6059
if (o1.getAsJsonObject().get("__fb_trace_id__") != null) {
6160
o2.getAsJsonObject().add("__fb_trace_id__", o1.getAsJsonObject().get("__fb_trace_id__"));
6261
}
@@ -76,10 +75,9 @@ public static APINodeList<ANBlockedBICategory> parseResponse(String json, APICon
7675
APINodeList<ANBlockedBICategory> anBlockedBICategorys = new APINodeList<ANBlockedBICategory>(request, json, header);
7776
JsonArray arr;
7877
JsonObject obj;
79-
JsonParser parser = new JsonParser();
8078
Exception exception = null;
8179
try{
82-
JsonElement result = parser.parse(json);
80+
JsonElement result = JsonParser.parseString(json);
8381
if (result.isJsonArray()) {
8482
// First, check if it's a pure JSON Array
8583
arr = result.getAsJsonArray();

‎src/main/java/com/facebook/ads/sdk/APIContext.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ public String getAppID() {
160160
params.put("fields", "app_id");
161161

162162
APIRequest.ResponseWrapper response = executor.execute("GET", apiUrl, params, this);
163-
JsonParser parser = new JsonParser();
164-
this.appID = parser.parse(response.getBody())
163+
this.appID = JsonParser.parseString(response.getBody())
165164
.getAsJsonObject()
166165
.get("data")
167166
.getAsJsonObject()

‎src/main/java/com/facebook/ads/sdk/APIException.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public String getRawResponse() {
6868

6969
@Override
7070
public JsonObject getRawResponseAsJsonObject() {
71-
JsonParser parser = new JsonParser();
72-
return parser.parse(this.getMessage()).getAsJsonObject();
71+
return JsonParser.parseString(this.getMessage()).getAsJsonObject();
7372
}
7473

7574
@Override

‎src/main/java/com/facebook/ads/sdk/APINode.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ public String toString() {
6363

6464
public String getId() {
6565
try {
66-
JsonParser parser = new JsonParser();
67-
return parser.parse(rawValue).getAsJsonObject().get("id").getAsString();
66+
return JsonParser.parseString(rawValue).getAsJsonObject().get("id").getAsString();
6867
} catch (Exception e) {
6968
return null;
7069
}
@@ -81,9 +80,8 @@ public String getRawResponse() {
8180

8281
@Override
8382
public JsonObject getRawResponseAsJsonObject() {
84-
JsonParser parser = new JsonParser();
8583
try {
86-
return parser.parse(rawValue).getAsJsonObject();
84+
return JsonParser.parseString(rawValue).getAsJsonObject();
8785
} catch (Exception e) {
8886
return null;
8987
}
@@ -103,10 +101,9 @@ public static APINodeList<APINode> parseResponse(String json, APIContext context
103101
APINodeList<APINode> nodes = new APINodeList<APINode>(request, json, header);
104102
JsonArray arr;
105103
JsonObject obj;
106-
JsonParser parser = new JsonParser();
107104
Exception exception = null;
108105
try{
109-
JsonElement result = parser.parse(json);
106+
JsonElement result = JsonParser.parseString(json);
110107
if (result.isJsonArray()) {
111108
// First, check if it's a pure JSON Array
112109
arr = result.getAsJsonArray();

0 commit comments

Comments
 (0)