simplify

Author: jaydeluca

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/DocGeneratorApplication.java

@@ -30,15 +30,16 @@ public static void main(String[] args) throws IOException {
     String baseRepoPath = System.getProperty("basePath");
     if (baseRepoPath == null) {
       baseRepoPath = "./";
+    } else {
+      baseRepoPath += "/";
     }
 
     FileManager fileManager = new FileManager(baseRepoPath);
     List<InstrumentationModule> modules = new InstrumentationAnalyzer(fileManager).analyze();
 
     try (BufferedWriter writer =
         Files.newBufferedWriter(
-            Paths.get(baseRepoPath + "/docs/instrumentation-list.yaml"),
-            Charset.defaultCharset())) {
+            Paths.get(baseRepoPath + "docs/instrumentation-list.yaml"), Charset.defaultCharset())) {
       writer.write("# This file is generated and should not be manually edited.\n");
       writer.write("# The structure and contents are a work in progress and subject to change.\n");
       writer.write(

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/InstrumentationAnalyzer.java

@@ -63,11 +63,7 @@ public static List<InstrumentationModule> convertToInstrumentationModules(
   }
 
   private static String sanitizePathName(String rootPath, String path) {
-    String result = path.replace(rootPath, "").replace("/javaagent", "").replace("/library", "");
-    if (result.startsWith("/")) {
-      result = result.substring(1);
-    }
-    return result;
+    return path.replace(rootPath, "").replace("/javaagent", "").replace("/library", "");
   }
 
   /**

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/utils/FileManager.java

@@ -21,7 +21,7 @@ public record FileManager(String rootDir) {
   private static final Logger logger = Logger.getLogger(FileManager.class.getName());
 
   public List<InstrumentationPath> getInstrumentationPaths() throws IOException {
-    Path rootPath = Paths.get(rootDir + "/instrumentation");
+    Path rootPath = Paths.get(rootDir + "instrumentation");
 
     try (Stream<Path> walk = Files.walk(rootPath)) {
       return walk.filter(Files::isDirectory)
@@ -77,7 +77,7 @@ public static boolean isValidInstrumentationPath(String filePath) {
   }
 
   public List<String> findBuildGradleFiles(String instrumentationDirectory) {
-    Path rootPath = Paths.get(rootDir + "/" + instrumentationDirectory);
+    Path rootPath = Paths.get(rootDir + instrumentationDirectory);
 
     try (Stream<Path> walk = Files.walk(rootPath)) {
       return walk.filter(Files::isRegularFile)
@@ -95,7 +95,7 @@ public List<String> findBuildGradleFiles(String instrumentationDirectory) {
 
   @Nullable
   public String getMetaDataFile(String instrumentationDirectory) {
-    String metadataFile = rootDir + "/" + instrumentationDirectory + "/metadata.yaml";
+    String metadataFile = rootDir + instrumentationDirectory + "/metadata.yaml";
     if (Files.exists(Paths.get(metadataFile))) {
       return readFileToString(metadataFile);
     }

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/utils/FileManagerTest.java

@@ -24,7 +24,7 @@ class FileManagerTest {
 
   @BeforeEach
   void setUp() {
-    fileManager = new FileManager(tempDir.toString());
+    fileManager = new FileManager(tempDir.toString() + "/");
   }
 
   @Test