[Windup-commits] [windup/windup] 2b9636: [WINDUP-3376] Diva integration (#1427)

Branch: refs/heads/master Home: https://github.com/windup/windup Commit: 2b96360d9f3d59bcb774fb13562d8025373583de https://github.com/windup/windup/commit/2b96360d9f3d59bcb774fb13562d80253... Author: Akihiko Tozawa <atozawa(a)jp.ibm.com&gt; Date: 2022-06-08 (Wed, 08 Jun 2022) Changed paths: M bom/pom.xml M bootstrap/pom.xml M decompiler/api/src/main/java/org/jboss/windup/decompiler/api/DecompilationListener.java M decompiler/impl-fernflower/src/main/java/org/jboss/windup/decompiler/fernflower/FernFlowerResultSaver.java M decompiler/impl-fernflower/src/main/java/org/jboss/windup/decompiler/fernflower/FernflowerDecompiler.java M graph/api/src/main/java/org/jboss/windup/graph/model/FileLocationModel.java M graph/api/src/main/java/org/jboss/windup/graph/service/GraphService.java M graph/tests/src/test/java/org/jboss/windup/graph/typedgraph/graphservice/GraphServiceTest.java M pom.xml M reporting/impl/src/main/resources/reports/templates/source.ftl A rules-java-diva/addon/pom.xml A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/DivaRuleProvider.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/EnableTransactionAnalysisOption.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/analysis/DivaLauncher.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/analysis/DivaToWindup.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaAppModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaConstraintModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaContextModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaEndpointModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaEntryMethodModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaOpModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaRequestConstraintModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaRequestParamModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaRestApiModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaRestCallOpModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaSqlOpModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaStackTraceModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/model/DivaTxModel.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/reporting/CreateDivaReportRuleProvider.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/reporting/StackTraceToList.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/service/DivaEntryMethodService.java A rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/service/DivaStackTraceService.java A rules-java-diva/addon/src/main/resources/META-INF/beans.xml A rules-java-diva/addon/src/main/resources/reports/templates/diva.ftl A rules-java-diva/pom.xml A rules-java-diva/tests/pom.xml A rules-java-diva/tests/src/test/java/org/jboss/windup/rules/apps/diva/DivaTest.java A rules-java-diva/tests/src/test/resources/servlet/pom.xml A rules-java-diva/tests/src/test/resources/servlet/src/main/java/diva/servlet/TestServlet.java A rules-java-diva/tests/src/test/resources/spring/pom.xml A rules-java-diva/tests/src/test/resources/spring/src/main/java/diva/spring/BaseService.java A rules-java-diva/tests/src/test/resources/spring/src/main/java/diva/spring/TestController.java A rules-java-diva/tests/src/test/resources/spring/src/main/java/diva/spring/TestEntity.java A rules-java-diva/tests/src/test/resources/spring/src/main/java/diva/spring/TestRepository.java A rules-java-diva/tests/src/test/resources/spring/src/main/java/diva/spring/TestService.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/FernflowerDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/AbstractJavaSourceModel.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/JavaClassModel.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/JavaMethodModel.java A rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/LineMappingModel.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/service/JavaMethodService.java A rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/service/LineMappingService.java A rules-java/tests/src/test/java/org/jboss/windup/rules/apps/java/service/JavaMethodServiceTest.java A rules-java/tests/src/test/java/org/jboss/windup/rules/apps/java/service/LineMappingServiceTest.java M tooling/addon/pom.xml M tooling/impl/pom.xml Log Message: ----------- [WINDUP-3376] Diva integration (#1427) * Diva integration * Changes for jitpack and tests * Using 0.1.0 * Moving diva addon to windup repo * Enhancements to Diva's pom.xml * Update rules-java-diva/addon/pom.xml Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Enhanced pom.xml files to remove addon version for tests * Added addons dependencies to execute tests * Part of requested code changes * Replacing Report strings with constants * Diva reporting * Sorting tx-models and op-models * Adding enableTransactionAnalysis option for enabling Diva * Reporting full transactions * Updating to 5.2.2-SNAPSHOT * Update rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/EnableTransactionAnalysisOption.java Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Update rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/EnableTransactionAnalysisOption.java Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Update rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/service/DivaStackTraceService.java * Update rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/analysis/DivaLauncher.java Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Apply suggestions from code review Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Removing janusgraph backup code * Adding a test for GraphService.getOrCreateByProperties() * Adding a test for GraphService.getOrCreateByProperties() * Adding tests for JavaMethodService * Changes required to pass the tests * Remaining changes * Further fix of JavaMethodService * Update rules-java-diva/tests/src/test/java/org/jboss/windup/rules/apps/diva/DivaTest.java Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Apply suggestions from code review Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Bump diva-version to 0.1.4 * Bump diva-version to 0.1.5 * Updating diva.ftl * Add styles * Remove panel heading * Fix stack trace handling * Refactoring stack-trace model * A fix for previous commit * Performance fix * Adapt diva.ftl to the previous merge * Some fixes to analyze shopizer * Fixing colspan issue using colgroup. Adding css for toggle icon. * Further performance improvement * Report method names within stack traces * Improving descriptions of stack traces and hints * Removing daytraderTest * Fix logging, etc. * Added binary mode test with hibernate-tutorial-web-3.3.2.GA.war * Moving diva-temp to output directory * Change to support spring-boot jars * Bump diva version to 0.1.6 * Update rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/analysis/DivaLauncher.java Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; * Bump diva version to 0.1.7 * Changes to throw exception from DivaLauncher * Using decompiled source files for 'classes' directories * Bump diva version to 0.1.8 * Bump diva version to 0.1.9 * Feeding jar locations to compiler, etc. * Fix stacktrace hint problem with binaries using fernflower's line mapping * Compressing the data * Adapting to recent diva-core * Handling corner case * Bump diva version to 0.1.10 * Handling the case with empty stack trace * Adding unit test * Fix test assertions * Tentative test fix * Update diva pom files to 5.3.1-SNAPSHOT * Fix: nested jars handling * Bump diva version to 0.1.11 * Fix: loading necessary interfaces for binary analysis, etc. * Update rules-java-diva/addon/src/main/java/org/jboss/windup/rules/apps/diva/analysis/DivaLauncher.java Co-authored-by: Mark Brophy <36955467+m-brophy(a)users.noreply.github.com&gt; * Changes reflecting reviewer's comments * Testing GraphService.getOrCreateByProperties with wrong number of arguments * Reporting file read failures * Fix: accepting archives in source mode * enable diva analysis via windup-maven-plugin Co-authored-by: mrizzi <mrizzi(a)redhat.com&gt; Co-authored-by: Marco Rizzi <mrizzi(a)users.noreply.github.com&gt; Co-authored-by: Carlos Feria <2582866+carlosthe19916(a)users.noreply.github.com&gt; Co-authored-by: m-brophy <mbrophy(a)redhat.com&gt; Co-authored-by: Mark Brophy <36955467+m-brophy(a)users.noreply.github.com&gt;