Skip to content

Commit cdb1889

Browse files
committed
drop deprecated isBlank usage
1 parent 3bca38d commit cdb1889

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public DataConflationSender(MapWithAICategory category, DataSet openstreetmap, D
6868
@Override
6969
public void run() {
7070
String url = MapWithAIConflationCategory.conflationUrlFor(category);
71-
if (!Utils.isBlank(url) && !NetworkManager.isOffline(url)) {
71+
if (!Utils.isStripEmpty(url) && !NetworkManager.isOffline(url)) {
7272
this.client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
7373
try {
7474
final var form = new TreeMap<String, String>();

src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ public static void replaceTags(DataSet dataSet) {
403403
.map(entry -> new Pair<>(Tag.ofString(entry.getKey()), Tag.ofString(entry.getValue())))
404404
.collect(Collectors.toMap(pair -> pair.a, pair -> pair.b));
405405
MapWithAIPreferenceHelper.getReplacementTags().entrySet().stream()
406-
.filter(entry -> !entry.getKey().equals(EQUALS) && Utils.isBlank(entry.getValue()))
406+
.filter(entry -> !entry.getKey().equals(EQUALS) && Utils.isStripEmpty(entry.getValue()))
407407
.map(entry -> new Tag(entry.getKey(), null)).forEach(tag -> replaceTags.put(tag, tag));
408408
replaceTags(dataSet, replaceTags);
409409
}
@@ -417,7 +417,7 @@ public static void replaceTags(DataSet dataSet) {
417417
public static void replaceTags(DataSet dataSet, Map<Tag, Tag> replaceTags) {
418418
replaceTags.forEach((orig, replace) -> dataSet.allNonDeletedPrimitives().stream()
419419
.filter(prim -> prim.hasTag(orig.getKey(), orig.getValue())
420-
|| (prim.hasKey(orig.getKey()) && Utils.isBlank(orig.getValue())))
420+
|| (prim.hasKey(orig.getKey()) && Utils.isStripEmpty(orig.getValue())))
421421
.forEach(prim -> prim.put(replace)));
422422
}
423423

src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static DataSet getData(Collection<Bounds> bounds, int maximumDimensions)
128128
realBounds.size() * urls.size());
129129
for (var bound : realBounds) {
130130
for (var url : urls) {
131-
if (url.getUrl() != null && !Utils.isBlank(url.getUrl())) {
131+
if (url.getUrl() != null && !Utils.isStripEmpty(url.getUrl())) {
132132
final var ds = download(monitor, bound, url, maximumDimensions);
133133
downloadedDataSets.add(ds);
134134
MapWithAIDataUtils.getForkJoinPool().execute(ds);

0 commit comments

Comments
 (0)