-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Starting point: PreConditionsVerifier * Starting point: PreConditionsVerifier * Starting point: PreConditionsVerifier * Starting point: PreConditionsVerifier (failing tests as intended) * Starting point: PreConditionsVerifier (failing tests as intended) * Fix unit test * Implementation * Implementation * improvement * improvement * Fix test * Add extra info about pruning * Start new implementation, introduce PreCondition objects * Start with PreConditionTest * Start with PreConditionTest * improvement * toString improvement * toString improvement * Rename `PreCondition` to `Precondition` + add copyright header * Improve `fitsInto` * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert formatting * Revert formatting * Revert formatting * Revert formatting * Reorder imports in PreConditionsVerifier.java * Change name `PreConditionsVerifier` => `PreconditionsVerifier` * Change name `PreConditionsVerifier` => `PreconditionsVerifier` * Improvement: extractCommonElements * Update src/main/java/org/openrewrite/java/template/processor/RefasterTemplateProcessor.java Co-authored-by: Tim te Beek <tim@moderne.io> * Change test accordingly * Revert test * Remove unneeded `RequiredArgsConstructor` * Apply suggestions from code review Co-authored-by: Tim te Beek <tim@moderne.io> * Apply suggestions from code review --------- Co-authored-by: Tim te Beek <tim@moderne.io> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
- Loading branch information
3 people
authored
Dec 17, 2024
1 parent
ce89fe6
commit 6904c9b
Showing
10 changed files
with
1,137 additions
and
52 deletions.
There are no files selected for viewing
193 changes: 193 additions & 0 deletions
193
src/main/java/org/openrewrite/java/template/processor/Precondition.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| /* | ||
| * Copyright 2024 the original author or authors. | ||
| * <p> | ||
| * 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 | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * 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. | ||
| */ | ||
| package org.openrewrite.java.template.processor; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Value; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| import static java.util.stream.Collectors.toCollection; | ||
|
|
||
| public abstract class Precondition { | ||
| private static final Comparator<String> BY_USES_TYPE_FIRST = Comparator | ||
| .comparing((String s) -> !s.startsWith("new UsesType")) | ||
| .thenComparing(Comparator.naturalOrder()); | ||
|
|
||
| abstract boolean fitsInto(Precondition p); | ||
|
|
||
| public Precondition prune() { | ||
| return this; | ||
| } | ||
|
|
||
| @Value | ||
| @EqualsAndHashCode(callSuper = false) | ||
| public static class Rule extends Precondition { | ||
| String rule; | ||
|
|
||
| @Override | ||
| boolean fitsInto(Precondition p) { | ||
| if (p instanceof Rule) { | ||
| return this.equals(p); | ||
| } else if (p instanceof Or) { | ||
| return ((Or) p).preconditions.stream().anyMatch(this::fitsInto); | ||
| } else if (p instanceof And) { | ||
| return ((And) p).preconditions.stream().anyMatch(this::fitsInto); | ||
| } | ||
| return false; // unreachable code | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return rule; | ||
| } | ||
| } | ||
|
|
||
| @Value | ||
| @EqualsAndHashCode(callSuper = false, of = "preconditions") | ||
| public static class Or extends Precondition { | ||
| Set<Precondition> preconditions; | ||
| int indent; | ||
|
|
||
| @Override | ||
| boolean fitsInto(Precondition p) { | ||
| if (p instanceof Or) { | ||
| return this.equals(p); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public Precondition prune() { | ||
| Precondition pruned = takeElementIfItFitsInAllOtherElements(); | ||
| return pruned == null ? extractCommonElements() : pruned; | ||
| } | ||
|
|
||
| /** | ||
| * If element fits in all others, take element as precondition. Eg: | ||
| * <pre> | ||
| * or( | ||
| * and(new UsesType<>("Map"), new UsesMethod<>("PrintStream println(..)")), | ||
| * new UsesMethod<>("PrintStream println(..)") | ||
| * ) | ||
| * </pre> | ||
| * <p> | ||
| * will return: | ||
| * <pre> | ||
| * new UsesMethod<>("PrintStream println()") | ||
| * </pre> | ||
| */ | ||
| private Precondition takeElementIfItFitsInAllOtherElements() { | ||
| for (Precondition p : preconditions) { | ||
| int matches = 0; | ||
| for (Precondition p2 : preconditions) { | ||
| if (p == p2 || p.fitsInto(p2)) { | ||
| matches++; | ||
| } | ||
| if (matches == preconditions.size()) { | ||
| return p; | ||
| } | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * If child element of an element exist as child element in all others, move child element up. Eg: | ||
| * <pre> | ||
| * or( | ||
| * and(new UsesType<>("Map"), new UsesType<>("HashMap"), new UsesMethod<>("PrintStream println(..)")), | ||
| * and(new UsesType<>("List"), new UsesType<>("ArrayList"), new UsesMethod<>("PrintStream println(..)")) | ||
| * ) | ||
| * </pre> | ||
| * <p> | ||
| * will return: | ||
| * <pre> | ||
| * and( | ||
| * new UsesMethod<>("PrintStream println()"), | ||
| * or( | ||
| * and(new UsesType<>("Map"), new UsesType<>("HashMap")), | ||
| * and(new UsesType<>("List"), new UsesType<>("ArrayList")), | ||
| * ) | ||
| * ) | ||
| * </pre> | ||
| */ | ||
| private Precondition extractCommonElements() { | ||
| boolean first = true; | ||
| Set<Precondition> commons = new HashSet<>(); | ||
| for (Precondition p : preconditions) { | ||
| if (!(p instanceof And)) { | ||
| return this; | ||
| } | ||
| if (first) { | ||
| commons.addAll(((And) p).preconditions); | ||
| first = false; | ||
| } else { | ||
| commons.retainAll(((And) p).preconditions); | ||
| } | ||
| } | ||
|
|
||
| if (!commons.isEmpty()) { | ||
| preconditions.forEach(it -> ((And) it).preconditions.removeAll(commons)); | ||
| commons.add(new Or(preconditions, indent)); | ||
| return new And(commons, indent); | ||
| } | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return joinPreconditions(preconditions, "or", indent); | ||
| } | ||
| } | ||
|
|
||
| @Value | ||
| @EqualsAndHashCode(callSuper = false, of = "preconditions") | ||
| public static class And extends Precondition { | ||
| Set<Precondition> preconditions; | ||
| int indent; | ||
|
|
||
| @Override | ||
| boolean fitsInto(Precondition p) { | ||
| if (p instanceof And) { | ||
| if (preconditions.size() > ((And) p).preconditions.size()) { | ||
| return false; | ||
| } | ||
| return preconditions.stream().allMatch(it -> it.fitsInto(p)); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return joinPreconditions(preconditions, "and", indent); | ||
| } | ||
| } | ||
|
|
||
| private static String joinPreconditions(Collection<Precondition> rules, String op, int indent) { | ||
| if (rules.isEmpty()) { | ||
| return ""; | ||
| } else if (rules.size() == 1) { | ||
| return rules.iterator().next().toString(); | ||
| } | ||
| String whitespace = String.format("%" + indent + "s", " "); | ||
| Set<String> preconditions = rules.stream().map(Object::toString).sorted(BY_USES_TYPE_FIRST).collect(toCollection(LinkedHashSet::new)); | ||
| return "Preconditions." + op + "(\n" + | ||
| whitespace + String.join(",\n" + whitespace, preconditions) + "\n" + | ||
| whitespace.substring(0, indent - 4) + ')'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.