Skip to content

Commit bdb4c3f

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 apache#11505. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
1 parent 7bbd727 commit bdb4c3f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,13 +1142,13 @@ 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, List<Resource> resources, boolean hasResourcesInSources, ProjectScope scope) {
11521152

11531153
String scopeId = scope.id();
11541154
String scopeName = scope == ProjectScope.MAIN ? "Main" : "Test";
@@ -1157,10 +1157,10 @@ private void handleResourceConfiguration(
11571157
? "<source><lang>resources</lang></source>"
11581158
: "<source><lang>resources</lang><scope>test</scope></source>";
11591159

1160-
if (ctx.modularProject()) {
1160+
if (context.modularProject()) {
11611161
if (hasResourcesInSources) {
11621162
// Modular project with resources configured via <sources> - already added above
1163-
if (hasExplicitLegacyResources(resources, ctx.baseDir(), scopeId)) {
1163+
if (hasExplicitLegacyResources(resources, context.baseDir(), scopeId)) {
11641164
logger.warn(
11651165
"Legacy {} element is ignored because {} resources are configured via {} in <sources>",
11661166
legacyElement,
@@ -1173,41 +1173,41 @@ private void handleResourceConfiguration(
11731173
legacyElement);
11741174
} else {
11751175
// Modular project without resources in <sources> - inject module-aware defaults
1176-
if (hasExplicitLegacyResources(resources, ctx.baseDir(), scopeId)) {
1176+
if (hasExplicitLegacyResources(resources, context.baseDir(), scopeId)) {
11771177
String message = "Legacy " + legacyElement
11781178
+ " element is ignored because modular sources are configured. "
11791179
+ "Use " + sourcesConfig + " in <sources> for custom resource paths.";
11801180
logger.warn(message);
1181-
ctx.result()
1181+
context.result()
11821182
.getProblemCollector()
11831183
.reportProblem(new org.apache.maven.impl.model.DefaultModelProblem(
11841184
message,
11851185
Severity.WARNING,
11861186
Version.V41,
1187-
ctx.project().getModel().getDelegate(),
1187+
context.project().getModel().getDelegate(),
11881188
-1,
11891189
-1,
11901190
null));
11911191
}
11921192
logger.debug(
11931193
"Injecting module-aware {} resource roots for {} modules",
11941194
scopeId,
1195-
ctx.modules().size());
1196-
for (String module : ctx.modules()) {
1197-
Path resourcePath = ctx.baseDir()
1195+
context.modules().size());
1196+
for (String module : context.modules()) {
1197+
Path resourcePath = context.baseDir()
11981198
.resolve("src")
11991199
.resolve(module)
12001200
.resolve(scopeId)
12011201
.resolve("resources");
12021202
logger.debug(" - Adding {} resource root: {} (module: {})", scopeId, resourcePath, module);
1203-
ctx.project().addSourceRoot(createModularResourceRoot(ctx.baseDir(), module, scope));
1203+
context.project().addSourceRoot(createModularResourceRoot(context.baseDir(), module, scope));
12041204
}
12051205
}
12061206
} else {
12071207
// Classic (non-modular) project
12081208
if (hasResourcesInSources) {
12091209
// Resources configured via <sources> - already added above
1210-
if (hasExplicitLegacyResources(resources, ctx.baseDir(), scopeId)) {
1210+
if (hasExplicitLegacyResources(resources, context.baseDir(), scopeId)) {
12111211
logger.warn(
12121212
"Legacy {} element is ignored because {} resources are configured via {} in <sources>",
12131213
legacyElement,
@@ -1223,7 +1223,7 @@ private void handleResourceConfiguration(
12231223
logger.debug(
12241224
"Using explicit or default {} resources ({} resources configured)", scopeId, resources.size());
12251225
for (Resource resource : resources) {
1226-
ctx.project().addSourceRoot(new DefaultSourceRoot(ctx.baseDir(), scope, resource));
1226+
context.project().addSourceRoot(new DefaultSourceRoot(context.baseDir(), scope, resource));
12271227
}
12281228
}
12291229
}

0 commit comments

Comments
 (0)