From 324d7e24e5f02f0328a2ab35501238aea5674755 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Wed, 24 Jan 2024 16:32:10 +0100 Subject: fix: don't try to recreate the routemap file --- .../java/foo/zaaarf/routecompass/RouteCompass.java | 30 ++++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/foo/zaaarf/routecompass/RouteCompass.java b/src/main/java/foo/zaaarf/routecompass/RouteCompass.java index 7279fbe..269dfb1 100644 --- a/src/main/java/foo/zaaarf/routecompass/RouteCompass.java +++ b/src/main/java/foo/zaaarf/routecompass/RouteCompass.java @@ -29,6 +29,11 @@ import java.util.stream.Collectors; @SupportedSourceVersion(SourceVersion.RELEASE_8) public class RouteCompass extends AbstractProcessor { + /** + * The filename of the output. + */ + private static final String ROUTE_MAP_FILENAME = "route_map"; + /** * A {@link Map} tying each component class to the routes it contains. */ @@ -38,7 +43,7 @@ public class RouteCompass extends AbstractProcessor { * A {@link Set} containing all the supported annotation classes. */ private final Set> annotationClasses = new HashSet<>(); - + /** * Default constructor, it only initialises {@link #annotationClasses}. */ @@ -85,11 +90,23 @@ public class RouteCompass extends AbstractProcessor { } try { - FileObject serviceProvider = this.processingEnv.getFiler().createResource( - StandardLocation.SOURCE_OUTPUT, "", "route_map" + CharSequence startingContents; + try { + FileObject existingRouteMap = this.processingEnv.getFiler().getResource( + StandardLocation.SOURCE_OUTPUT, "", ROUTE_MAP_FILENAME + ); + startingContents = existingRouteMap.getCharContent(true); + existingRouteMap.delete(); + } catch (IOException ex) { + startingContents = ""; + } + + FileObject routeMap = this.processingEnv.getFiler().createResource( + StandardLocation.SOURCE_OUTPUT, "", ROUTE_MAP_FILENAME ); - PrintWriter out = new PrintWriter(serviceProvider.openWriter()); + PrintWriter out = new PrintWriter(routeMap.openWriter()); + out.println(startingContents); //print with an extra newline for(String componentClass : this.foundRoutes.keySet()) { out.println(componentClass + ":"); @@ -152,7 +169,10 @@ public class RouteCompass extends AbstractProcessor { String parent = this.getFullRoute(a, e)[0]; for(int i = 0; i < routes.length; i++) { StringBuilder sb = new StringBuilder(parent); - if(!parent.endsWith("/")) sb.append("/"); + if(!parent.endsWith("/") && !routes[i].startsWith("/")) + sb.append("/"); + if(parent.endsWith("/") && routes[i].startsWith("/")) + sb.deleteCharAt(sb.length() - 1); sb.append(routes[i]); routes[i] = sb.toString(); } -- cgit v1.2.3-56-ga3b1