Skip to content

Commit c86d78f

Browse files
tzezulatzezula
committed
[GR-46205] Shaded org.json library.
1 parent 9d65487 commit c86d78f

File tree

366 files changed

+751
-527
lines changed

Some content is hidden

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

366 files changed

+751
-527
lines changed

‎tools/generators/resources/LSP_patch.diff

+6-6
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ diff --git a/DeclarationClientCapabilities.java b/DeclarationClientCapabilities.
107107
index e202a63..5ad2708 100644
108108
--- a/DeclarationClientCapabilities.java
109109
+++ b/DeclarationClientCapabilities.java
110-
@@ -28,6 +28,8 @@ import com.oracle.truffle.tools.utils.json.JSONObject;
110+
@@ -28,6 +28,8 @@ import org.graalvm.shadowed.org.json.JSONObject;
111111
import java.util.Objects;
112112

113113
/**
@@ -157,8 +157,8 @@ index 453e4c2..8f9b38d 100644
157157
*/
158158
package org.graalvm.tools.lsp.server.types;
159159

160-
+import com.oracle.truffle.tools.utils.json.JSONArray;
161-
import com.oracle.truffle.tools.utils.json.JSONObject;
160+
+import org.graalvm.shadowed.org.json.JSONArray;
161+
import org.graalvm.shadowed.org.json.JSONObject;
162162
+import java.util.ArrayList;
163163
+import java.util.Collections;
164164
+import java.util.List;
@@ -234,7 +234,7 @@ diff --git a/ImplementationClientCapabilities.java b/ImplementationClientCapabil
234234
index 4eb28e2..9f04aea 100644
235235
--- a/ImplementationClientCapabilities.java
236236
+++ b/ImplementationClientCapabilities.java
237-
@@ -28,6 +28,8 @@ import com.oracle.truffle.tools.utils.json.JSONObject;
237+
@@ -28,6 +28,8 @@ import org.graalvm.shadowed.org.json.JSONObject;
238238
import java.util.Objects;
239239

