From a0cd4fa8640a3c0e4f5402f90126e28df0bf6d93 Mon Sep 17 00:00:00 2001 From: Michael Barry Date: Thu, 26 Oct 2023 07:07:34 -0400 Subject: [PATCH] Upgrade eclipse formatter (#696) --- .../custommap/ConfigExpressionParser.java | 2 +- .../planetiler/custommap/TypeConversion.java | 2 +- .../expression/BooleanExpressionScript.java | 2 +- .../custommap/expression/ConfigExpression.java | 16 ++++++++-------- .../custommap/expression/ScriptEnvironment.java | 2 +- .../planetiler/examples/BikeRouteOverlay.java | 10 +++++----- pom.xml | 10 ++++++++-- 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java index beaf5bca..1137bfff 100644 --- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java +++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/ConfigExpressionParser.java @@ -86,7 +86,7 @@ public class ConfigExpressionParser { return cast(signature(output), child, dataType); } else { var keys = map.keySet(); - if (keys.equals(Set.of("coalesce")) && map.get("coalesce")instanceof Collection cases) { + if (keys.equals(Set.of("coalesce")) && map.get("coalesce") instanceof Collection cases) { return coalesce(cases.stream().map(item -> parse(item, output)).toList()); } else if (keys.equals(Set.of("match"))) { return parseMatch(map.get("match"), true, output); diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/TypeConversion.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/TypeConversion.java index 124a4cfd..0b9b45ee 100644 --- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/TypeConversion.java +++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/TypeConversion.java @@ -65,7 +65,7 @@ public class TypeConversion { return d % 1 == 0 ? Long.toString(d.longValue()) : d.toString(); } - private record Converter (Class in, Class out, Function fn) implements Function { + private record Converter(Class in, Class out, Function fn) implements Function { @Override public O apply(Object in) { @SuppressWarnings("unchecked") I converted = (I) in; diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/BooleanExpressionScript.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/BooleanExpressionScript.java index fbc2b9ed..a8c5c566 100644 --- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/BooleanExpressionScript.java +++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/BooleanExpressionScript.java @@ -15,7 +15,7 @@ import java.util.Objects; * * @param Type of the expression context */ -public record BooleanExpressionScript ( +public record BooleanExpressionScript( String expressionText, ConfigExpressionScript expression, Class inputClass diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java index 1ccf4994..58bcf473 100644 --- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java +++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ConfigExpression.java @@ -70,7 +70,7 @@ public interface ConfigExpression } /** An expression that always returns {@code value}. */ - record Const (O value) implements ConfigExpression { + record Const(O value) implements ConfigExpression { @Override public O apply(I i) { @@ -79,7 +79,7 @@ public interface ConfigExpression } /** An expression that returns the value associated with the first matching boolean expression. */ - record Match ( + record Match( Signature signature, MultiExpression> multiExpression, ConfigExpression fallback, @@ -146,7 +146,7 @@ public interface ConfigExpression } /** An expression that returns the first non-null result of evaluating each child expression. */ - record Coalesce (List> children) + record Coalesce(List> children) implements ConfigExpression { @Override @@ -184,7 +184,7 @@ public interface ConfigExpression } /** An expression that returns the value associated a given variable name at runtime. */ - record Variable ( + record Variable( Signature signature, String name ) implements ConfigExpression { @@ -202,7 +202,7 @@ public interface ConfigExpression } /** An expression that returns the value associated a given tag of the input feature at runtime. */ - record GetTag ( + record GetTag( Signature signature, ConfigExpression tag ) implements ConfigExpression { @@ -219,7 +219,7 @@ public interface ConfigExpression } /** An expression that returns the value associated a given argument at runtime. */ - record GetArg ( + record GetArg( Signature signature, ConfigExpression arg ) implements ConfigExpression { @@ -242,7 +242,7 @@ public interface ConfigExpression } /** An expression that converts the input to a desired output {@link DataType} at runtime. */ - record Cast ( + record Cast( Signature signature, ConfigExpression input, DataType output @@ -268,7 +268,7 @@ public interface ConfigExpression } } - record Signature (ScriptEnvironment in, Class out) { + record Signature(ScriptEnvironment in, Class out) { public Signature withOutput(Class newOut) { return new Signature<>(in, newOut); diff --git a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ScriptEnvironment.java b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ScriptEnvironment.java index 244a4122..db56016d 100644 --- a/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ScriptEnvironment.java +++ b/planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/expression/ScriptEnvironment.java @@ -12,7 +12,7 @@ import java.util.stream.Stream; * @param clazz Class of the input context type * @param The runtime expression context type */ -public record ScriptEnvironment (List declarations, Class clazz, Contexts.Root root) { +public record ScriptEnvironment(List declarations, Class clazz, Contexts.Root root) { private static List concat(List a, List b) { return Stream.concat(a.stream(), b.stream()).toList(); } diff --git a/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/BikeRouteOverlay.java b/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/BikeRouteOverlay.java index 719b5629..46abb3b1 100644 --- a/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/BikeRouteOverlay.java +++ b/planetiler-examples/src/main/java/com/onthegomap/planetiler/examples/BikeRouteOverlay.java @@ -64,11 +64,11 @@ public class BikeRouteOverlay implements Profile { relation.getString("route"), // except map network abbreviation to a human-readable value switch (relation.getString("network", "")) { - case "icn" -> "international"; - case "ncn" -> "national"; - case "rcn" -> "regional"; - case "lcn" -> "local"; - default -> "other"; + case "icn" -> "international"; + case "ncn" -> "national"; + case "rcn" -> "regional"; + case "lcn" -> "local"; + default -> "other"; } )); } diff --git a/pom.xml b/pom.xml index bd17f4d1..b6c6e759 100644 --- a/pom.xml +++ b/pom.xml @@ -175,10 +175,16 @@ 2.40.0 + + *.java + + + planetiler-openmaptiles/**/*.java + - 4.21.0 + 4.29 ${maven.multiModuleProjectDirectory}/eclipse-formatter.xml @@ -256,7 +262,7 @@ - +