diff --git a/build.gradle b/build.gradle index 1f45f57c..15f3a215 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ plugins { id 'eclipse' id 'application' id 'org.graalvm.buildtools.native' version '0.10.4' + id 'org.jetbrains.kotlin.jvm' } // Get the version from the property file first @@ -30,8 +31,6 @@ repositories { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 } if (project.hasProperty('mainClass')) { @@ -121,7 +120,8 @@ dependencies { implementation('org.jgrapht:jgrapht-core:1.5.2') implementation('org.jgrapht:jgrapht-io:1.5.2') implementation('org.jgrapht:jgrapht-ext:1.5.2') - implementation('com.github.javaparser:javaparser-symbol-solver-core:3.25.9') + implementation('com.github.javaparser:javaparser-symbol-solver-core:3.26.3') + implementation('com.github.javaparser:javaparser-core:3.26.3') // TestContainers testImplementation 'org.testcontainers:testcontainers:1.19.3' @@ -135,6 +135,7 @@ dependencies { // SLF4J - for TestContainers logging testImplementation 'org.slf4j:slf4j-api:2.0.9' testImplementation 'org.slf4j:slf4j-simple:2.0.9' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } @@ -277,3 +278,6 @@ tasks.register('bumpVersion') { } nativeCompile.finalizedBy copyNativeExecutable + kotlin { + jvmToolchain(11) + } diff --git a/gradle.properties b/gradle.properties index 27c008ae..7ad95fa5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=2.2.1 +version=2.3.0 diff --git a/settings.gradle b/settings.gradle index 2d7bdb7d..1ecb355f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,11 @@ -/* +pluginManagement { + plugins { + id 'org.jetbrains.kotlin.jvm' version '2.1.10' + } +} +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +}/* Copyright IBM Corporation 2023, 2024 Licensed under the Apache Public License 2.0, Version 2.0 (the "License"); diff --git a/src/main/java/com/ibm/cldk/SymbolTable.java b/src/main/java/com/ibm/cldk/SymbolTable.java index 521144c4..2dbef6d2 100644 --- a/src/main/java/com/ibm/cldk/SymbolTable.java +++ b/src/main/java/com/ibm/cldk/SymbolTable.java @@ -33,6 +33,7 @@ import com.ibm.cldk.entities.*; import com.ibm.cldk.utils.Log; import org.apache.commons.lang3.tuple.Pair; +import org.checkerframework.checker.units.qual.C; import java.io.IOException; import java.nio.file.Path; @@ -110,8 +111,7 @@ private static JavaCompilationUnit processCompilationUnit(CompilationUnit parseR cUnit.setTypeDeclarations(parseResult.findAll(TypeDeclaration.class).stream().filter(typeDecl -> typeDecl.getFullyQualifiedName().isPresent()).map(typeDecl -> { // get type name and initialize the type object String typeName = typeDecl.getFullyQualifiedName().get().toString(); - com.ibm.cldk.entities.Type typeNode = new com.ibm.cldk.entities.Type(); - + com.ibm.cldk.entities.Type typeNode = new com.ibm.cldk.entities.Type();; if (typeDecl instanceof ClassOrInterfaceDeclaration) { ClassOrInterfaceDeclaration classDecl = (ClassOrInterfaceDeclaration) typeDecl; @@ -146,8 +146,26 @@ private static JavaCompilationUnit processCompilationUnit(CompilationUnit parseR // Add enum constants typeNode.setEnumConstants(enumDecl.getEntries().stream().map(SymbolTable::processEnumConstantDeclaration).collect(Collectors.toList())); + } + else if (typeDecl instanceof RecordDeclaration) { + RecordDeclaration recordDecl = (RecordDeclaration) typeDecl; - } else { + // Set that this is a record declaration + typeNode.setRecordDeclaration(typeDecl.isRecordDeclaration()); + + // Add interfaces implemented by record + typeNode.setImplementsList(recordDecl.getImplementedTypes().stream().map(SymbolTable::resolveType).collect(Collectors.toList())); + + // Add record modifiers + typeNode.setModifiers(recordDecl.getModifiers().stream().map(m -> m.toString().strip()).collect(Collectors.toList())); + + // Add record annotations + typeNode.setAnnotations(recordDecl.getAnnotations().stream().map(a -> a.toString().strip()).collect(Collectors.toList())); + + // Add record components + typeNode.setRecordComponents(processRecordComponents(recordDecl)); + } + else { // TODO: handle AnnotationDeclaration, RecordDeclaration // set the common type attributes only Log.warn("Found unsupported type declaration: " + typeDecl.toString()); @@ -162,7 +180,6 @@ private static JavaCompilationUnit processCompilationUnit(CompilationUnit parseR typeNode.setClassOrInterfaceDeclaration(typeDecl.isClassOrInterfaceDeclaration()); typeNode.setEnumDeclaration(typeDecl.isEnumDeclaration()); typeNode.setAnnotationDeclaration(typeDecl.isAnnotationDeclaration()); - typeNode.setRecordDeclaration(typeDecl.isRecordDeclaration()); // Add class comment typeNode.setComment(typeDecl.getComment().isPresent() ? typeDecl.getComment().get().asString() : ""); @@ -196,6 +213,40 @@ private static JavaCompilationUnit processCompilationUnit(CompilationUnit parseR return cUnit; } + + private static List processRecordComponents(RecordDeclaration recordDecl) { + return recordDecl.getParameters().stream().map( + parameter -> { + RecordComponent recordComponent = new RecordComponent(); + recordComponent.setName(parameter.getNameAsString()); + recordComponent.setType(resolveType(parameter.getType())); + recordComponent.setAnnotations(parameter.getAnnotations().stream().map(a -> a.toString().strip()).collect(Collectors.toList())); + recordComponent.setModifiers(parameter.getModifiers().stream().map(a -> a.toString().strip()).collect(Collectors.toList())); + recordComponent.setVarArgs(parameter.isVarArgs()); + recordComponent.setDefaultValue(mapRecordConstructorDefaults(recordDecl).getOrDefault(parameter.getNameAsString(), null)); + return recordComponent; + } + ).collect(Collectors.toList()); + } + + private static Map mapRecordConstructorDefaults(RecordDeclaration recordDecl) { + + return recordDecl.getCompactConstructors().stream() + .flatMap(constructor -> constructor.findAll(AssignExpr.class).stream()) // Flatten all assignments + .filter(assignExpr -> assignExpr.getTarget().isNameExpr()) // Ensure assignment is to a parameter + .collect(Collectors.toMap( + assignExpr -> assignExpr.getTarget().asNameExpr().getNameAsString(), // Key: Parameter Name + assignExpr -> Optional.ofNullable(assignExpr.getValue()).map(valueExpr -> { // Value: Default Value + return valueExpr.isStringLiteralExpr() ? valueExpr.asStringLiteralExpr().asString() + : valueExpr.isBooleanLiteralExpr() ? valueExpr.asBooleanLiteralExpr().getValue() + : valueExpr.isCharLiteralExpr() ? valueExpr.asCharLiteralExpr().getValue() + : valueExpr.isDoubleLiteralExpr() ? valueExpr.asDoubleLiteralExpr().asDouble() + : valueExpr.isIntegerLiteralExpr() ? valueExpr.asIntegerLiteralExpr().asNumber() + : valueExpr.isLongLiteralExpr() ? valueExpr.asLongLiteralExpr().asNumber() + : valueExpr.isNullLiteralExpr() ? null + : valueExpr.toString();}).orElse("null"))); // Default: store as a string + } + private static boolean isEntryPointClass(TypeDeclaration typeDecl) { return isSpringEntrypointClass(typeDecl) || isStrutsEntryPointClass(typeDecl) || isCamelEntryPointClass(typeDecl) || isJaxRSEntrypointClass(typeDecl) || isJakartaServletEntryPointClass(typeDecl); @@ -350,6 +401,10 @@ private static ParameterInCallable processParameterDeclaration(Parameter paramDe parameter.setName(paramDecl.getName().toString()); parameter.setAnnotations(paramDecl.getAnnotations().stream().map(a -> a.toString().strip()).collect(Collectors.toList())); parameter.setModifiers(paramDecl.getModifiers().stream().map(a -> a.toString().strip()).collect(Collectors.toList())); + parameter.setStartLine(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().begin.line : -1); + parameter.setStartColumn(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().begin.column : -1); + parameter.setEndLine(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().end.line : -1); + parameter.setEndColumn(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().end.column : -1); return parameter; } @@ -904,7 +959,7 @@ private static String resolveType(Type type) { public static Pair, Map>> extractAll(Path projectRootPath) throws IOException { SymbolSolverCollectionStrategy symbolSolverCollectionStrategy = new SymbolSolverCollectionStrategy(); ProjectRoot projectRoot = symbolSolverCollectionStrategy.collect(projectRootPath); - javaSymbolSolver = (JavaSymbolSolver) symbolSolverCollectionStrategy.getParserConfiguration().getSymbolResolver().get(); + javaSymbolSolver = (JavaSymbolSolver) symbolSolverCollectionStrategy.getParserConfiguration().setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21).getSymbolResolver().get(); Map symbolTable = new LinkedHashMap<>(); Map> parseProblems = new HashMap<>(); for (SourceRoot sourceRoot : projectRoot.getSourceRoots()) { @@ -927,7 +982,7 @@ public static Pair, Map>> CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver(); combinedTypeSolver.add(new ReflectionTypeSolver()); - ParserConfiguration parserConfiguration = new ParserConfiguration(); + ParserConfiguration parserConfiguration = new ParserConfiguration().setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21); parserConfiguration.setSymbolResolver(new JavaSymbolSolver(combinedTypeSolver)); JavaParser javaParser = new JavaParser(parserConfiguration); @@ -958,7 +1013,8 @@ public static Pair, Map>> SymbolSolverCollectionStrategy symbolSolverCollectionStrategy = new SymbolSolverCollectionStrategy(); ProjectRoot projectRoot = symbolSolverCollectionStrategy.collect(projectRootPath); javaSymbolSolver = (JavaSymbolSolver) symbolSolverCollectionStrategy.getParserConfiguration().getSymbolResolver().get(); - ParserConfiguration parserConfiguration = new ParserConfiguration(); + Log.info("Setting parser language level to JAVA_21"); + ParserConfiguration parserConfiguration = new ParserConfiguration().setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21); parserConfiguration.setSymbolResolver(javaSymbolSolver); // create java parser with the configuration @@ -972,6 +1028,7 @@ public static Pair, Map>> ParseResult parseResult = javaParser.parse(javaFilePath); if (parseResult.isSuccessful()) { CompilationUnit compilationUnit = parseResult.getResult().get(); + System.out.println("Successfully parsed file: " + javaFilePath.toString()); symbolTable.put(compilationUnit.getStorage().get().getPath().toString(), processCompilationUnit(compilationUnit)); } else { Log.error(parseResult.getProblems().toString()); diff --git a/src/main/java/com/ibm/cldk/entities/ParameterInCallable.java b/src/main/java/com/ibm/cldk/entities/ParameterInCallable.java index 89659ef4..85cdc321 100644 --- a/src/main/java/com/ibm/cldk/entities/ParameterInCallable.java +++ b/src/main/java/com/ibm/cldk/entities/ParameterInCallable.java @@ -10,4 +10,8 @@ public class ParameterInCallable { private String name; private List annotations; private List modifiers; + private int startLine; + private int endLine; + private int startColumn; + private int endColumn; } diff --git a/src/main/java/com/ibm/cldk/entities/RecordComponent.java b/src/main/java/com/ibm/cldk/entities/RecordComponent.java new file mode 100644 index 00000000..586da61c --- /dev/null +++ b/src/main/java/com/ibm/cldk/entities/RecordComponent.java @@ -0,0 +1,17 @@ +package com.ibm.cldk.entities; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class RecordComponent { + private String comment; + private String name; + private String type; + private List modifiers; + private List annotations = new ArrayList<>(); + private Object defaultValue = null; // We will store the string representation of the default value + private boolean isVarArgs = false; +} diff --git a/src/main/java/com/ibm/cldk/entities/Type.java b/src/main/java/com/ibm/cldk/entities/Type.java index c42d655f..d6ce7290 100644 --- a/src/main/java/com/ibm/cldk/entities/Type.java +++ b/src/main/java/com/ibm/cldk/entities/Type.java @@ -27,5 +27,6 @@ public class Type { private Map callableDeclarations = new HashMap<>(); private List fieldDeclarations = new ArrayList<>(); private List enumConstants = new ArrayList<>(); + private List recordComponents = new ArrayList<>(); private boolean isEntrypointClass = false; } \ No newline at end of file diff --git a/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java b/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java index c956cf41..24f1975a 100644 --- a/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java +++ b/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java @@ -4,13 +4,10 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.json.JSONArray; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; -import org.testcontainers.containers.BindMode; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.MountableFile; @@ -19,7 +16,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.nio.file.Paths; -import java.time.Duration; +import java.util.Map; import java.util.Properties; import java.util.stream.StreamSupport; @@ -57,6 +54,7 @@ public class CodeAnalyzerIntegrationTest { .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications/mvnw-corrupt-test")), "/test-applications/mvnw-corrupt-test") .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications/plantsbywebsphere")), "/test-applications/plantsbywebsphere") .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications/call-graph-test")), "/test-applications/call-graph-test") + .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications/record-class-test")), "/test-applications/record-class-test") .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications/mvnw-working-test")), "/test-applications/mvnw-working-test"); @Container @@ -254,4 +252,84 @@ void shouldBeAbleToDetectCRUDOperationsAndQueriesForPlantByWebsphere() throws Ex Assertions.assertTrue(normalizedOutput.contains(normalizedExpectedCrudOperation), "Expected CRUD operation JSON structure not found"); Assertions.assertTrue(normalizedOutput.contains(normalizedExpectedCrudQuery), "Expected CRUD query JSON structure not found"); } -} \ No newline at end of file + + @Test + void symbolTableShouldHaveRecords() throws IOException, InterruptedException { + var runCodeAnalyzerOnCallGraphTest = container.execInContainer( + "bash", "-c", + String.format( + "export JAVA_HOME=%s && java -jar /opt/jars/codeanalyzer-%s.jar --input=/test-applications/record-class-test --analysis-level=1", + javaHomePath, codeanalyzerVersion + ) + ); + + // Read the output JSON + Gson gson = new Gson(); + JsonObject jsonObject = gson.fromJson(runCodeAnalyzerOnCallGraphTest.getStdout(), JsonObject.class); + JsonObject symbolTable = jsonObject.getAsJsonObject("symbol_table"); + Assertions.assertEquals(4, symbolTable.size(), "Symbol table should have 4 records"); + } + + @Test + void symbolTableShouldHaveDefaultRecordComponents() throws IOException, InterruptedException { + var runCodeAnalyzerOnCallGraphTest = container.execInContainer( + "bash", "-c", + String.format( + "export JAVA_HOME=%s && java -jar /opt/jars/codeanalyzer-%s.jar --input=/test-applications/record-class-test --analysis-level=1", + javaHomePath, codeanalyzerVersion + ) + ); + + // Read the output JSON + Gson gson = new Gson(); + JsonObject jsonObject = gson.fromJson(runCodeAnalyzerOnCallGraphTest.getStdout(), JsonObject.class); + JsonObject symbolTable = jsonObject.getAsJsonObject("symbol_table"); + for (Map.Entry element : symbolTable.entrySet()) { + String key = element.getKey(); + if (!key.endsWith("PersonRecord.java")) { + continue; + } + JsonObject type = element.getValue().getAsJsonObject(); + if (type.has("type_declarations")) { + JsonObject typeDeclarations = type.getAsJsonObject("type_declarations"); + JsonArray recordComponent = typeDeclarations.getAsJsonObject("org.example.PersonRecord").getAsJsonArray("record_components"); + Assertions.assertEquals(2, recordComponent.size(), "Record component should have 2 components"); + JsonObject record = recordComponent.get(1).getAsJsonObject(); + Assertions.assertTrue(record.get("name").getAsString().equals("age") && record.get("default_value").getAsInt() == 18, "Record component should have a name"); + } + } + } + + @Test + void parametersInCallableMustHaveStartAndEndLineAndColumns() throws IOException, InterruptedException { + var runCodeAnalyzerOnCallGraphTest = container.execInContainer( + "bash", "-c", + String.format( + "export JAVA_HOME=%s && java -jar /opt/jars/codeanalyzer-%s.jar --input=/test-applications/record-class-test --analysis-level=1", + javaHomePath, codeanalyzerVersion + ) + ); + + // Read the output JSON + Gson gson = new Gson(); + JsonObject jsonObject = gson.fromJson(runCodeAnalyzerOnCallGraphTest.getStdout(), JsonObject.class); + JsonObject symbolTable = jsonObject.getAsJsonObject("symbol_table"); + for (Map.Entry element : symbolTable.entrySet()) { + String key = element.getKey(); + if (!key.endsWith("App.java")) { + continue; + } + JsonObject type = element.getValue().getAsJsonObject(); + if (type.has("type_declarations")) { + JsonObject typeDeclarations = type.getAsJsonObject("type_declarations"); + JsonObject mainMethod = typeDeclarations.getAsJsonObject("org.example.App").getAsJsonObject("callable_declarations").getAsJsonObject("main(String[])"); + JsonArray parameters = mainMethod.getAsJsonArray("parameters"); + // There should be 1 parameter + Assertions.assertEquals(1, parameters.size(), "Callable should have 1 parameter"); + JsonObject parameter = parameters.get(0).getAsJsonObject(); + // Start and end line and column should not be -1 + Assertions.assertTrue(parameter.get("start_line").getAsInt() == 7 && parameter.get("end_line").getAsInt() == 7 && parameter.get("start_column").getAsInt() == 29 && parameter.get("end_column").getAsInt() == 41, "Parameter should have start and end line and columns"); + } + } + } +} diff --git a/src/test/resources/test-applications/record-class-test/.gitattributes b/src/test/resources/test-applications/record-class-test/.gitattributes new file mode 100644 index 00000000..f91f6460 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/src/test/resources/test-applications/record-class-test/.gitignore b/src/test/resources/test-applications/record-class-test/.gitignore new file mode 100644 index 00000000..1b6985c0 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/src/test/resources/test-applications/record-class-test/app/build.gradle.kts b/src/test/resources/test-applications/record-class-test/app/build.gradle.kts new file mode 100644 index 00000000..1a71397d --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/app/build.gradle.kts @@ -0,0 +1,44 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.12.1/userguide/building_java_projects.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the application plugin to add support for building a CLI application in Java. + application +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + // This dependency is used by the application. + implementation(libs.guava) +} + +testing { + suites { + // Configure the built-in test suite + val test by getting(JvmTestSuite::class) { + // Use JUnit Jupiter test framework + useJUnitJupiter("5.11.1") + } + } +} + +// Apply a specific Java toolchain to ease working on different environments. +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +application { + // Define the main class for the application. + mainClass = "org.example.App" +} diff --git a/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/App.java b/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/App.java new file mode 100644 index 00000000..7f59c338 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/App.java @@ -0,0 +1,19 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example; + +public class App { + public static void main(String[] args) { + // Create instances of records + PersonRecord person = new PersonRecord("Alice", 30); + CarRecord car = new CarRecord("Tesla Model 3", 2023); + // Access public fields and methods + System.out.println(person.greet()); + System.out.println(car.getCarDetails()); + + // Access package-private method (allowed within the same package) + System.out.println("Person Internal Info: " + person.internalInfo()); + System.out.println("Car Internal VIN: " + car.getInternalVIN()); + } +} diff --git a/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/CarRecord.java b/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/CarRecord.java new file mode 100644 index 00000000..c858558d --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/CarRecord.java @@ -0,0 +1,19 @@ +package org.example; + +public record CarRecord(String model, int year) { + + // Public method + public String getCarDetails() { + return "Car: " + model + " (Year: " + year + ")"; + } + + // Private method + private String internalVIN() { + return "VIN-123456"; + } + + // Package-private method + String getInternalVIN() { + return internalVIN(); + } +} \ No newline at end of file diff --git a/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/PersonRecord.java b/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/PersonRecord.java new file mode 100644 index 00000000..af4a4b8f --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/app/src/main/java/org/example/PersonRecord.java @@ -0,0 +1,31 @@ +package org.example; + +public record PersonRecord(String name, int age) { + + public PersonRecord { + // Constructor logic + if (name == null || name.isBlank()) { + name = "Unknown"; + } + if (age < 18) { + age = 18; + } + } + // Private field (Not directly possible in records, but can be mimicked with private static) + private static String secretIdentity = "Unknown"; + + // Public method + public String greet() { + return "Hello, my name is " + name + " and I am " + age + " years old."; + } + + // Private method (only accessible within this record) + private String getSecretIdentity() { + return secretIdentity; + } + + // Protected method (Not valid in records, using package-private as an alternative) + String internalInfo() { + return "Internal ID: " + hashCode(); + } +} \ No newline at end of file diff --git a/src/test/resources/test-applications/record-class-test/app/src/test/java/org/example/AppTest.java b/src/test/resources/test-applications/record-class-test/app/src/test/java/org/example/AppTest.java new file mode 100644 index 00000000..f5ce33d3 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/app/src/test/java/org/example/AppTest.java @@ -0,0 +1,14 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +class AppTest { + @Test void appHasAGreeting() { + App classUnderTest = new App(); + assertNotNull(classUnderTest.getGreeting(), "app should have a greeting"); + } +} diff --git a/src/test/resources/test-applications/record-class-test/gradle.properties b/src/test/resources/test-applications/record-class-test/gradle.properties new file mode 100644 index 00000000..51540088 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/gradle.properties @@ -0,0 +1,7 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/src/test/resources/test-applications/record-class-test/gradle/libs.versions.toml b/src/test/resources/test-applications/record-class-test/gradle/libs.versions.toml new file mode 100644 index 00000000..baed7db0 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +guava = "33.3.1-jre" + +[libraries] +guava = { module = "com.google.guava:guava", version.ref = "guava" } diff --git a/src/test/resources/test-applications/record-class-test/gradle/wrapper/gradle-wrapper.jar b/src/test/resources/test-applications/record-class-test/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..a4b76b95 Binary files /dev/null and b/src/test/resources/test-applications/record-class-test/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/test/resources/test-applications/record-class-test/gradle/wrapper/gradle-wrapper.properties b/src/test/resources/test-applications/record-class-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..e18bc253 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/resources/test-applications/record-class-test/gradlew b/src/test/resources/test-applications/record-class-test/gradlew new file mode 100755 index 00000000..f3b75f3b --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/test/resources/test-applications/record-class-test/gradlew.bat b/src/test/resources/test-applications/record-class-test/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/resources/test-applications/record-class-test/settings.gradle.kts b/src/test/resources/test-applications/record-class-test/settings.gradle.kts new file mode 100644 index 00000000..c99b9d1a --- /dev/null +++ b/src/test/resources/test-applications/record-class-test/settings.gradle.kts @@ -0,0 +1,15 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.12.1/userguide/multi_project_builds.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + +rootProject.name = "record-class-test" +include("app")