Commit aa6831e
committed
Fix CI failures: javadoc + LAL setLayer codegen for non-enum Layer
- LayerExtension.java: javadoc inside `<pre>{@code ... @OverRide ...}</pre>`
blew up because `{@code}` parses `@Override` as a nested unknown tag.
Drop the `{@code}` wrapper and use HTML-escaped `@Override` inside
plain `<pre>`.
- LALBlockCodegen.generateFieldToOutput: previously detected enum-typed
setters via `paramType.isEnum()` and emitted `Type.valueOf(string)` to
cast LAL extractor `layer "MYSQL"` (a String literal) into the typed
setter argument. With Layer no longer an enum, the `isEnum()` branch
was missed and codegen tried to pass `String` to `setLayer(Layer)`,
failing at compile-time. Add `paramType == Layer.class` to the same
branch — Layer's registry-backed `valueOf(String)` keeps the call
shape identical.1 parent 67de4e9 commit aa6831e
2 files changed
Lines changed: 9 additions & 4 deletions
File tree
- oap-server
- analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler
- server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis
Lines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
265 | 266 | | |
266 | 267 | | |
267 | 268 | | |
268 | | - | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
269 | 274 | | |
270 | 275 | | |
271 | 276 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| |||
0 commit comments