ref-code-adaptation: Initial merge request by PresiProdanov · Pull Request #15 · MontiCore/javaDSL

PresiProdanov · 2026-07-13T13:26:13Z

No description provided.

…aptationConflictDetector now uses strategies

…bugs in other classes

…ed types

…ey for mappings and reduce complexity

…ncarnation mapping, only one class for single- and multi-incarnations

… remove thread-local storage; add unit tests for lifecycle behavior

…eld addition; remove deprecated methods

…onstructor overloads and remove unused methods

…s and streamline method renaming processes

…s rebuilt too often; fixes bugs that remained hidden; made the test oracle for the completer cases stricter

MaxStachon

Initial Review für den verbesserten Reference Code Adapter

@PresiProdanov Bitte Kommentare anschauen und bearbeiten/antworten.

MaxStachon · 2026-07-13T13:32:59Z

+
+Last updated: 13.07.2026
+
+## Requirements


Nach GitLab verschieben bevor gemerged wird.

Die Requirements sind übertragen.

MaxStachon · 2026-07-13T13:38:25Z

+public final class GroupingMappingService {
+
+  /** Computes replacements for one mapping only, preventing one mapping from leaking into another. */
+  public Map<String, String> compute(IncarnationContext context) {


Was wird in der Map gespeichert? JavaDoc?

JavaDoc vorhanden - die Map bildetr den einfachen Namen eines konkreten Typs auf den einfachen Namen seines Gruppierungstyps ab.

Vielleicht konsistenter, wenn du hier von Inkarnationen oder Inkarnations-Gruppe sprichst?

Schau auch mal an anderen Stellen nach.

Oder gleich Map<String, Set<String>>?

MaxStachon · 2026-07-13T13:47:55Z

+    String lowerName = name.toLowerCase(Locale.ROOT);
+    Map<Integer, List<ISymbol>> refsByPosition = new TreeMap<>();
+    List<ISymbol> longestFirst = new ArrayList<>(infixList);
+    longestFirst.sort(
+        Comparator.comparingInt((ISymbol symbol) -> symbol.getName().length()).reversed());
+    boolean[] occupied = new boolean[name.length()];
+    for (ISymbol reference : longestFirst) {
+      String infix = reference.getName().toLowerCase(Locale.ROOT);
+      if (infix.isEmpty()) {
+        continue;
+      }
+      int from = 0;
+      while (from <= lowerName.length() - infix.length()) {
+        int index = lowerName.indexOf(infix, from);
+        if (index < 0) {
+          break;
+        }
+        boolean overlaps = false;
+        for (int i = index; i < index + infix.length(); i++) {
+          overlaps |= occupied[i];
+        }
+        if (!overlaps) {
+          refsByPosition.computeIfAbsent(index, ignored -> new ArrayList<>()).add(reference);
+          Arrays.fill(occupied, index, index + infix.length(), true);
+        }
+        from = index + infix.length();
      }
    }
+    List<ISymbol> result = new ArrayList<>();
+    refsByPosition.values().forEach(result::addAll);
    return result;
  }


Gibt es dafür nicht Library-Methoden, z.B. in String oder Strings?

Ich habe nach einer passenden Library-Methode gesucht. String#indexOf hilft zwar beim Finden einzelner Vorkommen, aber längere Referenznamen müssen Vorrang haben, Treffer dürfen sich nicht überschneidenn und das Ergebnis muss nach der Position im Bezeichner sortiert sein.

MaxStachon · 2026-07-13T13:49:14Z

@@ -135,38 +160,40 @@ public static Optional<ASTAnnotation> getInfoAnnotation(List<ASTMCModifier> mods
   * @return the generated String.
   */
  public static String fillTemplate(String template, List<ISymbol> refSymbol) {


Was ist denn das Template in diesem Kontext?

Doku ist jetzt da.

MaxStachon · 2026-07-13T13:50:44Z

-      for (ISymbol symbol1 : temps) {
-        if (!symbol.equals(symbol1) && (matchInfix(symbol.getName(), symbol1.getName()))) {
-          references.remove(symbol1);
+    List<ISymbol> result = new ArrayList<>(new LinkedHashSet<>(references));


Vielleicht hier noch ein Kommentar.

Doku ist da. Duplikate werden entfernt, anschließend werden kürzere Referenznamen verworfen, wenn sie vollständig in einer längeren Referenz enthalten sind.

MaxStachon · 2026-07-13T14:37:00Z

+    enforceInterfaceMethodBodies();
+  }
+
+  private boolean invokesMethodOn(


Bitte kommentieren, was diese Methode machen soll.

Kommentiert.

MaxStachon · 2026-07-13T14:37:36Z

+  }
+
+  @SuppressWarnings({"rawtypes", "unchecked"})
+  private CtExpression<?> missingArgument(CtInvocation<?> invocation, String parameterType) {


Bitte kommentieren.

MaxStachon · 2026-07-13T14:43:21Z

+import spoon.refactoring.Refactoring;
+
+/** Generates, clones and removes Spoon declarations. */
+final class SpoonGenerationService {


Ggf. Mit SpoonTransformationService kombinieren zu SpoonCRUDUtil (o.ä.).

Im Meeting habe ich dir selber vorgeschalgen, beide zu mergen, da keine Doku vorhanden war. Das habe ich jedoch nicht gemacht. SpoonGenerationService : Elemente werden erzeugt, geklont, entfernt oder mit Bodies versehen. SpoonTransformationService verändert dagegen bestehende Deklarationen und Referenzen und besitzt dafür lazy aufgebaute Referenzindizes. Beide Bereiche haben unterschiedliche Zustände und Ausführungsreihenfolgen.

MaxStachon · 2026-07-13T14:47:36Z

+import spoon.reflect.visitor.filter.TypeFilter;
+
+/** Applies all mutations to declarations and references in an already loaded Spoon model. */
+final class SpoonTransformationService {


Ggf. Mit SpoonGenerationService kombinieren zu SpoonCRUDUtil (o.ä.).

Wie erwähnt, das ist eine schlechte Idee. Code ist jetzt besser dokumentiert.

MaxStachon · 2026-07-13T14:52:43Z

+    }
+  }
+
+  void rewriteTypeReferenceName(CtTypeReference<?> reference, String newName) {


Muss das nichtr logisch woanders hin?

Ja, die Methode wurde verschoben.

…documentation across multiple classes

…or symbol resolution

…ight come

…ports; preserve abstractness during merges; add more comments

…ts in various cases

Max Philip Stachon and others added 20 commits April 22, 2026 22:37

add conformance check for the new evaluation example

9d0465b

add new evaluation test case (WIP)

5abb3f2

Initial commit

22ae0df

Initial commit

c26a34e

Refactor updater factory and add combined evaluation assertions

484bee7

Merge branch 'dev' into PPr/initial

e5bcdb3

Changes to handling of imports, requirements updated, new TODOs

4bc5683

Fix todos for import handling

b79772b

Add more tests and checks for associations

61c0d25

Refactor CodeAdapter.java

9188a98

Refactor AdaptationConflictDetector and SpoonUpdater with helpers. Ad…

191aaad

…aptationConflictDetector now uses strategies

CodeUpdaterMill, CodeAdapter refactoring, small changes and possible …

3a043ce

…bugs in other classes

Enhance AdaptedCodeMerger to handle relocations and imports for adapt…

55f64f6

…ed types

Refactor IncarnationContext and related classes to use StableElementK…

b901aca

…ey for mappings and reduce complexity

Refactor BasicUpdateHandler to incorporate stable key selection for i…

30997fd

…ncarnation mapping, only one class for single- and multi-incarnations

Refactor CodeUpdaterMill to simplify updater lifecycle management and…

3eed1ef

… remove thread-local storage; add unit tests for lifecycle behavior

Refactor CodeUpdater and related services to streamline method and fi…

65dd134

…eld addition; remove deprecated methods

Refactor AdaptationConflictDetector and related classes to simplify c…

c747290

…onstructor overloads and remove unused methods

Refactor Spoon transformation services to integrate executable repair…

c6b7bda

…s and streamline method renaming processes

Refactor adaptation context handling to utilize CDModelIndex as it wa…

1b85b17

…s rebuilt too often; fixes bugs that remained hidden; made the test oracle for the completer cases stricter

PresiProdanov requested a review from MaxStachon July 13, 2026 13:26

PresiProdanov self-assigned this Jul 13, 2026

MaxStachon reviewed Jul 13, 2026

View reviewed changes

PresiProdanov added 6 commits July 16, 2026 11:03

Refactor constants and update method signatures for clarity; enhance …

8856eb7

…documentation across multiple classes

Refactor AdapterUtils and related classes to utilize AdaptReference f…

e0327c2

…or symbol resolution

Add a few more examples to explain the functionalities better; more m…

fbff494

…ight come

Missing StaticDelegator for one test case and refining member type im…

e3d7fc3

…ports; preserve abstractness during merges; add more comments

Update method signatures for clarity; enhance type handling and impor…

57baf3b

…ts in various cases

Merge test case from paper; add more javadocs to all files

1699e83

Uh oh!

Conversation

PresiProdanov commented Jul 13, 2026

Uh oh!

MaxStachon left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaxStachon Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaxStachon Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MaxStachon Jul 20, 2026 •

edited

Loading

MaxStachon Jul 20, 2026 •

edited

Loading