Ticket #22432: 22432.patch

File 22432.patch, 30.3 KB (added by taylor.smock, 3 years ago)

  • src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java
    a b  
    55import java.util.Objects;
    66import java.util.stream.Collectors;
    77
    8 import javax.json.JsonArray;
    9 import javax.json.JsonObject;
    10 import javax.json.JsonString;
    11 import javax.json.JsonValue;
     8import jakarta.json.JsonArray;
     9import jakarta.json.JsonObject;
     10import jakarta.json.JsonString;
     11import jakarta.json.JsonValue;
    1212
    1313/**
    1414 * A Mapbox vector style expression (immutable)

  • src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java
    a b  
    1414import java.util.stream.Collectors;
    1515import java.util.stream.Stream;
    1616
    17 import javax.json.JsonArray;
    18 import javax.json.JsonNumber;
    19 import javax.json.JsonObject;
    20 import javax.json.JsonString;
    21 import javax.json.JsonValue;
    22 
     17import jakarta.json.JsonArray;
     18import jakarta.json.JsonNumber;
     19import jakarta.json.JsonObject;
     20import jakarta.json.JsonString;
     21import jakarta.json.JsonValue;
    2322import org.openstreetmap.josm.gui.mappaint.StyleKeys;
    2423import org.openstreetmap.josm.tools.Utils;
    2524

  • src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java
    a b  
    2323import java.util.stream.Collectors;
    2424
    2525import javax.imageio.ImageIO;
    26 import javax.json.Json;
    27 import javax.json.JsonObject;
    28 import javax.json.JsonReader;
    29 import javax.json.JsonValue;
    3026
     27import jakarta.json.Json;
     28import jakarta.json.JsonObject;
     29import jakarta.json.JsonReader;
     30import jakarta.json.JsonValue;
    3131import org.openstreetmap.josm.data.imagery.vectortile.mapbox.InvalidMapboxVectorTileException;
    3232import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
    3333import org.openstreetmap.josm.gui.MainApplication;

  • src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java
    a b  
    1111import java.util.Objects;
    1212import java.util.function.IntFunction;
    1313
    14 import javax.json.JsonArray;
    15 import javax.json.JsonObject;
    16 import javax.json.JsonString;
    17 import javax.json.JsonValue;
    18 
     14import jakarta.json.JsonArray;
     15import jakarta.json.JsonObject;
     16import jakarta.json.JsonString;
     17import jakarta.json.JsonValue;
    1918import org.openstreetmap.josm.data.Bounds;
    2019import org.openstreetmap.josm.data.imagery.vectortile.mapbox.InvalidMapboxVectorTileException;
    2120

  • src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java
    a b  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.imagery.vectortile.mapbox;
     3
    34import static org.openstreetmap.josm.tools.I18n.tr;
    45
    56import java.io.IOException;
    … …  
    910import java.util.Objects;
    1011import java.util.stream.Collectors;
    1112
    12 import javax.json.Json;
    13 import javax.json.JsonException;
    14 import javax.json.JsonObject;
    15 import javax.json.JsonReader;
    16 
     13import jakarta.json.Json;
     14import jakarta.json.JsonException;
     15import jakarta.json.JsonObject;
     16import jakarta.json.JsonReader;
    1717import org.openstreetmap.josm.data.imagery.ImageryInfo;
    1818import org.openstreetmap.josm.data.imagery.JosmTemplatedTMSTileSource;
    1919import org.openstreetmap.josm.data.imagery.vectortile.mapbox.style.MapboxVectorStyle;

  • src/org/openstreetmap/josm/data/imagery/DefaultLayer.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java b/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java
    a b  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
    6 import javax.json.Json;
    7 import javax.json.JsonObject;
    8 import javax.json.JsonObjectBuilder;
    9 
     6import jakarta.json.Json;
     7import jakarta.json.JsonObject;
     8import jakarta.json.JsonObjectBuilder;
    109import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
    1110
    1211/**

  • src/org/openstreetmap/josm/data/imagery/ImageryInfo.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
    a b  
    1919import java.util.regex.Pattern;
    2020import java.util.stream.Collectors;
    2121
    22 import javax.json.Json;
    23 import javax.json.JsonObject;
    24 import javax.json.JsonReader;
    2522import javax.swing.ImageIcon;
    2623
     24import jakarta.json.Json;
     25import jakarta.json.JsonObject;
     26import jakarta.json.JsonReader;
    2727import org.openstreetmap.josm.data.StructUtils.StructEntry;
    2828import org.openstreetmap.josm.data.sources.ISourceCategory;
    2929import org.openstreetmap.josm.data.sources.ISourceType;

  • src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java b/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java
    a b  
    33
    44import java.util.Map;
    55
    6 import javax.json.stream.JsonCollectors;
    7 
     6import jakarta.json.stream.JsonCollectors;
    87import org.openstreetmap.josm.data.StructUtils.StructEntry;
    98import org.openstreetmap.josm.data.imagery.DefaultLayer;
    109import org.openstreetmap.josm.data.imagery.Shape;

  • src/org/openstreetmap/josm/data/StructUtils.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/StructUtils.java b/src/org/openstreetmap/josm/data/StructUtils.java
    a b  
    1919import java.util.Set;
    2020import java.util.stream.Collectors;
    2121
    22 import javax.json.Json;
    23 import javax.json.JsonArray;
    24 import javax.json.JsonArrayBuilder;
    25 import javax.json.JsonObject;
    26 import javax.json.JsonObjectBuilder;
    27 import javax.json.JsonReader;
    28 import javax.json.JsonString;
    29 import javax.json.JsonValue;
    30 import javax.json.JsonWriter;
    31 
     22import jakarta.json.Json;
     23import jakarta.json.JsonArray;
     24import jakarta.json.JsonArrayBuilder;
     25import jakarta.json.JsonObject;
     26import jakarta.json.JsonObjectBuilder;
     27import jakarta.json.JsonReader;
     28import jakarta.json.JsonString;
     29import jakarta.json.JsonValue;
     30import jakarta.json.JsonWriter;
    3231import org.openstreetmap.josm.spi.preferences.IPreferences;
    3332import org.openstreetmap.josm.tools.JosmRuntimeException;
    3433import org.openstreetmap.josm.tools.Logging;

  • src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java b/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java
    a b  
    99import java.util.Arrays;
    1010import java.util.Locale;
    1111
    12 import javax.json.JsonException;
    1312import javax.swing.JOptionPane;
    1413
     14import jakarta.json.JsonException;
    1515import org.openstreetmap.josm.actions.ExtensionFileFilter;
    1616import org.openstreetmap.josm.data.osm.DataSet;
    1717import org.openstreetmap.josm.gui.MainApplication;

  • src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
    a b  
    77import java.util.Collection;
    88import java.util.stream.Collectors;
    99
    10 import javax.json.Json;
    11 import javax.json.JsonArray;
    12 import javax.json.JsonArrayBuilder;
    13 import javax.json.JsonObject;
    14 import javax.json.JsonObjectBuilder;
    15 
     10import jakarta.json.Json;
     11import jakarta.json.JsonArray;
     12import jakarta.json.JsonArrayBuilder;
     13import jakarta.json.JsonObject;
     14import jakarta.json.JsonObjectBuilder;
    1615import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
    1716import org.openstreetmap.josm.io.remotecontrol.RequestProcessor;
    1817

  • src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java
    a b  
    88import java.util.Arrays;
    99import java.util.stream.Stream;
    1010
    11 import javax.json.Json;
    12 import javax.json.JsonArrayBuilder;
    13 import javax.json.JsonObjectBuilder;
    14 
     11import jakarta.json.Json;
     12import jakarta.json.JsonArrayBuilder;
     13import jakarta.json.JsonObjectBuilder;
    1514import org.openstreetmap.josm.data.preferences.JosmUrls;
    1615import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
    1716import org.openstreetmap.josm.io.remotecontrol.RemoteControl;

  • src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
    a b  
    2424import java.util.regex.Pattern;
    2525import java.util.stream.Stream;
    2626
    27 import javax.json.Json;
    28 
     27import jakarta.json.Json;
    2928import org.openstreetmap.josm.data.Version;
    3029import org.openstreetmap.josm.gui.help.HelpUtil;
    3130import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler;

  • src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java b/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java
    a b  
    55import java.util.Optional;
    66import java.util.stream.Stream;
    77
    8 import javax.json.Json;
    9 import javax.json.JsonArray;
    10 import javax.json.JsonArrayBuilder;
    11 import javax.json.JsonObject;
    12 import javax.json.JsonObjectBuilder;
    13 import javax.json.JsonValue;
    14 
     8import jakarta.json.Json;
     9import jakarta.json.JsonArray;
     10import jakarta.json.JsonArrayBuilder;
     11import jakarta.json.JsonObject;
     12import jakarta.json.JsonObjectBuilder;
     13import jakarta.json.JsonValue;
    1514import org.openstreetmap.josm.data.osm.DataSet;
    1615import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1716import org.openstreetmap.josm.data.osm.WaySegment;

  • src/org/openstreetmap/josm/io/GeoJSONReader.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/GeoJSONReader.java b/src/org/openstreetmap/josm/io/GeoJSONReader.java
    a b  
    1818import java.util.Optional;
    1919import java.util.stream.Collectors;
    2020
    21 import javax.json.Json;
    22 import javax.json.JsonArray;
    23 import javax.json.JsonNumber;
    24 import javax.json.JsonObject;
    25 import javax.json.JsonString;
    26 import javax.json.JsonValue;
    27 import javax.json.stream.JsonParser;
    28 import javax.json.stream.JsonParser.Event;
    29 import javax.json.stream.JsonParsingException;
    30 
     21import jakarta.json.Json;
     22import jakarta.json.JsonArray;
     23import jakarta.json.JsonNumber;
     24import jakarta.json.JsonObject;
     25import jakarta.json.JsonString;
     26import jakarta.json.JsonValue;
     27import jakarta.json.stream.JsonParser;
     28import jakarta.json.stream.JsonParser.Event;
     29import jakarta.json.stream.JsonParsingException;
    3130import org.openstreetmap.josm.data.coor.EastNorth;
    3231import org.openstreetmap.josm.data.coor.LatLon;
    3332import org.openstreetmap.josm.data.osm.BBox;

  • src/org/openstreetmap/josm/io/GeoJSONWriter.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/GeoJSONWriter.java b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
    a b  
    2020import java.util.stream.Collectors;
    2121import java.util.stream.Stream;
    2222
    23 import javax.json.Json;
    24 import javax.json.JsonArrayBuilder;
    25 import javax.json.JsonObject;
    26 import javax.json.JsonObjectBuilder;
    27 import javax.json.JsonValue;
    28 import javax.json.JsonWriter;
    29 import javax.json.stream.JsonGenerator;
    30 import javax.json.stream.JsonParser;
    31 import javax.json.stream.JsonParsingException;
    32 
     23import jakarta.json.Json;
     24import jakarta.json.JsonArrayBuilder;
     25import jakarta.json.JsonObject;
     26import jakarta.json.JsonObjectBuilder;
     27import jakarta.json.JsonValue;
     28import jakarta.json.JsonWriter;
     29import jakarta.json.stream.JsonGenerator;
     30import jakarta.json.stream.JsonParser;
     31import jakarta.json.stream.JsonParsingException;
    3332import org.openstreetmap.josm.data.Bounds;
    3433import org.openstreetmap.josm.data.coor.EastNorth;
    3534import org.openstreetmap.josm.data.coor.ILatLon;

  • src/org/openstreetmap/josm/io/OsmJsonReader.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/OsmJsonReader.java b/src/org/openstreetmap/josm/io/OsmJsonReader.java
    a b  
    77import java.util.Collection;
    88import java.util.Map.Entry;
    99
    10 import javax.json.Json;
    11 import javax.json.JsonArray;
    12 import javax.json.JsonNumber;
    13 import javax.json.JsonObject;
    14 import javax.json.JsonString;
    15 import javax.json.JsonValue;
    16 import javax.json.stream.JsonParser;
    17 import javax.json.stream.JsonParser.Event;
    18 
     10import jakarta.json.Json;
     11import jakarta.json.JsonArray;
     12import jakarta.json.JsonNumber;
     13import jakarta.json.JsonObject;
     14import jakarta.json.JsonString;
     15import jakarta.json.JsonValue;
     16import jakarta.json.stream.JsonParser;
     17import jakarta.json.stream.JsonParser.Event;
    1918import org.openstreetmap.josm.data.osm.DataSet;
    2019import org.openstreetmap.josm.data.osm.PrimitiveData;
    2120import org.openstreetmap.josm.data.osm.RelationData;

  • src/org/openstreetmap/josm/tools/Tag2Link.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/tools/Tag2Link.java b/src/org/openstreetmap/josm/tools/Tag2Link.java
    a b  
    2222import java.util.regex.Pattern;
    2323import java.util.stream.Collectors;
    2424
    25 import javax.json.Json;
    26 import javax.json.JsonArray;
    27 import javax.json.JsonReader;
    28 import javax.json.JsonValue;
    29 
     25import jakarta.json.Json;
     26import jakarta.json.JsonArray;
     27import jakarta.json.JsonReader;
     28import jakarta.json.JsonValue;
    3029import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    3130import org.openstreetmap.josm.data.osm.OsmUtils;
    3231import org.openstreetmap.josm.data.preferences.CachingProperty;

  • src/org/openstreetmap/josm/tools/Territories.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/tools/Territories.java b/src/org/openstreetmap/josm/tools/Territories.java
    a b  
    2121import java.util.stream.Collectors;
    2222import java.util.stream.Stream;
    2323
    24 import javax.json.Json;
    25 import javax.json.JsonArray;
    26 import javax.json.JsonString;
    27 import javax.json.JsonValue;
    28 import javax.json.stream.JsonParser;
    29 import javax.json.stream.JsonParser.Event;
    30 import javax.json.stream.JsonParsingException;
    31 
     24import jakarta.json.Json;
     25import jakarta.json.JsonArray;
     26import jakarta.json.JsonString;
     27import jakarta.json.JsonValue;
     28import jakarta.json.stream.JsonParser;
     29import jakarta.json.stream.JsonParser.Event;
     30import jakarta.json.stream.JsonParsingException;
    3231import org.openstreetmap.josm.data.coor.LatLon;
    3332import org.openstreetmap.josm.data.osm.DataSet;
    3433import org.openstreetmap.josm.data.osm.Node;

  • test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java b/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java
    a b  
    99import java.util.ArrayList;
    1010import java.util.List;
    1111
    12 import javax.json.Json;
    13 import javax.json.JsonObject;
    14 import javax.json.JsonReader;
    15 import javax.json.JsonValue;
    16 
     12import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     13import jakarta.json.Json;
     14import jakarta.json.JsonObject;
     15import jakarta.json.JsonReader;
     16import jakarta.json.JsonValue;
    1717import org.junit.jupiter.api.Test;
    1818import org.junit.jupiter.api.extension.RegisterExtension;
    1919import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    2525import org.openstreetmap.josm.tools.HttpClient;
    2626import org.xml.sax.SAXException;
    2727
    28 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    29 
    3028/**
    3129 * Various integration tests with Taginfo.
    3230 */

  • test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java
    a b  
    33
    44import static org.junit.jupiter.api.Assertions.assertEquals;
    55
    6 
    7 import javax.json.Json;
    8 import javax.json.JsonValue;
    9 
     6import jakarta.json.Json;
     7import jakarta.json.JsonValue;
    108import nl.jqno.equalsverifier.EqualsVerifier;
    119import org.junit.jupiter.api.Test;
    1210

  • test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java
    a b  
    99import java.text.MessageFormat;
    1010import java.util.Locale;
    1111
    12 import javax.json.Json;
    13 import javax.json.JsonObject;
    14 import javax.json.JsonValue;
    15 
     12import jakarta.json.Json;
     13import jakarta.json.JsonObject;
     14import jakarta.json.JsonValue;
    1615import nl.jqno.equalsverifier.EqualsVerifier;
    1716import org.junit.jupiter.api.Test;
    1817

  • test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java
    a b  
    2828import java.util.stream.Collectors;
    2929
    3030import javax.imageio.ImageIO;
    31 import javax.json.Json;
    32 import javax.json.JsonObject;
    33 import javax.json.JsonObjectBuilder;
    34 import javax.json.JsonReader;
    35 import javax.json.JsonStructure;
    36 import javax.json.JsonValue;
    3731
     32import jakarta.json.Json;
     33import jakarta.json.JsonObject;
     34import jakarta.json.JsonObjectBuilder;
     35import jakarta.json.JsonReader;
     36import jakarta.json.JsonStructure;
     37import jakarta.json.JsonValue;
     38import nl.jqno.equalsverifier.EqualsVerifier;
    3839import org.awaitility.Awaitility;
    3940import org.awaitility.Durations;
    4041import org.junit.jupiter.api.Test;
    … …  
    5253import org.openstreetmap.josm.tools.ColorHelper;
    5354import org.openstreetmap.josm.tools.ImageProvider;
    5455
    55 import nl.jqno.equalsverifier.EqualsVerifier;
    56 
    5756/**
    5857 * Test class for {@link MapboxVectorStyle}
    5958 * @author Taylor Smock

  • test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java
    a b  
    77import static org.junit.jupiter.api.Assertions.assertThrows;
    88import static org.junit.jupiter.api.Assertions.assertTrue;
    99
    10 
    1110import java.util.Locale;
    1211import java.util.stream.Collectors;
    1312import java.util.stream.Stream;
    1413
    15 import javax.json.Json;
    16 import javax.json.JsonObject;
    17 import javax.json.JsonValue;
    18 
    19 import org.openstreetmap.josm.data.Bounds;
    20 
     14import jakarta.json.Json;
     15import jakarta.json.JsonObject;
     16import jakarta.json.JsonValue;
    2117import nl.jqno.equalsverifier.EqualsVerifier;
    2218import org.junit.jupiter.api.Test;
     19import org.openstreetmap.josm.data.Bounds;
    2320import org.openstreetmap.josm.data.imagery.vectortile.mapbox.InvalidMapboxVectorTileException;
    2421
    2522/**

  • test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java b/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java
    a b  
    2424import java.util.stream.Collectors;
    2525import java.util.stream.Stream;
    2626
    27 import javax.json.Json;
    28 import javax.json.JsonObject;
    29 import javax.json.JsonReader;
    3027import javax.swing.SwingUtilities;
    3128
     29import jakarta.json.Json;
     30import jakarta.json.JsonObject;
     31import jakarta.json.JsonReader;
     32import mockit.Mock;
     33import mockit.MockUp;
    3234import org.junit.jupiter.api.AfterEach;
    3335import org.junit.jupiter.api.BeforeEach;
    3436import org.junit.jupiter.api.Test;
    … …  
    4951import org.openstreetmap.josm.tools.Logging;
    5052import org.openstreetmap.josm.tools.Utils;
    5153
    52 import mockit.Mock;
    53 import mockit.MockUp;
    54 
    5554/**
    5655 * Test class for {@link ValidatorCLI}
    5756 * @author Taylor Smock

  • test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java b/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java
    a b  
    77import java.net.HttpURLConnection;
    88import java.net.URL;
    99
    10 import javax.json.Json;
    11 
     10import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     11import jakarta.json.Json;
    1212import org.junit.jupiter.api.Test;
    1313import org.junit.jupiter.api.extension.RegisterExtension;
    1414import org.openstreetmap.josm.testutils.JOSMTestRules;
    1515
    16 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    17 
    1816/**
    1917 * Integration tests of {@link PlatformHook} class.
    2018 */

  • ivy.xml 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/ivy.xml b/ivy.xml
    a b  
    2121    <dependencies>
    2222        <!-- api->default -->
    2323        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
     24        <!-- Note: javax is being replaced by jakarta. Keeping for plugin compatibility reasons (remove sometime in 2023). -->
    2425        <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    2526        <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
     27        <dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.0.2"/>
     28        <dependency conf="api->default" org="org.glassfish" name="jakarta.json" rev="2.0.2"/>
    2629        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.1"/>
    2730        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.21"/>
    2831        <dependency conf="api->default" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>