gitnexus 1.6.11-rc.8 → 1.6.11

package/dist/core/group/cross-impact.js

@@ -103,13 +103,21 @@ export function clampTimeout(timeoutMs) {
 export function validateGroupImpactParams(params) {
     const name = String(params.name ?? '').trim();
     const repoPath = String(params.repo ?? '').trim();
-    const target = String(params.target ?? '').trim();
+    // Optional string, same helper shape as cross-trace's `str()`: empty/blank
+    // counts as absent so `target_uid: ''` degrades to the name lookup rather
+    // than a zero-ambiguity lookup of the empty uid. Parsed before the required
+    // check so UID-only callers (MCP impact schema requires `direction`, not
+    // `target`) are accepted.
+    const str = (v) => typeof v === 'string' && v.trim() !== '' ? v : undefined;
+    const targetName = String(params.target ?? '').trim();
+    const target_uidEarly = str(params.target_uid);
     if (!name)
         return { ok: false, error: 'name is required' };
     if (!repoPath)
         return { ok: false, error: 'repo is required (group repo path, e.g. app/backend)' };
-    if (!target)
-        return { ok: false, error: 'target is required' };
+    if (!targetName && !target_uidEarly)
+        return { ok: false, error: 'target or target_uid is required' };
+    const target = targetName || target_uidEarly;
     if (params.service !== undefined &&
         params.service !== null &&
         String(params.service).trim() === '') {
@@ -133,6 +141,9 @@ export function validateGroupImpactParams(params) {
         minConfidence = 1;
     const service = normalizeServicePrefix(params.service);
     const subgroup = typeof params.subgroup === 'string' ? params.subgroup : undefined;
+    const target_uid = target_uidEarly;
+    const file_path = str(params.file_path);
+    const kind = str(params.kind);
     // Clamp at the validate boundary so the downstream `deadline` (line
     // ~366) and `safeLocalImpact`'s `setTimeout` both see a single
     // bounded value. Without this, the outer deadline budgeted Phase-2
@@ -150,6 +161,9 @@ export function validateGroupImpactParams(params) {
         name,
         repoPath,
         target,
+        target_uid,
+        file_path,
+        kind,
         direction,
         maxDepth,
         crossDepth,
@@ -165,6 +179,16 @@ export function validateGroupImpactParams(params) {
 async function resolveGroupRepo(port, config, repoPath) {
     const registryName = config.repos[repoPath];
     if (!registryName) {
+        const matchingMemberPaths = Object.entries(config.repos)
+            .filter(([, alias]) => alias.toLowerCase() === repoPath.toLowerCase())
+            .map(([memberPath]) => memberPath);
+        if (matchingMemberPaths.length > 0) {
+            return {
+                error: `Unknown repo path "${repoPath}" in this group. ` +
+                    `That value is a registry alias for member path(s): ${matchingMemberPaths.join(', ')}. ` +
+                    `Pass the group.yaml key to --repo, not the alias.`,
+            };
+        }
         return { error: `Unknown repo path "${repoPath}" in this group.` };
     }
     try {
@@ -438,7 +462,7 @@ export async function runGroupImpact(deps, params) {
     const parsed = validateGroupImpactParams(params);
     if (parsed.ok === false)
         return { error: parsed.error };
-    const { name, repoPath, target, direction, maxDepth, crossDepth: _crossDepth, crossDepthWarning, relationTypes, includeTests, minConfidence, service: servicePrefix, subgroup, timeoutMs, } = parsed;
+    const { name, repoPath, target, target_uid, file_path, kind, direction, maxDepth, crossDepth: _crossDepth, crossDepthWarning, relationTypes, includeTests, minConfidence, service: servicePrefix, subgroup, timeoutMs, } = parsed;
     const groupDir = getGroupDir(deps.gitnexusDir, name);
     let config;
     try {
@@ -454,6 +478,14 @@ export async function runGroupImpact(deps, params) {
         return { error: resolved.error };
     const impactParams = {
         target,
+        // Selector params pass through to the member repo's impact (the port
+        // contract in service.ts documents them), so the single-repo tool's
+        // "re-call with target_uid to disambiguate" loop works unchanged in
+        // group mode. `undefined` keeps the call shape flat — same convention
+        // as the relationTypes line below.
+        target_uid,
+        file_path,
+        kind,
         direction,
         maxDepth,
         relationTypes: relationTypes && relationTypes.length > 0 ? relationTypes : undefined,

package/dist/core/group/extractors/http-patterns/java.js

@@ -1,8 +1,8 @@
 import Java from 'tree-sitter-java';
 import { compilePatterns, runCompiledPatterns, unquoteLiteral, } from '../tree-sitter-scanner.js';
-import { springAnnotationHttpMethods, intersectSpringHttpMethods, isRouteMemberKey, findEnclosingClass, joinPath, } from '../../../ingestion/route-extractors/spring-shared.js';
+import { springAnnotationHttpMethods, intersectSpringHttpMethods, isRouteMemberKey, findEnclosingClass, isClassLevelMappingAnnotation, joinPath, } from '../../../ingestion/route-extractors/spring-shared.js';
 import { REST_TEMPLATE_TO_HTTP, WEB_CLIENT_SHORT_TO_HTTP, WEB_CLIENT_LONG_VERB_RE, EXCHANGE_ANNOTATION_TO_HTTP, parseRequestLine, pushPrefix, scanSpringInheritanceProject, OPENFEIGN_FRAMEWORK, HTTP_INTERFACE_FRAMEWORK, FEIGN_CONFIDENCE, REQUEST_LINE_CONFIDENCE, EXCHANGE_CONFIDENCE, } from './spring-consumer-shared.js';
-import { extractJavaModuleConstants, foldJavaOperands, isJavaConstantFile, parseJavaConstOperands, } from '../../../ingestion/route-extractors/java-const-resolver.js';
+import { expandJavaWildcardStaticImports, extractJavaModuleConstants, foldJavaOperands, isJavaConstantFile, parseJavaConstOperands, prepareJavaRouteConstants, } from '../../../ingestion/route-extractors/java-const-resolver.js';
 import { extractStaticPathExpression, inferOkHttpMethod, inferHttpClientMethod, okHttpUrlRootsAtBuilder, httpClientUriRootsAtNewBuilder, httpClientChainHasUriCall, } from './java-static-path.js';
 /**
  * Java HTTP plugin. Handles:
@@ -394,12 +394,12 @@ function annotationHasRouteMember(annotation) {
     return false;
 }
 function typeRequestMethods(typeNode) {
-    const mappings = declarationAnnotations(typeNode).filter((annotation) => simpleName(annotation.childForFieldName('name')?.text ?? '') === 'RequestMapping');
+    const mappings = declarationAnnotations(typeNode).filter((annotation) => isClassLevelMappingAnnotation(simpleName(annotation.childForFieldName('name')?.text ?? '')));
     if (mappings.length === 0)
         return ['*'];
     if (mappings.length !== 1)
         return [];
-    return springAnnotationHttpMethods('RequestMapping', mappings[0].text);
+    return springAnnotationHttpMethods(simpleName(mappings[0].childForFieldName('name')?.text ?? 'RequestMapping'), mappings[0].text);
 }
 function hasAnnotation(node, names) {
     const modifiers = node.namedChildren.find((child) => child.type === 'modifiers');
@@ -551,7 +551,7 @@ function scanRouteAnnotations(tree) {
         }
         // Type-level (class or interface): a Spring `@RequestMapping` URL prefix, or
         // — on an interface — an OpenFeign `@FeignClient(path = "...")` prefix.
-        if (ann === 'RequestMapping') {
+        if (isClassLevelMappingAnnotation(ann)) {
             if (!isRouteMemberKey(keyNode))
                 continue;
             if (!valueNode) {
@@ -789,7 +789,10 @@ export const JAVA_HTTP_PLUGIN = {
                 if (!tree)
                     continue;
                 const mc = extractJavaModuleConstants(tree);
-                if (mc.literals.size > 0 || mc.exprs.size > 0 || mc.imports.size > 0) {
+                if (mc.literals.size > 0 ||
+                    mc.exprs.size > 0 ||
+                    mc.imports.size > 0 ||
+                    (mc.wildcardImports?.length ?? 0) > 0) {
                     constants.set(rel, mc);
                 }
             }
@@ -800,7 +803,14 @@ export const JAVA_HTTP_PLUGIN = {
                 continue;
             }
         }
-        return { constants };
+        // On-demand static imports (`import static a.b.C.*`) were recorded as
+        // pending class FQNs during extraction; materialize their bare-name
+        // bindings now that the whole map exists. A wildcard's target is itself
+        // a constants file, so it is necessarily a map entry — anything else
+        // degrades to the fold's skip floor. In-place: each entry is owned by
+        // this map, and every file is expanded exactly once.
+        const constantIndex = prepareJavaRouteConstants(constants);
+        return { constants, constantIndex };
     },
     scan(tree, repoContext, fileRel) {
         const out = [];
@@ -832,8 +842,12 @@ export const JAVA_HTTP_PLUGIN = {
                 return foldConstants;
             try {
                 const mc = extractJavaModuleConstants(tree);
-                if (mc.imports.size > 0) {
+                // A file carrying ONLY wildcard static imports has an empty import
+                // table pre-expansion — overlay it too, then materialize the promised
+                // bindings against the repo map before it becomes a fold target.
+                if (mc.imports.size > 0 || (mc.wildcardImports?.length ?? 0) > 0) {
                     const merged = new Map(javaCtx.constants);
+                    expandJavaWildcardStaticImports(mc, fileRel, merged, javaCtx.constantIndex);
                     merged.set(fileRel, mc);
                     foldConstants = merged;
                 }

package/dist/core/group/extractors/http-patterns/kotlin.js

@@ -1,6 +1,6 @@
 import { requireVendoredGrammar } from '../../../tree-sitter/vendored-grammars.js';
 import { compilePatterns, runCompiledPatterns, unquoteLiteral, } from '../tree-sitter-scanner.js';
-import { METHOD_ANNOTATION_TO_HTTP, findEnclosingClass, joinPath, } from '../../../ingestion/route-extractors/spring-shared.js';
+import { findEnclosingClass, intersectSpringHttpMethods, isClassLevelMappingAnnotation, joinPath, springAnnotationHttpMethods, } from '../../../ingestion/route-extractors/spring-shared.js';
 import { buildKotlinConstantIndex, extractKotlinModuleConstants, foldKotlinOperands, isKotlinConstantFile, overlayKotlinConstantIndex, parseKotlinConstOperands, unfoldableDeclarationsOf, unquoteKotlinIdentifier, } from '../../../ingestion/route-extractors/kotlin-const-resolver.js';
 import { REST_TEMPLATE_TO_HTTP, WEB_CLIENT_SHORT_TO_HTTP, WEB_CLIENT_LONG_VERB_RE, EXCHANGE_ANNOTATION_TO_HTTP, parseRequestLine, pushPrefix, scanSpringInheritanceProject, OPENFEIGN_FRAMEWORK, HTTP_INTERFACE_FRAMEWORK, FEIGN_CONFIDENCE, REQUEST_LINE_CONFIDENCE, EXCHANGE_CONFIDENCE, } from './spring-consumer-shared.js';
 /**
@@ -392,6 +392,13 @@ function inferKotlinOkHttpMethod(urlCall) {
     }
     return name === null ? 'GET' : name.toUpperCase();
 }
+function enclosingAnnotationText(node) {
+    for (let current = node; current; current = current.parent) {
+        if (current.type === 'annotation')
+            return current.text;
+    }
+    return node.text;
+}
 /**
  * Build the plugin only if the Kotlin grammar is available. Compiling
  * the queries against a null grammar would throw at module load time
@@ -429,7 +436,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#eq? @ann "RequestMapping"))
+                  (user_type (type_identifier) @ann (#match? @ann "RequestMapping$"))
                   (value_arguments
                     (value_argument . [(string_literal) @prefix (collection_literal (string_literal) @prefix)])))))
             (type_identifier) @cls) @class
@@ -442,7 +449,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#eq? @ann "RequestMapping"))
+                  (user_type (type_identifier) @ann (#match? @ann "RequestMapping$"))
                   (value_arguments
                     (value_argument
                       (simple_identifier) @key (#match? @key "^(path|value)$")
@@ -457,7 +464,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#eq? @ann "RequestMapping"))
+                  (user_type (type_identifier) @ann (#match? @ann "RequestMapping$"))
                   (value_arguments
                     (value_argument . ${arrayOfArg('@prefix')})))))
             (type_identifier) @cls) @class
@@ -470,7 +477,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#eq? @ann "RequestMapping"))
+                  (user_type (type_identifier) @ann (#match? @ann "RequestMapping$"))
                   (value_arguments
                     (value_argument
                       (simple_identifier) @key (#match? @key "^(path|value)$")
@@ -495,7 +502,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#match? @ann "^(Get|Post|Put|Delete|Patch)Mapping$"))
+                  (user_type (type_identifier) @ann (#match? @ann "(Request|Get|Post|Put|Delete|Patch)Mapping$"))
                   (value_arguments
                     (value_argument . [(string_literal) @path (collection_literal (string_literal) @path)])))))
             (simple_identifier) @method_name) @method
@@ -508,7 +515,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#match? @ann "^(Get|Post|Put|Delete|Patch)Mapping$"))
+                  (user_type (type_identifier) @ann (#match? @ann "(Request|Get|Post|Put|Delete|Patch)Mapping$"))
                   (value_arguments
                     (value_argument
                       (simple_identifier) @key (#match? @key "^(path|value)$")
@@ -523,7 +530,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#match? @ann "^(Get|Post|Put|Delete|Patch)Mapping$"))
+                  (user_type (type_identifier) @ann (#match? @ann "(Request|Get|Post|Put|Delete|Patch)Mapping$"))
                   (value_arguments
                     (value_argument . ${arrayOfArg('@path')})))))
             (simple_identifier) @method_name) @method
@@ -536,7 +543,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#match? @ann "^(Get|Post|Put|Delete|Patch)Mapping$"))
+                  (user_type (type_identifier) @ann (#match? @ann "(Request|Get|Post|Put|Delete|Patch)Mapping$"))
                   (value_arguments
                     (value_argument
                       (simple_identifier) @key (#match? @key "^(path|value)$")
@@ -571,7 +578,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#eq? @ann "RequestMapping"))
+                  (user_type (type_identifier) @ann (#match? @ann "RequestMapping$"))
                   (value_arguments (value_argument) @arg))))
             (type_identifier) @cls) @class
         `,
@@ -589,7 +596,7 @@ function buildKotlinPlugin(language) {
             (modifiers
               (annotation
                 (constructor_invocation
-                  (user_type (type_identifier) @ann (#match? @ann "^(Get|Post|Put|Delete|Patch)Mapping$"))
+                  (user_type (type_identifier) @ann (#match? @ann "(Request|Get|Post|Put|Delete|Patch)Mapping$"))
                   (value_arguments (value_argument) @arg))))
             (simple_identifier) @method_name) @method
         `,
@@ -649,8 +656,11 @@ function buildKotlinPlugin(language) {
         for (const match of runCompiledPatterns(SPRING_CONST_CLASS_PREFIX_PATTERNS, tree)) {
             const argNode = match.captures.arg;
             const classNode = match.captures.class;
+            const annNode = match.captures.ann;
             if (!argNode || !classNode)
                 continue;
+            if (annNode && !isClassLevelMappingAnnotation(annNode.text))
+                continue;
             if ((resolvedPrefixes.get(classNode.id) ?? []).length > 0)
                 continue;
             const expr = kotlinRouteArgumentExpression(argNode);
@@ -1145,14 +1155,37 @@ function buildKotlinPlugin(language) {
         return body.namedChildren.filter((c) => c.type === 'function_declaration');
     };
     const kotlinFunctionName = (fn) => fn.namedChildren.find((c) => c.type === 'simple_identifier')?.text ?? null;
+    const kotlinTypeRequestMethods = (typeNode) => {
+        const modifiers = typeNode.namedChildren.find((child) => child.type === 'modifiers');
+        const mappings = (modifiers?.namedChildren ?? []).filter((annotation) => {
+            if (annotation.type !== 'annotation')
+                return false;
+            return isClassLevelMappingAnnotation(kotlinAnnotationName(annotation) ?? '');
+        });
+        if (mappings.length === 0)
+            return ['*'];
+        if (mappings.length !== 1)
+            return [];
+        const mapping = mappings[0];
+        const mappingName = kotlinAnnotationName(mapping);
+        if (!mappingName)
+            return [];
+        return springAnnotationHttpMethods(mappingName, mapping.text);
+    };
+    const kotlinClassHttpMethodsById = (tree) => new Map(tree.rootNode
+        .descendantsOfType('class_declaration')
+        .map((typeNode) => [typeNode.id, kotlinTypeRequestMethods(typeNode)]));
     const collectKotlinSpringTypes = (filePath, tree) => {
         // Class-level @RequestMapping prefixes (reuse the provider class-prefix query).
         const prefixByClassId = new Map();
         for (const match of runCompiledPatterns(SPRING_CLASS_PREFIX_PATTERNS, tree)) {
             const prefixNode = match.captures.prefix;
             const classNode = match.captures.class;
+            const annNode = match.captures.ann;
             if (!prefixNode || !classNode)
                 continue;
+            if (annNode && !isClassLevelMappingAnnotation(annNode.text))
+                continue;
             // An INTERPOLATED literal (`"${ApiPaths.BASE}"`) is not a path — unquoting
             // its raw text would carry the source spelling into the shared type view
             // as a served prefix. Refusing it here is also what lets the unfoldable
@@ -1172,6 +1205,7 @@ function buildKotlinPlugin(language) {
         // noise into the shared type view, so it is left out — the same skip floor
         // `java.ts`'s `collectSpringTypes` keeps.
         const routesByMethodId = new Map();
+        const classHttpMethodsById = kotlinClassHttpMethodsById(tree);
         const unfoldablePrefixClassIds = collectUnfoldablePrefixClassIds(tree, prefixByClassId);
         for (const match of runCompiledPatterns(SPRING_METHOD_ROUTE_PATTERNS, tree)) {
             const annNode = match.captures.ann;
@@ -1179,8 +1213,8 @@ function buildKotlinPlugin(language) {
             const methodNode = match.captures.method;
             if (!annNode || !pathNode || !methodNode)
                 continue;
-            const httpMethod = METHOD_ANNOTATION_TO_HTTP[annNode.text];
-            if (!httpMethod)
+            const httpMethods = springAnnotationHttpMethods(annNode.text, enclosingAnnotationText(annNode));
+            if (httpMethods.length === 0)
                 continue;
             const rawPath = unquoteLiteral(pathNode.text);
             if (rawPath === null)
@@ -1190,8 +1224,11 @@ function buildKotlinPlugin(language) {
             const owner = findEnclosingClass(methodNode);
             if (owner && unfoldablePrefixClassIds.has(owner.id))
                 continue;
+            const constrainedMethods = intersectSpringHttpMethods(owner ? (classHttpMethodsById.get(owner.id) ?? ['*']) : ['*'], httpMethods);
             const arr = routesByMethodId.get(methodNode.id) ?? [];
-            arr.push({ method: httpMethod, path: rawPath });
+            for (const httpMethod of constrainedMethods) {
+                arr.push({ method: httpMethod, path: rawPath });
+            }
             routesByMethodId.set(methodNode.id, arr);
         }
         const out = [];
@@ -1260,6 +1297,7 @@ function buildKotlinPlugin(language) {
                     if (mc.literals.size > 0 ||
                         mc.exprs.size > 0 ||
                         mc.imports.size > 0 ||
+                        (mc.wildcardImports?.length ?? 0) > 0 ||
                         unfoldableDeclarationsOf(mc).size > 0) {
                         // POSIX key (see `normalizeRel`); `readFile` above got the raw `rel`.
                         constants.set(normalizeRel(rel), mc);
@@ -1303,6 +1341,7 @@ function buildKotlinPlugin(language) {
                     if (mc.literals.size > 0 ||
                         mc.exprs.size > 0 ||
                         mc.imports.size > 0 ||
+                        (mc.wildcardImports?.length ?? 0) > 0 ||
                         unfoldableDeclarationsOf(mc).size > 0) {
                         foldIndex = overlayKotlinConstantIndex(kotlinCtx.index, fileKey, mc);
                     }
@@ -1317,8 +1356,11 @@ function buildKotlinPlugin(language) {
             for (const match of runCompiledPatterns(SPRING_CLASS_PREFIX_PATTERNS, tree)) {
                 const prefixNode = match.captures.prefix;
                 const classNode = match.captures.class;
+                const annNode = match.captures.ann;
                 if (!prefixNode || !classNode)
                     continue;
+                if (annNode && !isClassLevelMappingAnnotation(annNode.text))
+                    continue;
                 // An INTERPOLATED literal (`"${ApiPaths.BASE}"`) is not a path — see
                 // `isPlainStringLiteral`. Refusing it here also lets the unfoldable
                 // analysis below mark such a class, since that skips classes whose
@@ -1364,24 +1406,27 @@ function buildKotlinPlugin(language) {
             // Literal and constant-valued paths are normalized into one candidate list
             // so both reach the same Feign/interface/prefix classification below.
             const methodRoutes = [];
+            const classHttpMethodsById = kotlinClassHttpMethodsById(tree);
             for (const match of runCompiledPatterns(SPRING_METHOD_ROUTE_PATTERNS, tree)) {
                 const annNode = match.captures.ann;
                 const pathNode = match.captures.path;
                 const methodNode = match.captures.method;
                 if (!annNode || !pathNode || !methodNode)
                     continue;
-                const httpMethod = METHOD_ANNOTATION_TO_HTTP[annNode.text];
-                if (!httpMethod)
+                const httpMethods = springAnnotationHttpMethods(annNode.text, enclosingAnnotationText(annNode));
+                if (httpMethods.length === 0)
                     continue;
                 const rawPath = unquoteLiteral(pathNode.text);
                 if (rawPath === null)
                     continue;
-                methodRoutes.push({
-                    httpMethod,
-                    rawPath,
-                    nameNode: match.captures.method_name,
-                    methodNode,
-                });
+                for (const httpMethod of httpMethods) {
+                    methodRoutes.push({
+                        httpMethod,
+                        rawPath,
+                        nameNode: match.captures.method_name,
+                        methodNode,
+                    });
+                }
             }
             for (const match of runCompiledPatterns(SPRING_CONST_METHOD_ROUTE_PATTERNS, tree)) {
                 const annNode = match.captures.ann;
@@ -1389,8 +1434,8 @@ function buildKotlinPlugin(language) {
                 const methodNode = match.captures.method;
                 if (!annNode || !argNode || !methodNode)
                     continue;
-                const httpMethod = METHOD_ANNOTATION_TO_HTTP[annNode.text];
-                if (!httpMethod)
+                const httpMethods = springAnnotationHttpMethods(annNode.text, enclosingAnnotationText(annNode));
+                if (httpMethods.length === 0)
                     continue;
                 const expr = kotlinRouteArgumentExpression(argNode);
                 if (!expr || !FOLDABLE_PATH_EXPRESSIONS.has(expr.type))
@@ -1411,14 +1456,24 @@ function buildKotlinPlugin(language) {
                 const rawPath = foldKotlinOperands(fileKey, operands, index.repo, kotlinEnclosingTypeNames(methodNode), index);
                 if (rawPath === null)
                     continue;
-                methodRoutes.push({
-                    httpMethod,
-                    rawPath,
-                    nameNode: match.captures.method_name,
-                    methodNode,
-                });
+                for (const httpMethod of httpMethods) {
+                    methodRoutes.push({
+                        httpMethod,
+                        rawPath,
+                        nameNode: match.captures.method_name,
+                        methodNode,
+                    });
+                }
             }
-            for (const { httpMethod, rawPath, nameNode, methodNode } of methodRoutes) {
+            const constrainedMethodRoutes = methodRoutes.flatMap((route) => {
+                const owner = findEnclosingClass(route.methodNode);
+                const classMethods = owner ? (classHttpMethodsById.get(owner.id) ?? ['*']) : ['*'];
+                return intersectSpringHttpMethods(classMethods, [route.httpMethod]).map((httpMethod) => ({
+                    ...route,
+                    httpMethod,
+                }));
+            });
+            for (const { httpMethod, rawPath, nameNode, methodNode } of constrainedMethodRoutes) {
                 const enclosingClass = findEnclosingClass(methodNode);
                 // A @(Get|...)Mapping inside a @FeignClient interface is an OpenFeign
                 // consumer (a remote call), not a route this service serves.