Skip to content

Commit ee7f1d3

Browse files
aschemanclaude
andcommitted
Rename ctx to context in handleResourceConfiguration
Avoid abbreviations in new code per project conventions. Addresses review comment from elharo on PR #11505. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
1 parent 7bbd727 commit ee7f1d3

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,13 +1142,16 @@ private record ResourceHandlingContext(
11421142
* <li>Classic project: use resources from {@code <sources>} if present, otherwise use legacy resources</li>
11431143
* </ol>
11441144
*
1145-
* @param ctx the resource handling context containing project info
1145+
* @param context the resource handling context containing project info
11461146
* @param resources the legacy resource list (from {@code <resources>} or {@code <testResources>})
11471147
* @param hasResourcesInSources whether resources are configured via {@code <sources>}
11481148
* @param scope the project scope (MAIN or TEST)
11491149
*/
11501150
private void handleResourceConfiguration(
1151-
ResourceHandlingContext ctx, List<Resource> resources, boolean hasResourcesInSources, ProjectScope scope) {
1151+
ResourceHandlingContext context,
1152+
List<Resource> resources,
1153+
boolean hasResourcesInSources,
1154+
ProjectScope scope) {
11521155

11531156
String scopeId = scope.id();
11541157
String scopeName = scope == ProjectScope.MAIN ? "Main" : "Test";
@@ -1157,10 +1160,10 @@ private void handleResourceConfiguration(
11571160
? "<source><lang>resources</lang></source>"
11581161
: "<source><lang>resources</lang><scope>test</scope></source>";
11591162

1160-
if (ctx.modularProject()) {
1163+
if (context.modularProject()) {
11611164
if (hasResourcesInSources) {
11621165
// Modular project with resources configured via <sources> - already added above
1163-
if (hasExplicitLegacyResources(resources, ctx.baseDir(), scopeId)) {
1166+
if (hasExplicitLegacyResources(resources, context.baseDir(), scopeId)) {
11641167
logger.warn(
11651168
"Legacy {} element is ignored because {} resources are configured via {} in <sources>",
11661169
legacyElement,
@@ -1173,41 +1176,41 @@ private void handleResourceConfiguration(
11731176
legacyElement);
11741177
} else {
11751178
// Modular project without resources in <sources> - inject module-aware defaults
1176-
if (hasExplicitLegacyResources(resources, ctx.baseDir(), scopeId)) {
1179+
if (hasExplicitLegacyResources(resources, context.baseDir(), scopeId)) {
11771180
String message = "Legacy " + legacyElement
11781181
+ " element is ignored because modular sources are configured. "
11791182
+ "Use " + sourcesConfig + " in <sources> for custom resource paths.";
11801183
logger.warn(message);
1181-
ctx.result()
1184+
context.result()
11821185
.getProblemCollector()
11831186
.reportProblem(new org.apache.maven.impl.model.DefaultModelProblem(
11841187
message,
11851188
Severity.WARNING,
11861189
Version.V41,
1187-
ctx.project().getModel().getDelegate(),
1190+
context.project().getModel().getDelegate(),
11881191
-1,
11891192
-1,
11901193
null));
11911194
}
11921195
logger.debug(
11931196
"Injecting module-aware {} resource roots for {} modules",
11941197
scopeId,
1195-
ctx.modules().size());
1196-
for (String module : ctx.modules()) {
1197-
Path resourcePath = ctx.baseDir()
1198+
context.modules().size());
1199+
for (String module : context.modules()) {
1200+
Path resourcePath = context.baseDir()
11981201
.resolve("src")
11991202
.resolve(module)
12001203
.resolve(scopeId)
12011204
.resolve("resources");
12021205
logger.debug(" - Adding {} resource root: {} (module: {})", scopeId, resourcePath, module);
1203-
ctx.project().addSourceRoot(createModularResourceRoot(ctx.baseDir(), module, scope));
1206+
context.project().addSourceRoot(createModularResourceRoot(context.baseDir(), module, scope));
12041207
}
12051208
}
12061209
} else {
12071210
// Classic (non-modular) project
12081211
if (hasResourcesInSources) {
12091212
// Resources configured via <sources> - already added above
1210-
if (hasExplicitLegacyResources(resources, ctx.baseDir(), scopeId)) {
1213+
if (hasExplicitLegacyResources(resources, context.baseDir(), scopeId)) {
12111214
logger.warn(
12121215
"Legacy {} element is ignored because {} resources are configured via {} in <sources>",
12131216
legacyElement,
@@ -1223,7 +1226,7 @@ private void handleResourceConfiguration(
12231226
logger.debug(
12241227
"Using explicit or default {} resources ({} resources configured)", scopeId, resources.size());
12251228
for (Resource resource : resources) {
1226-
ctx.project().addSourceRoot(new DefaultSourceRoot(ctx.baseDir(), scope, resource));
1229+
context.project().addSourceRoot(new DefaultSourceRoot(context.baseDir(), scope, resource));
12271230
}
12281231
}
12291232
}

0 commit comments

Comments
 (0)