From e0b9db7df25f41f78211edfe365016a46fb8a481 Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 26 Jun 2026 11:24:30 -0700 Subject: [PATCH 1/9] Deprecate coupling to Jackson-2 API --- .../java/com/esri/core/geometry/GeometryEngine.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/esri/core/geometry/GeometryEngine.java b/src/main/java/com/esri/core/geometry/GeometryEngine.java index 99466fd2..83db0e53 100644 --- a/src/main/java/com/esri/core/geometry/GeometryEngine.java +++ b/src/main/java/com/esri/core/geometry/GeometryEngine.java @@ -44,6 +44,7 @@ public class GeometryEngine { /** + * @deprecated String * Imports the MapGeometry from its JSON representation. M and Z values are * not imported from JSON representation. * @@ -55,6 +56,7 @@ public class GeometryEngine { * @return The MapGeometry instance containing the imported geometry and its * spatial reference. */ + @Deprecated public static MapGeometry jsonToGeometry(JsonParser json) { MapGeometry geom = OperatorImportFromJson.local().execute(Geometry.Type.Unknown, new JsonParserReader(json)); return geom; @@ -95,11 +97,11 @@ public static MapGeometry jsonToGeometry(String json) { } /** - * Exports the specified geometry instance to it's JSON representation. + * Exports the specified geometry instance to its JSON representation. * * See OperatorExportToJson. * - * @see GeometryEngine#geometryToJson(SpatialReference spatialiReference, + * @see GeometryEngine#geometryToJson(SpatialReference spatialReference, * Geometry geometry) * @param wkid * The spatial reference Well Known ID to be used for the JSON @@ -114,7 +116,7 @@ public static String geometryToJson(int wkid, Geometry geometry) { } /** - * Exports the specified geometry instance to it's JSON representation. M + * Exports the specified geometry instance to its JSON representation. M * and Z values are not imported from JSON representation. * * See OperatorExportToJson. @@ -177,7 +179,7 @@ public static String geometryToGeoJson(int wkid, Geometry geometry) { } /** - * Exports the specified geometry instance to it's JSON representation. + * Exports the specified geometry instance to its JSON representation. * * See OperatorImportFromGeoJson. * From 2dcc128a91cd21e678d56830e5ac22b4fb61de83 Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 26 Jun 2026 11:26:49 -0700 Subject: [PATCH 2/9] Deprecate coupling to Jackson-2 API --- src/main/java/com/esri/core/geometry/JsonParserReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/esri/core/geometry/JsonParserReader.java b/src/main/java/com/esri/core/geometry/JsonParserReader.java index 90427c63..bce83af4 100644 --- a/src/main/java/com/esri/core/geometry/JsonParserReader.java +++ b/src/main/java/com/esri/core/geometry/JsonParserReader.java @@ -34,6 +34,7 @@ public class JsonParserReader implements JsonReader { private JsonParser m_jsonParser; + @Deprecated public JsonParserReader(JsonParser jsonParser) { m_jsonParser = jsonParser; } @@ -46,7 +47,7 @@ public static JsonReader createFromString(String str) { try { JsonFactory factory = new JsonFactory(); JsonParser jsonParser = factory.createParser(str); - + jsonParser.nextToken(); return new JsonParserReader(jsonParser); } @@ -168,4 +169,3 @@ else if (t == Token.VALUE_FALSE) throw new JsonGeometryException("Not a boolean"); } } - From 811bbaf1b7ec387051df9c5178402463deb54f93 Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 26 Jun 2026 11:28:04 -0700 Subject: [PATCH 3/9] Deprecate coupling to Jackson-2 API --- src/main/java/com/esri/core/geometry/SpatialReference.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/esri/core/geometry/SpatialReference.java b/src/main/java/com/esri/core/geometry/SpatialReference.java index 4c337e27..0cf8294a 100644 --- a/src/main/java/com/esri/core/geometry/SpatialReference.java +++ b/src/main/java/com/esri/core/geometry/SpatialReference.java @@ -74,6 +74,7 @@ boolean isLocal() { } /** + * @deprecated String * Returns spatial reference from the JsonParser. * * @param parser @@ -83,6 +84,7 @@ boolean isLocal() { * @throws Exception * if parsing has failed */ + @Deprecated public static SpatialReference fromJson(JsonParser parser) throws Exception { return fromJson(new JsonParserReader(parser)); } From b2ae409f12b5995f206294fadc073727454391c3 Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 10 Jul 2026 08:00:48 -0700 Subject: [PATCH 4/9] More-detailed deprecation message Co-authored-by: Randall Whitman --- src/main/java/com/esri/core/geometry/GeometryEngine.java | 2 +- src/main/java/com/esri/core/geometry/SpatialReference.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/esri/core/geometry/GeometryEngine.java b/src/main/java/com/esri/core/geometry/GeometryEngine.java index 83db0e53..2ba61cf4 100644 --- a/src/main/java/com/esri/core/geometry/GeometryEngine.java +++ b/src/main/java/com/esri/core/geometry/GeometryEngine.java @@ -44,7 +44,7 @@ public class GeometryEngine { /** - * @deprecated String + * @deprecated Use jsonToGeometry(String) * Imports the MapGeometry from its JSON representation. M and Z values are * not imported from JSON representation. * diff --git a/src/main/java/com/esri/core/geometry/SpatialReference.java b/src/main/java/com/esri/core/geometry/SpatialReference.java index 0cf8294a..26e6c562 100644 --- a/src/main/java/com/esri/core/geometry/SpatialReference.java +++ b/src/main/java/com/esri/core/geometry/SpatialReference.java @@ -74,7 +74,7 @@ boolean isLocal() { } /** - * @deprecated String + * @deprecated Use fromJson(String) * Returns spatial reference from the JsonParser. * * @param parser From aa446ee95244c821021433e9269077bd1b4fadfc Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 10 Jul 2026 10:51:28 -0700 Subject: [PATCH 5/9] Update JsonParserReader.java - toward package private --- src/main/java/com/esri/core/geometry/JsonParserReader.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/esri/core/geometry/JsonParserReader.java b/src/main/java/com/esri/core/geometry/JsonParserReader.java index bce83af4..d920bacb 100644 --- a/src/main/java/com/esri/core/geometry/JsonParserReader.java +++ b/src/main/java/com/esri/core/geometry/JsonParserReader.java @@ -27,14 +27,17 @@ import com.fasterxml.jackson.core.*; /** - * A throw in JsonReader built around the Jackson JsonParser. + * A throw-in JsonReader built around Jackson. * */ public class JsonParserReader implements JsonReader { private JsonParser m_jsonParser; - @Deprecated + /** + * @deprecated Use createFromString(String) + */ + @Deprecated // Intended for internal use only. public JsonParserReader(JsonParser jsonParser) { m_jsonParser = jsonParser; } From e16c21fecc4bf644dd50e4d63d233472aabbc8fd Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 10 Jul 2026 11:14:02 -0700 Subject: [PATCH 6/9] Update JsonParserReader.java - toward package private --- src/main/java/com/esri/core/geometry/JsonParserReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/esri/core/geometry/JsonParserReader.java b/src/main/java/com/esri/core/geometry/JsonParserReader.java index d920bacb..25afd0ed 100644 --- a/src/main/java/com/esri/core/geometry/JsonParserReader.java +++ b/src/main/java/com/esri/core/geometry/JsonParserReader.java @@ -27,8 +27,8 @@ import com.fasterxml.jackson.core.*; /** + * @deprecated Intended for internal use by Spatial-Framework-for-Hadoop only. * A throw-in JsonReader built around Jackson. - * */ public class JsonParserReader implements JsonReader { From c566c7919803026a3a67000f8b6475ad84c79890 Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 10 Jul 2026 11:25:24 -0700 Subject: [PATCH 7/9] Update JsonParserReader.java - toward package private --- src/main/java/com/esri/core/geometry/JsonParserReader.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/esri/core/geometry/JsonParserReader.java b/src/main/java/com/esri/core/geometry/JsonParserReader.java index 25afd0ed..faeb74cd 100644 --- a/src/main/java/com/esri/core/geometry/JsonParserReader.java +++ b/src/main/java/com/esri/core/geometry/JsonParserReader.java @@ -30,6 +30,7 @@ * @deprecated Intended for internal use by Spatial-Framework-for-Hadoop only. * A throw-in JsonReader built around Jackson. */ +@Deprecated public class JsonParserReader implements JsonReader { private JsonParser m_jsonParser; From aebff9826e25b3895998f83ee2f2b0cac559785f Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 10 Jul 2026 11:28:19 -0700 Subject: [PATCH 8/9] Update JsonParserReader.java - toward package private --- src/main/java/com/esri/core/geometry/JsonParserReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/esri/core/geometry/JsonParserReader.java b/src/main/java/com/esri/core/geometry/JsonParserReader.java index faeb74cd..0d64b747 100644 --- a/src/main/java/com/esri/core/geometry/JsonParserReader.java +++ b/src/main/java/com/esri/core/geometry/JsonParserReader.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.core.*; /** - * @deprecated Intended for internal use by Spatial-Framework-for-Hadoop only. + * @deprecated Intended for internal use by geometry-api-java only. * A throw-in JsonReader built around Jackson. */ @Deprecated From 19f6f46f3fa2eda21ef4898a78eb8766ef688626 Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Fri, 10 Jul 2026 13:40:58 -0700 Subject: [PATCH 9/9] Update JsonParserReader.java - de-dup deprecation --- src/main/java/com/esri/core/geometry/JsonParserReader.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/esri/core/geometry/JsonParserReader.java b/src/main/java/com/esri/core/geometry/JsonParserReader.java index 0d64b747..5313c0ab 100644 --- a/src/main/java/com/esri/core/geometry/JsonParserReader.java +++ b/src/main/java/com/esri/core/geometry/JsonParserReader.java @@ -35,10 +35,6 @@ public class JsonParserReader implements JsonReader { private JsonParser m_jsonParser; - /** - * @deprecated Use createFromString(String) - */ - @Deprecated // Intended for internal use only. public JsonParserReader(JsonParser jsonParser) { m_jsonParser = jsonParser; }