240240
/**
@@ -276,7 +276,7 @@ diff --git a/Position.java b/Position.java
276276
index 114cf8a..d321258 100644
277277
--- a/Position.java
278278
+++ b/Position.java
279-
@@ -28,10 +28,7 @@ import com.oracle.truffle.tools.utils.json.JSONObject;
279+
@@ -28,10 +28,7 @@ import org.graalvm.shadowed.org.json.JSONObject;
280280

281281
/**
282282
* Position in a text document expressed as zero-based line and character offset.
@@ -543,7 +543,7 @@ diff --git a/TypeDefinitionClientCapabilities.java b/TypeDefinitionClientCapabil
543543
index 9af515d..db1a734 100644
544544
--- a/TypeDefinitionClientCapabilities.java
545545
+++ b/TypeDefinitionClientCapabilities.java
546-
@@ -28,6 +28,8 @@ import com.oracle.truffle.tools.utils.json.JSONObject;
546+
@@ -28,6 +28,8 @@ import org.graalvm.shadowed.org.json.JSONObject;
547547
import java.util.Objects;
548548

549549
/**

‎tools/generators/src/generator.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function generateJavaSourceFile(name: string, content: string): void {
241241
}
242242

243243
function getJSONBaseText() {
244-
let text = 'import com.oracle.truffle.tools.utils.json.JSONObject;\n\n';
244+
let text = 'import org.graalvm.shadowed.org.json.JSONObject;\n\n';
245245
text += 'public abstract class JSONBase {\n\n';
246246

247247
// jsonData field
@@ -371,7 +371,7 @@ function getClassText(declNode: DeclarationStatement, moduleNode: ModuleDeclarat
371371
if (!isAbstract) {
372372
imports.push('java.util.ArrayList');
373373
imports.push('java.util.Collections');
374-
imports.push('com.oracle.truffle.tools.utils.json.JSONArray');
374+
imports.push('org.graalvm.shadowed.org.json.JSONArray');
375375
}
376376
}
377377
if (toImport.hasMap) {
@@ -381,7 +381,7 @@ function getClassText(declNode: DeclarationStatement, moduleNode: ModuleDeclarat
381381
}
382382
}
383383
if (!isAbstract) {
384-
imports.push('com.oracle.truffle.tools.utils.json.JSONObject');
384+
imports.push('org.graalvm.shadowed.org.json.JSONObject');
385385
if (toImport.hasObjects) {
386386
imports.push('java.util.Objects');
387387
}

‎tools/mx.tools/suite.py

+11-21
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"dependencies" : [
6060
"truffle:TRUFFLE_API",
6161
"TRUFFLE_PROFILER",
62-
"truffle:TruffleJSON",
62+
"truffle:TRUFFLE_JSON",
6363
"TruffleJWS",
6464
],
6565
"requires" : [
@@ -154,7 +154,7 @@
154154
"sourceDirs" : ["src"],
155155
"dependencies" : [
156156
"truffle:TRUFFLE_API",
157-
"truffle:TruffleJSON",
157+
"truffle:TRUFFLE_JSON",
158158
],
159159
"requires" : ["java.logging"],
160160
"exports" : [
@@ -184,7 +184,7 @@
184184
"sourceDirs" : ["src"],
185185
"dependencies" : [
186186
"truffle:TRUFFLE_API",
187-
"truffle:TruffleJSON",
187+
"truffle:TRUFFLE_JSON",
188188
],
189189
"exports" : [
190190
"<package-info>", # exports all packages containing package-info.java
@@ -213,7 +213,7 @@
213213
"sourceDirs" : ["src"],
214214
"dependencies" : [
215215
"truffle:TRUFFLE_API",
216-
"truffle:TruffleJSON",
216+
"truffle:TRUFFLE_JSON",
217217
],
218218
"requires" : ["java.logging"],
219219
"exports" : [
@@ -244,7 +244,7 @@
244244
"sourceDirs" : ["src"],
245245
"dependencies" : [
246246
"truffle:TRUFFLE_API",
247-
"truffle:TruffleJSON",
247+
"truffle:TRUFFLE_JSON",
248248
],
249249
"exports" : [
250250
"<package-info>", # exports all packages containing package-info.java
@@ -287,7 +287,7 @@
287287
"sourceDirs": ["src"],
288288
"dependencies": [
289289
"org.graalvm.tools.api.lsp",
290-
"truffle:TruffleJSON"
290+
"truffle:TRUFFLE_JSON"
291291
],
292292
"requires" : [
293293
"java.logging",
@@ -369,9 +369,7 @@
369369
"distDependencies" : [
370370
"truffle:TRUFFLE_API",
371371
"TRUFFLE_PROFILER",
372-
],
373-
"exclude" : [
374-
"truffle:TruffleJSON",
372+
"truffle:TRUFFLE_JSON",
375373
],
376374
"maven" : {
377375
"artifactId" : "chromeinspector",
@@ -481,9 +479,7 @@
481479
],
482480
"distDependencies" : [
483481
"truffle:TRUFFLE_API",
484-
],
485-
"exclude" : [
486-
"truffle:TruffleJSON",
482+
"truffle:TRUFFLE_JSON",
487483
],
488484
"maven" : {
489485
"artifactId" : "profiler",
@@ -521,9 +517,7 @@
521517
],
522518
"distDependencies" : [
523519
"truffle:TRUFFLE_API",
524-
],
525-
"exclude" : [
526-
"truffle:TruffleJSON",
520+
"truffle:TRUFFLE_JSON",
527521
],
528522
"maven" : {
529523
"artifactId" : "coverage",
@@ -561,9 +555,7 @@
561555
],
562556
"distDependencies" : [
563557
"truffle:TRUFFLE_API",
564-
],
565-
"exclude" : [
566-
"truffle:TruffleJSON",
558+
"truffle:TRUFFLE_JSON",
567559
],
568560
"maven" : {
569561
"artifactId" : "dap",
@@ -627,9 +619,7 @@
627619
],
628620
"distDependencies" : [
629621
"LSP_API",
630-
],
631-
"exclude" : [
632-
"truffle:TruffleJSON",
622+
"truffle:TRUFFLE_JSON",
633623
],
634624
"maven" : {
635625
"artifactId" : "lsp",

‎tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LineSearchTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.List;
3030
import java.util.regex.PatternSyntaxException;
3131

32+
import org.graalvm.shadowed.org.json.JSONArray;
3233
import org.junit.Assert;
3334
import org.junit.Test;
3435
import org.junit.runner.RunWith;
@@ -37,8 +38,6 @@
3738
import com.oracle.truffle.api.source.Source;
3839
import com.oracle.truffle.tools.chromeinspector.util.LineSearch;
3940

40-
import com.oracle.truffle.tools.utils.json.JSONArray;
41-
4241
@RunWith(Parameterized.class)
4342
public class LineSearchTest {
4443

‎tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/MultiEngineTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@
4949
import static org.junit.Assert.assertEquals;
5050
import static org.junit.Assert.assertTrue;
5151
import static org.junit.Assert.fail;
52+
53+
import org.graalvm.shadowed.org.json.JSONArray;
54+
import org.graalvm.shadowed.org.json.JSONObject;
5255
import org.junit.Test;
5356

5457
import com.oracle.truffle.tools.utils.java_websocket.client.WebSocketClient;
5558
import com.oracle.truffle.tools.utils.java_websocket.handshake.ServerHandshake;
56-
import com.oracle.truffle.tools.utils.json.JSONArray;
57-
import com.oracle.truffle.tools.utils.json.JSONObject;
5859

5960
import org.graalvm.polyglot.Context;
6061
import org.graalvm.polyglot.Engine;

‎tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.concurrent.ExecutionException;
3232

3333
import org.graalvm.polyglot.Source;
34+
import org.graalvm.shadowed.org.json.JSONObject;
3435
import org.junit.Test;
3536

3637
import com.oracle.truffle.api.CallTarget;
@@ -46,7 +47,6 @@
4647
import com.oracle.truffle.api.nodes.RootNode;
4748
import com.oracle.truffle.api.source.SourceSection;
4849
import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
49-
import com.oracle.truffle.tools.utils.json.JSONObject;
5050

5151
public class ProfilerTest {
5252

‎tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/SLInspectProfileTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import static org.junit.Assert.assertFalse;
2929
import static org.junit.Assert.assertNotNull;
3030
import static org.junit.Assert.assertTrue;
31+
32+
import org.graalvm.shadowed.org.json.JSONObject;
3133
import org.junit.After;
3234
import org.junit.Test;
3335

34-
import com.oracle.truffle.tools.utils.json.JSONObject;
35-
3636
import org.graalvm.polyglot.Source;
3737

3838
public class SLInspectProfileTest {

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/BreakpointsHandler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
import java.util.function.Supplier;
3434
import java.util.regex.Pattern;
3535

36-
import com.oracle.truffle.tools.utils.json.JSONArray;
37-
import com.oracle.truffle.tools.utils.json.JSONObject;
38-
3936
import com.oracle.truffle.api.debug.Breakpoint;
4037
import com.oracle.truffle.api.debug.DebugValue;
4138
import com.oracle.truffle.api.debug.DebuggerSession;
@@ -51,6 +48,9 @@
5148
import com.oracle.truffle.tools.chromeinspector.types.Location;
5249
import com.oracle.truffle.tools.chromeinspector.types.Script;
5350

51+
import org.graalvm.shadowed.org.json.JSONArray;
52+
import org.graalvm.shadowed.org.json.JSONObject;
53+
5454
final class BreakpointsHandler {
5555

5656
private long lastID = 0;

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
import com.oracle.truffle.tools.chromeinspector.types.Script;
8989
import com.oracle.truffle.tools.chromeinspector.types.StackTrace;
9090
import com.oracle.truffle.tools.chromeinspector.util.LineSearch;
91-
import com.oracle.truffle.tools.utils.json.JSONArray;
92-
import com.oracle.truffle.tools.utils.json.JSONObject;
91+
import org.graalvm.shadowed.org.json.JSONArray;
92+
import org.graalvm.shadowed.org.json.JSONObject;
9393

9494
public final class InspectorDebugger extends DebuggerDomain {
9595

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorProfiler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
import com.oracle.truffle.tools.profiler.ProfilerNode;
6363
import com.oracle.truffle.tools.profiler.impl.CPUSamplerInstrument;
6464
import com.oracle.truffle.tools.profiler.impl.CPUTracerInstrument;
65-
import com.oracle.truffle.tools.utils.json.JSONArray;
66-
import com.oracle.truffle.tools.utils.json.JSONObject;
65+
import org.graalvm.shadowed.org.json.JSONArray;
66+
import org.graalvm.shadowed.org.json.JSONObject;
6767

6868
public final class InspectorProfiler extends ProfilerDomain {
6969

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorRuntime.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
import java.util.Objects;
3838
import java.util.regex.Pattern;
3939

40-
import com.oracle.truffle.tools.utils.json.JSONArray;
41-
import com.oracle.truffle.tools.utils.json.JSONObject;
42-
4340
import com.oracle.truffle.api.InstrumentInfo;
4441
import com.oracle.truffle.api.debug.DebugException;
4542
import com.oracle.truffle.api.debug.DebugValue;
@@ -68,6 +65,8 @@
6865
import com.oracle.truffle.tools.chromeinspector.types.TypeInfo;
6966

7067
import org.graalvm.collections.Pair;
68+
import org.graalvm.shadowed.org.json.JSONArray;
69+
import org.graalvm.shadowed.org.json.JSONObject;
7170

7271
public final class InspectorRuntime extends RuntimeDomain {
7372

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/commands/Command.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
*/
2525
package com.oracle.truffle.tools.chromeinspector.commands;
2626

