From cd6adb9fdbc06ea4f45ee616296a8be2be47e252 Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Tue, 18 Feb 2025 17:02:16 -0500 Subject: [PATCH 1/4] Issue 103: Add a test application and a InitializationBlock entity. Signed-off-by: Rahul Krishna --- .../cldk/entities/InitializationBlock.java | 22 ++ .../init-blocks-test/.gitattributes | 12 + .../init-blocks-test/.gitignore | 5 + .../app/src/main/java/org/example/App.java | 42 +++ .../init-blocks-test/gradle.properties | 7 + .../init-blocks-test/gradlew | 251 ++++++++++++++++++ .../init-blocks-test/gradlew.bat | 94 +++++++ .../init-blocks-test/settings.gradle.kts | 15 ++ 8 files changed, 448 insertions(+) create mode 100644 src/main/java/com/ibm/cldk/entities/InitializationBlock.java create mode 100644 src/test/resources/test-applications/init-blocks-test/.gitattributes create mode 100644 src/test/resources/test-applications/init-blocks-test/.gitignore create mode 100644 src/test/resources/test-applications/init-blocks-test/app/src/main/java/org/example/App.java create mode 100644 src/test/resources/test-applications/init-blocks-test/gradle.properties create mode 100755 src/test/resources/test-applications/init-blocks-test/gradlew create mode 100644 src/test/resources/test-applications/init-blocks-test/gradlew.bat create mode 100644 src/test/resources/test-applications/init-blocks-test/settings.gradle.kts diff --git a/src/main/java/com/ibm/cldk/entities/InitializationBlock.java b/src/main/java/com/ibm/cldk/entities/InitializationBlock.java new file mode 100644 index 00000000..a5b247ed --- /dev/null +++ b/src/main/java/com/ibm/cldk/entities/InitializationBlock.java @@ -0,0 +1,22 @@ +package com.ibm.cldk.entities; + +import lombok.Data; + +import java.util.List; + +@Data +public class InitializationBlock { + private String filePath; + private String comment; + private List annotations; + private List thrownExceptions; + private String code; + private int startLine; + private int endLine; + private boolean isStatic; + private List referencedTypes; + private List accessedFields; + private List callSites; + private List variableDeclarations; + private int cyclomaticComplexity; +} diff --git a/src/test/resources/test-applications/init-blocks-test/.gitattributes b/src/test/resources/test-applications/init-blocks-test/.gitattributes new file mode 100644 index 00000000..f91f6460 --- /dev/null +++ b/src/test/resources/test-applications/init-blocks-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/init-blocks-test/.gitignore b/src/test/resources/test-applications/init-blocks-test/.gitignore new file mode 100644 index 00000000..1b6985c0 --- /dev/null +++ b/src/test/resources/test-applications/init-blocks-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/init-blocks-test/app/src/main/java/org/example/App.java b/src/test/resources/test-applications/init-blocks-test/app/src/main/java/org/example/App.java new file mode 100644 index 00000000..5807917b --- /dev/null +++ b/src/test/resources/test-applications/init-blocks-test/app/src/main/java/org/example/App.java @@ -0,0 +1,42 @@ +package org.example; + +import java.util.List; + +public class App { + private static String staticMessage; + + static { + try { + staticMessage = "Static block initialized"; + System.out.println("Static initialization block executed."); + initializeStaticFields(); + } catch (Exception e) { + System.err.println("Error in static block: " + e.getMessage()); + } + } + + { + try { + System.out.println("Instance initialization block executed."); + initializeInstanceFields(); + } catch (Exception e) { + System.err.println("Error in instance block: " + e.getMessage()); + } + } + + public App() { + System.out.println("Constructor executed."); + } + + private static void initializeStaticFields() { + System.out.println("Initializing static fields."); + } + + private void initializeInstanceFields() { + System.out.println("Initializing instance fields."); + } + + public static void main(String[] args) { + new App(); + } +} diff --git a/src/test/resources/test-applications/init-blocks-test/gradle.properties b/src/test/resources/test-applications/init-blocks-test/gradle.properties new file mode 100644 index 00000000..51540088 --- /dev/null +++ b/src/test/resources/test-applications/init-blocks-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/init-blocks-test/gradlew b/src/test/resources/test-applications/init-blocks-test/gradlew new file mode 100755 index 00000000..f3b75f3b --- /dev/null +++ b/src/test/resources/test-applications/init-blocks-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/init-blocks-test/gradlew.bat b/src/test/resources/test-applications/init-blocks-test/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/src/test/resources/test-applications/init-blocks-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/init-blocks-test/settings.gradle.kts b/src/test/resources/test-applications/init-blocks-test/settings.gradle.kts new file mode 100644 index 00000000..d1bf0739 --- /dev/null +++ b/src/test/resources/test-applications/init-blocks-test/settings.gradle.kts @@ -0,0 +1,15 @@ +package `test-applications`.`init-blocks-test`/* + * 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") From 8ced60a2a2b6f851d68eaf2a04496a8a0813a6dd Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Tue, 18 Feb 2025 17:59:51 -0500 Subject: [PATCH 2/4] Issue 103: Add implementation for Initialization Blocks modeled on Callable. Signed-off-by: Rahul Krishna --- settings.gradle | 10 +--- src/main/java/com/ibm/cldk/SymbolTable.java | 56 +++++++++++++++++-- .../cldk/entities/InitializationBlock.java | 2 + src/main/java/com/ibm/cldk/entities/Type.java | 1 + .../ibm/cldk/CodeAnalyzerIntegrationTest.java | 32 +++++++++++ .../app/src/main/java/org/example/App.java | 1 + 6 files changed, 89 insertions(+), 13 deletions(-) diff --git a/settings.gradle b/settings.gradle index a6b36d6a..2d7bdb7d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,12 +9,4 @@ 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. -*/ -pluginManagement { - plugins { - id 'org.jetbrains.kotlin.jvm' version '2.1.10' - } -} -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' -} +*/ \ No newline at end of file diff --git a/src/main/java/com/ibm/cldk/SymbolTable.java b/src/main/java/com/ibm/cldk/SymbolTable.java index 2dbef6d2..130ac98c 100644 --- a/src/main/java/com/ibm/cldk/SymbolTable.java +++ b/src/main/java/com/ibm/cldk/SymbolTable.java @@ -15,11 +15,13 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.type.Type; +import com.github.javaparser.resolution.TypeSolver; import com.github.javaparser.resolution.UnsolvedSymbolException; import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; import com.github.javaparser.resolution.types.ResolvedType; import com.github.javaparser.symbolsolver.JavaSymbolSolver; +import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver; import com.github.javaparser.symbolsolver.utils.SymbolSolverCollectionStrategy; @@ -172,9 +174,16 @@ else if (typeDecl instanceof RecordDeclaration) { typeNode = new com.ibm.cldk.entities.Type(); } - /* set common attributes of types that available in type declarations: - is nested type, is class or interface declaration, is enum declaration, - comments, parent class, callable declarations, field declarations */ + /* set common attributes of types that available in type declarations: + is nested type, is class or interface declaration, is enum declaration, + comments, parent class, callable declarations, field declarations + */ + // Discover initialization blocks + typeNode.setInitializationBlocks(typeDecl.findAll(InitializerDeclaration.class).stream() + .map(initializerDeclaration -> { + return createInitializationBlock(initializerDeclaration, parseResult.getStorage().map(s -> s.getPath().toString()).orElse("")); + }) + .collect(Collectors.toList())); // Set fields indicating nested, class/interface, enum, annotation, and record types typeNode.setNestedType(typeDecl.isNestedType()); typeNode.setClassOrInterfaceDeclaration(typeDecl.isClassOrInterfaceDeclaration()); @@ -213,7 +222,38 @@ else if (typeDecl instanceof RecordDeclaration) { return cUnit; } - + private static InitializationBlock createInitializationBlock(InitializerDeclaration initializerDeclaration, String filePath) { + InitializationBlock initializationBlock = new InitializationBlock(); + initializationBlock.setFilePath(filePath); + initializationBlock.setComment(initializerDeclaration.getComment().isPresent() ? initializerDeclaration.getComment().get().asString() : ""); + initializationBlock.setAnnotations(initializerDeclaration.getAnnotations().stream().map(a -> a.toString().strip()).collect(Collectors.toList())); + // add exceptions declared in "throws" clause + initializationBlock.setThrownExceptions(initializerDeclaration.getBody().getStatements().stream().filter(Statement::isThrowStmt).map(throwStmt -> { + try { + return javaSymbolSolver.calculateType(throwStmt.asThrowStmt().getExpression()).describe(); + } catch (Exception e) { + return throwStmt.asThrowStmt().getExpression().toString(); + } + }).collect(Collectors.toList())); + initializationBlock.setCode(initializerDeclaration.getBody().toString()); + initializationBlock.setStartLine(initializerDeclaration.getRange().isPresent() ? initializerDeclaration.getRange().get().begin.line : -1); + initializationBlock.setEndLine(initializerDeclaration.getRange().isPresent() ? initializerDeclaration.getRange().get().end.line : -1); + initializationBlock.setStatic(initializerDeclaration.isStatic()); + initializationBlock.setReferencedTypes(getReferencedTypes(Optional.ofNullable(initializerDeclaration.getBody()))); + initializationBlock.setAccessedFields(getAccessedFields(Optional.ofNullable(initializerDeclaration.getBody()), Collections.emptyList(), "")); + initializationBlock.setCallSites(getCallSites(Optional.ofNullable(initializerDeclaration.getBody()))); + initializationBlock.setVariableDeclarations(getVariableDeclarations(Optional.ofNullable(initializerDeclaration.getBody()))); + initializationBlock.setCyclomaticComplexity(getCyclomaticComplexity(initializerDeclaration)); + return initializationBlock; + } + /** + * Processes the given record to extract information about the + * declared field and returns a JSON object containing the extracted + * information. + * + * @param recordDecl field declaration to be processed + * @return Field object containing extracted information + */ private static List processRecordComponents(RecordDeclaration recordDecl) { return recordDecl.getParameters().stream().map( parameter -> { @@ -568,6 +608,14 @@ private static int getCyclomaticComplexity(CallableDeclaration callableDeclarati int catchClauseCount = callableDeclaration.findAll(CatchClause.class).size(); return ifStmtCount + loopStmtCount + switchCaseCount + conditionalExprCount + catchClauseCount + 1; } + private static int getCyclomaticComplexity(InitializerDeclaration initializerDeclaration) { + int ifStmtCount = initializerDeclaration.findAll(IfStmt.class).size(); + int loopStmtCount = initializerDeclaration.findAll(DoStmt.class).size() + initializerDeclaration.findAll(ForStmt.class).size() + initializerDeclaration.findAll(ForEachStmt.class).size() + initializerDeclaration.findAll(WhileStmt.class).size(); + int switchCaseCount = initializerDeclaration.findAll(SwitchStmt.class).stream().map(stmt -> stmt.getEntries().size()).reduce(0, Integer::sum); + int conditionalExprCount = initializerDeclaration.findAll(ConditionalExpr.class).size(); + int catchClauseCount = initializerDeclaration.findAll(CatchClause.class).size(); + return ifStmtCount + loopStmtCount + switchCaseCount + conditionalExprCount + catchClauseCount + 1; + } /** * Processes the given field declaration to extract information about the diff --git a/src/main/java/com/ibm/cldk/entities/InitializationBlock.java b/src/main/java/com/ibm/cldk/entities/InitializationBlock.java index a5b247ed..eab76d2b 100644 --- a/src/main/java/com/ibm/cldk/entities/InitializationBlock.java +++ b/src/main/java/com/ibm/cldk/entities/InitializationBlock.java @@ -3,6 +3,7 @@ import lombok.Data; import java.util.List; +import java.util.stream.Collector; @Data public class InitializationBlock { @@ -19,4 +20,5 @@ public class InitializationBlock { private List callSites; private List variableDeclarations; private int cyclomaticComplexity; + } diff --git a/src/main/java/com/ibm/cldk/entities/Type.java b/src/main/java/com/ibm/cldk/entities/Type.java index d6ce7290..8fc5ab6b 100644 --- a/src/main/java/com/ibm/cldk/entities/Type.java +++ b/src/main/java/com/ibm/cldk/entities/Type.java @@ -28,5 +28,6 @@ public class Type { private List fieldDeclarations = new ArrayList<>(); private List enumConstants = new ArrayList<>(); private List recordComponents = new ArrayList<>(); + private List initializationBlocks = 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 24f1975a..118201dc 100644 --- a/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java +++ b/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java @@ -55,6 +55,7 @@ public class CodeAnalyzerIntegrationTest { .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/init-blocks-test")), "/test-applications/init-blocks-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 @@ -332,4 +333,35 @@ void parametersInCallableMustHaveStartAndEndLineAndColumns() throws IOException, } } } + + @Test + void mustBeAbleToResolveInitializationBlocks() 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/init-blocks-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"); + JsonArray initializationBlocks = typeDeclarations.getAsJsonObject("org.example.App").getAsJsonArray("initialization_blocks"); + // There should be 2 blocks + Assertions.assertEquals(2, initializationBlocks.size(), "Callable should have 1 parameter"); + Assertions.assertTrue(initializationBlocks.get(0).getAsJsonObject().get("is_static").getAsBoolean(), "Static block should be marked as static"); + Assertions.assertFalse(initializationBlocks.get(1).getAsJsonObject().get("is_static").getAsBoolean(), "Instance block should be marked as not static"); + } + } + } } diff --git a/src/test/resources/test-applications/init-blocks-test/app/src/main/java/org/example/App.java b/src/test/resources/test-applications/init-blocks-test/app/src/main/java/org/example/App.java index 5807917b..7fbb3f07 100644 --- a/src/test/resources/test-applications/init-blocks-test/app/src/main/java/org/example/App.java +++ b/src/test/resources/test-applications/init-blocks-test/app/src/main/java/org/example/App.java @@ -12,6 +12,7 @@ public class App { initializeStaticFields(); } catch (Exception e) { System.err.println("Error in static block: " + e.getMessage()); + throw new RuntimeException(e); } } From cf59b6b84e39eb32370c3084d86630647e975436 Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Tue, 18 Feb 2025 18:04:09 -0500 Subject: [PATCH 3/4] Issue 103: Add implementation for Initialization Blocks modeled on Callable. Signed-off-by: Rahul Krishna --- .github/workflows/release_config.json | 4 ++++ settings.gradle | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_config.json b/.github/workflows/release_config.json index 7ddd165c..f0d4b5b2 100644 --- a/.github/workflows/release_config.json +++ b/.github/workflows/release_config.json @@ -27,6 +27,10 @@ { "title": "## \uD83D\uDEE0 Other Updates", "labels": ["other", "kind/dependency-change"] + }, + { + "title": "## 🚨 Breaking Changes", + "labels": ["breaking"] } ], "ignore_labels": [ diff --git a/settings.gradle b/settings.gradle index 2d7bdb7d..a6b36d6a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,4 +9,12 @@ 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. -*/ \ No newline at end of file +*/ +pluginManagement { + plugins { + id 'org.jetbrains.kotlin.jvm' version '2.1.10' + } +} +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} From c60958bf04b1680b380d1dd94e17775be5b3b88a Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Tue, 18 Feb 2025 18:09:07 -0500 Subject: [PATCH 4/4] Issue 103: Remove unused imports. Signed-off-by: Rahul Krishna --- src/main/java/com/ibm/cldk/SymbolTable.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/ibm/cldk/SymbolTable.java b/src/main/java/com/ibm/cldk/SymbolTable.java index 130ac98c..3d43d384 100644 --- a/src/main/java/com/ibm/cldk/SymbolTable.java +++ b/src/main/java/com/ibm/cldk/SymbolTable.java @@ -15,13 +15,11 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.type.Type; -import com.github.javaparser.resolution.TypeSolver; import com.github.javaparser.resolution.UnsolvedSymbolException; import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; import com.github.javaparser.resolution.types.ResolvedType; import com.github.javaparser.symbolsolver.JavaSymbolSolver; -import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver; import com.github.javaparser.symbolsolver.utils.SymbolSolverCollectionStrategy; @@ -35,7 +33,6 @@ 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;