Skip to content

Commit e761b16

Browse files
fmodestofmodesto
committed
rename
1 parent 447e28a commit e761b16

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎rewrite-java-test/src/test/java/org/openrewrite/java/JavaTemplateGenericsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void setsDifferenceMultimapRecipe() {
169169
spec -> spec.parser(JavaParser.fromJavaVersion().classpath("guava"))
170170
.recipe(toRecipe(() -> new JavaIsoVisitor<>() {
171171
final JavaTemplate template = JavaTemplate.builder("#{set:any(java.util.Set<T>)}.stream().filter(java.util.function.Predicate.not(#{multimap:any(com.google.common.collect.Multimap<K, V>)}::containsKey)).collect(com.google.common.collect.ImmutableSet.toImmutableSet())")
172-
.expressionType("com.google.common.collect.ImmutableSet<T>")
172+
.bindType("com.google.common.collect.ImmutableSet<T>")
173173
.genericTypes("T", "K", "V")
174174
.javaParser(JavaParser.fromJavaVersion().classpath("guava"))
175175
.build();
@@ -213,7 +213,7 @@ void emptyStreamRecipe() {
213213
rewriteRun(
214214
spec -> spec.recipe(toRecipe(() -> new JavaIsoVisitor<>() {
215215
final JavaTemplate template = JavaTemplate.builder("java.util.stream.Stream.of()")
216-
.expressionType("java.util.stream.Stream<T>")
216+
.bindType("java.util.stream.Stream<T>")
217217
.genericTypes("T")
218218
.build();
219219

‎rewrite-java-test/src/test/java/org/openrewrite/java/JavaTemplateMatchTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,10 +1055,10 @@ void matchMemberReferenceAndLambda() {
10551055
.expectedCyclesThatMakeChanges(1).cycles(1)
10561056
.recipe(toRecipe(() -> new JavaIsoVisitor<>() {
10571057
final JavaTemplate refTemplate = JavaTemplate.builder("String::valueOf")
1058-
.expressionType("java.util.function.Function<Object, String>")
1058+
.bindType("java.util.function.Function<Object, String>")
10591059
.build();
10601060
final JavaTemplate lambdaTemplate = JavaTemplate.builder("(e)->e.toString()")
1061-
.expressionType("java.util.function.Function<Object, String>")
1061+
.bindType("java.util.function.Function<Object, String>")
10621062
.build();
10631063

10641064
@Override

‎rewrite-java/src/main/java/org/openrewrite/java/JavaTemplate.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ protected static Path getTemplateClasspathDir() {
8787
private final Consumer<String> onAfterVariableSubstitution;
8888
private final JavaTemplateParser templateParser;
8989

90-
private JavaTemplate(boolean contextSensitive, JavaParser.Builder<?, ?> parser, String code, String expressionType, Set<String> imports,
90+
private JavaTemplate(boolean contextSensitive, JavaParser.Builder<?, ?> parser, String code, String bindType, Set<String> imports,
9191
Set<String> genericTypes, Consumer<String> onAfterVariableSubstitution, Consumer<String> onBeforeParseTemplate) {
92-
this(code, genericTypes, onAfterVariableSubstitution, new JavaTemplateParser(contextSensitive, augmentClasspath(parser), onAfterVariableSubstitution, onBeforeParseTemplate, imports, expressionType));
92+
this(code, genericTypes, onAfterVariableSubstitution, new JavaTemplateParser(contextSensitive, augmentClasspath(parser), onAfterVariableSubstitution, onBeforeParseTemplate, imports, bindType));
9393
}
9494

9595
private static JavaParser.Builder<?, ?> augmentClasspath(JavaParser.Builder<?, ?> parserBuilder) {
@@ -181,7 +181,7 @@ public static class Builder {
181181
private final Set<String> genericTypes = new HashSet<>();
182182

183183
private boolean contextSensitive;
184-
private String expressionType = "Object";
184+
private String bindType = "Object";
185185

186186
private JavaParser.Builder<?, ?> parser = org.openrewrite.java.JavaParser.fromJavaVersion();
187187

@@ -224,11 +224,11 @@ public Builder contextSensitive() {
224224
* </ul>
225225
* In such cases, the type must be specified manually.
226226
*/
227-
public Builder expressionType(String expressionType) {
228-
if (StringUtils.isBlank(expressionType)) {
227+
public Builder bindType(String bindType) {
228+
if (StringUtils.isBlank(bindType)) {
229229
throw new IllegalArgumentException("Type must not be blank");
230230
}
231-
this.expressionType = expressionType;
231+
this.bindType = bindType;
232232
return this;
233233
}
234234

@@ -279,7 +279,7 @@ public Builder doBeforeParseTemplate(Consumer<String> beforeParseTemplate) {
279279
}
280280

281281
public JavaTemplate build() {
282-
return new JavaTemplate(contextSensitive, parser.clone(), code, expressionType, imports, genericTypes,
282+
return new JavaTemplate(contextSensitive, parser.clone(), code, bindType, imports, genericTypes,
283283
onAfterVariableSubstitution, onBeforeParseTemplate);
284284
}
285285
}

‎rewrite-java/src/main/java/org/openrewrite/java/internal/template/BlockStatementTemplateGenerator.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class BlockStatementTemplateGenerator {
5151

5252
protected final Set<String> imports;
5353
private final boolean contextSensitive;
54-
private final String expressionType;
54+
private final String bindType;
5555

5656
public BlockStatementTemplateGenerator(Set<String> imports, boolean contextSensitive) {
5757
this(imports, contextSensitive, "Object");
@@ -210,26 +210,26 @@ private boolean isTemplateStopComment(Comment comment) {
210210
protected void contextFreeTemplate(Cursor cursor, J j, Collection<JavaType.GenericTypeVariable> typeVariables, StringBuilder before, StringBuilder after) {
211211
String classDeclaration = typeVariables.isEmpty() ? "Template" :
212212
"Template<" + typeVariables.stream().map(TypeUtils::toGenericTypeString).collect(Collectors.joining(", ")) + ">";
213-
if (j instanceof J.Lambda && "Object".equals(expressionType)) {
213+
if (j instanceof J.Lambda && "Object".equals(bindType)) {
214214
throw new IllegalArgumentException(
215215
"Templating a lambda requires a cursor so that it can be properly parsed and type-attributed. " +
216216
"Mark this template as context-sensitive by calling JavaTemplate.Builder#contextSensitive() or " +
217-
"specify the type by calling JavaTemplate.Builder#expressionType()");
218-
} else if (j instanceof J.MemberReference && "Object".equals(expressionType)) {
217+
"specify the type by calling JavaTemplate.Builder#bindType()");
218+
} else if (j instanceof J.MemberReference && "Object".equals(bindType)) {
219219
throw new IllegalArgumentException(
220220
"Templating a method reference requires a cursor so that it can be properly parsed and type-attributed. " +
221221
"Mark this template as context-sensitive by calling JavaTemplate.Builder#contextSensitive() or " +
222-
"specify the type by calling JavaTemplate.Builder#expressionType()");
222+
"specify the type by calling JavaTemplate.Builder#bindType()");
223223
} else if (j instanceof J.MethodInvocation) {
224224
before.insert(0, String.format("class %s {{\n", classDeclaration));
225225
JavaType.Method methodType = ((J.MethodInvocation) j).getMethodType();
226226
if (methodType == null || methodType.getReturnType() != JavaType.Primitive.Void) {
227-
before.append(expressionType).append(" o = ");
227+
before.append(bindType).append(" o = ");
228228
}
229229
after.append(";\n}}");
230230
} else if (j instanceof Expression && !(j instanceof J.Assignment)) {
231231
before.insert(0, String.format("class %s {\n", classDeclaration));
232-
before.append(expressionType).append(" o = ");
232+
before.append(bindType).append(" o = ");
233233
after.append(";\n}");
234234
} else if ((j instanceof J.MethodDeclaration || j instanceof J.VariableDeclarations || j instanceof J.Block || j instanceof J.ClassDeclaration) &&
235235
cursor.getValue() instanceof J.Block &&

‎rewrite-java/src/main/java/org/openrewrite/java/internal/template/JavaTemplateParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ public class JavaTemplateParser {
6363
private final AnnotationTemplateGenerator annotationTemplateGenerator;
6464

6565
public JavaTemplateParser(boolean contextSensitive, Parser.Builder parser, Consumer<String> onAfterVariableSubstitution,
66-
Consumer<String> onBeforeParseTemplate, Set<String> imports, String expressionType) {
66+
Consumer<String> onBeforeParseTemplate, Set<String> imports, String bindType) {
6767
this(
6868
parser,
6969
onAfterVariableSubstitution,
7070
onBeforeParseTemplate,
7171
imports,
7272
contextSensitive,
73-
new BlockStatementTemplateGenerator(imports, contextSensitive, expressionType),
73+
new BlockStatementTemplateGenerator(imports, contextSensitive, bindType),
7474
new AnnotationTemplateGenerator(imports)
7575
);
7676
}

0 commit comments

Comments
 (0)