Skip to content

Commit 8dc20c7

Browse files
authored
Drop contextSensitive() from JavaTemplate to fix compilation (#203)
1 parent f49d9e1 commit 8dc20c7

File tree

2 files changed

+11
-27
lines changed

2 files changed

+11
-27
lines changed

src/main/java/org/openrewrite/java/logging/LoggingFramework.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,37 +53,28 @@ public JavaTemplate getErrorTemplate(String message, ExecutionContext ctx) {
5353
case SLF4J:
5454
return JavaTemplate
5555
.builder("#{any(org.slf4j.Logger)}.error(" + message + ", #{any(java.lang.Throwable)})")
56-
.contextSensitive()
57-
.javaParser(JavaParser.fromJavaVersion()
58-
.classpathFromResources(ctx, "slf4j-api-2.1"))
56+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "slf4j-api-2.1"))
5957
.build();
6058
case Log4J1:
6159
return JavaTemplate
6260
.builder("#{any(org.apache.log4j.Category)}.error(" + message + ", #{any(java.lang.Throwable)})")
63-
.contextSensitive()
64-
.javaParser(JavaParser.fromJavaVersion()
65-
.classpathFromResources(ctx, "log4j-1.2"))
61+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "log4j-1.2"))
6662
.build();
6763

6864
case Log4J2:
6965
return JavaTemplate
7066
.builder("#{any(org.apache.logging.log4j.Logger)}.error(" + message + ", #{any(java.lang.Throwable)})")
71-
.contextSensitive()
72-
.javaParser(JavaParser.fromJavaVersion()
73-
.classpathFromResources(ctx, "log4j-api-2.23"))
67+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "log4j-api-2.23"))
7468
.build();
7569
case COMMONS:
7670
return JavaTemplate
7771
.builder("#{any(org.apache.commons.logging.Log)}.error(" + message + ", #{any(java.lang.Throwable)})")
78-
.contextSensitive()
79-
.javaParser(JavaParser.fromJavaVersion()
80-
.classpathFromResources(ctx, "commons-logging-1.3"))
72+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "commons-logging-1.3"))
8173
.build();
8274
case JUL:
8375
default:
8476
return JavaTemplate
8577
.builder("#{any(java.util.logging.Logger)}.log(Level.SEVERE, " + message + ", #{any(java.lang.Throwable)})")
86-
.contextSensitive()
8778
.imports("java.util.logging.Level")
8879
.build();
8980
}

src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -193,31 +193,24 @@ public JavaTemplate getErrorTemplateNoException(ExecutionContext ctx) {
193193
switch (framework) {
194194
case SLF4J:
195195
return JavaTemplate
196-
.builder("#{any(org.slf4j.Logger)}.error(#{any(String)})")
197-
.contextSensitive()
198-
.javaParser(JavaParser.fromJavaVersion()
199-
.classpathFromResources(ctx, "slf4j-api-2.1"))
196+
.builder("#{any(org.slf4j.Logger)}.error(#{any(String)});")
197+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "slf4j-api-2.1"))
200198
.build();
201199
case Log4J1:
202200
return JavaTemplate
203-
.builder("#{any(org.apache.log4j.Category)}.error(#{any(String)})")
204-
.contextSensitive()
205-
.javaParser(JavaParser.fromJavaVersion()
206-
.classpathFromResources(ctx, "log4j-1.2"))
201+
.builder("#{any(org.apache.log4j.Category)}.error(#{any(String)});")
202+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "log4j-1.2"))
207203
.build();
208204

209205
case Log4J2:
210206
return JavaTemplate
211-
.builder("#{any(org.apache.logging.log4j.Logger)}.error(#{any(String)})")
212-
.contextSensitive()
213-
.javaParser(JavaParser.fromJavaVersion()
214-
.classpathFromResources(ctx, "log4j-api-2.23"))
207+
.builder("#{any(org.apache.logging.log4j.Logger)}.error(#{any(String)});")
208+
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "log4j-api-2.23"))
215209
.build();
216210
case JUL:
217211
default:
218212
return JavaTemplate
219-
.builder("#{any(java.util.logging.Logger)}.log(Level.SEVERE, #{any(String)})")
220-
.contextSensitive()
213+
.builder("#{any(java.util.logging.Logger)}.log(Level.SEVERE, #{any(String)});")
221214
.imports("java.util.logging.Level")
222215
.build();
223216
}

0 commit comments

Comments
 (0)