27-
import com.oracle.truffle.tools.utils.json.JSONException;
28-
import com.oracle.truffle.tools.utils.json.JSONObject;
27+
import org.graalvm.shadowed.org.json.JSONException;
28+
import org.graalvm.shadowed.org.json.JSONObject;
2929

3030
public final class Command {
3131

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/commands/ErrorResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package com.oracle.truffle.tools.chromeinspector.commands;
2626

27-
import com.oracle.truffle.tools.utils.json.JSONObject;
27+
import org.graalvm.shadowed.org.json.JSONObject;
2828

2929
public final class ErrorResponse {
3030

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/commands/Params.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
import com.oracle.truffle.api.interop.InteropLibrary;
3030
import com.oracle.truffle.api.interop.UnsupportedMessageException;
31-
import com.oracle.truffle.tools.utils.json.JSONArray;
32-
import com.oracle.truffle.tools.utils.json.JSONObject;
31+
import org.graalvm.shadowed.org.json.JSONArray;
32+
import org.graalvm.shadowed.org.json.JSONObject;
3333

3434
public final class Params {
3535

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/commands/Result.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package com.oracle.truffle.tools.chromeinspector.commands;
2626

27-
import com.oracle.truffle.tools.utils.json.JSONObject;
27+
import org.graalvm.shadowed.org.json.JSONObject;
2828

2929
public final class Result {
3030

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/domains/RuntimeDomain.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@
2424
*/
2525
package com.oracle.truffle.tools.chromeinspector.domains;
2626

27-
import com.oracle.truffle.tools.utils.json.JSONArray;
28-
2927
import com.oracle.truffle.tools.chromeinspector.commands.Params;
3028
import com.oracle.truffle.tools.chromeinspector.events.Event;
3129
import com.oracle.truffle.tools.chromeinspector.server.CommandProcessException;
3230
import com.oracle.truffle.tools.chromeinspector.server.InspectServerSession.CommandPostProcessor;
31+
import org.graalvm.shadowed.org.json.JSONArray;
3332

3433
public abstract class RuntimeDomain extends Domain {
3534

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/events/Event.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424
*/
2525
package com.oracle.truffle.tools.chromeinspector.events;
2626

27-
import com.oracle.truffle.tools.utils.json.JSONObject;
28-
2927
import com.oracle.truffle.tools.chromeinspector.commands.Command;
3028
import com.oracle.truffle.tools.chromeinspector.commands.Params;
3129
import com.oracle.truffle.tools.chromeinspector.commands.Result;
30+
import org.graalvm.shadowed.org.json.JSONObject;
3231

3332
public final class Event {
3433

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/objects/JSONTruffleArray.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import com.oracle.truffle.api.CompilerDirectives;
3030
import com.oracle.truffle.api.interop.InvalidArrayIndexException;
31-
import com.oracle.truffle.tools.utils.json.JSONArray;
31+
import org.graalvm.shadowed.org.json.JSONArray;
3232

3333
/**
3434
* TruffleObject of a JSON array.

‎tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/objects/JSONTruffleObject.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import com.oracle.truffle.api.interop.InvalidArrayIndexException;
3232
import com.oracle.truffle.api.interop.TruffleObject;
3333
import com.oracle.truffle.api.interop.UnknownIdentifierException;
34-
import com.oracle.truffle.tools.utils.json.JSONArray;
35-
import com.oracle.truffle.tools.utils.json.JSONObject;
34+
import org.graalvm.shadowed.org.json.JSONArray;
35+
import org.graalvm.shadowed.org.json.JSONObject;
3636

3737
/**
3838
* TruffleObject of a JSON object.

0 commit comments

Comments
 (0)