chore: update rest-related annotations

forcedotcom · Dec 17, 2024 · 8a79000 · 8a79000
1 parent d84d771
commit 8a79000
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/packages/salesforcedx-vscode-apex/src/languageServer.ts b/packages/salesforcedx-vscode-apex/src/languageServer.ts
@@ -22,7 +22,8 @@ import {
   retrieveAAMethodAccessModifiers,
   retrieveAAPropDefModifiers,
   retrieveAAPropAccessModifiers,
-  retrieveAAClassAnnotations,
+  retrieveAAClassRestAnnotations,
+  retrieveAAMethodRestAnnotations,
   retrieveAAMethodAnnotations,
   retrieveGeneralClassAccessModifiers,
   retrieveGeneralMethodAccessModifiers,
@@ -171,7 +172,8 @@ export const buildClientOptions = (): LanguageClientOptions => {
       apexActionMethodAccessModifiers: retrieveAAMethodAccessModifiers().join(','),
       apexActionPropDefModifiers: retrieveAAPropDefModifiers().join(','),
       apexActionPropAccessModifiers: retrieveAAPropAccessModifiers().join(','),
-      apexActionClassAnnotations: retrieveAAClassAnnotations().join(','),
+      apexActionClassRestAnnotations: retrieveAAClassRestAnnotations().join(','),
+      apexActionMethodRestAnnotations: retrieveAAMethodRestAnnotations().join(','),
       apexActionMethodAnnotations: retrieveAAMethodAnnotations().join(','),
       apexOASClassAccessModifiers: retrieveGeneralClassAccessModifiers().join(','),
       apexOASMethodAccessModifiers: retrieveGeneralMethodAccessModifiers().join(','),

diff --git a/packages/salesforcedx-vscode-apex/src/settings.ts b/packages/salesforcedx-vscode-apex/src/settings.ts
@@ -15,8 +15,9 @@ const APEX_ACTION_METHOD_DEF_MODIFIERS = ['static'];
 const APEX_ACTION_METHOD_ACCESS_MODIFIERS = ['global', 'public'];
 const APEX_ACTION_PROP_DEF_MODIFIERS = ['static'];
 const APEX_ACTION_PROP_ACCESS_MODIFIERS = ['global', 'public'];
-const APEX_ACTION_CLASS_ANNOTATION = ['AuraEnabled', 'RestResource'];
-const APEX_ACTION_METHOD_ANNOTATION = ['AuraEnabled', 'HttpDelete', 'HttpGet', 'HttpPatch', 'HttpPost', 'HttpPut'];
+const APEX_ACTION_CLASS_REST_ANNOTATION = ['RestResource'];
+const APEX_ACTION_METHOD_REST_ANNOTATION = ['HttpDelete', 'HttpGet', 'HttpPatch', 'HttpPost', 'HttpPut'];
+const APEX_ACTION_METHOD_ANNOTATION = ['AuraEnabled'];
 
 // Default eligibility for general OAS generation. Users can changed the setting through VSCode configurations
 const DEFAULT_CLASS_ACCESS_MODIFIERS = ['global', 'public'];
@@ -79,20 +80,22 @@ export const retrieveAAPropAccessModifiers = (): string[] => {
   return [...new Set([...APEX_ACTION_PROP_ACCESS_MODIFIERS, ...userDefinedModifiers])];
 };
 
-export const retrieveAAClassAnnotations = (): string[] => {
-  const userDefinedModifiers = vscode.workspace
-    .getConfiguration()
-    .get<string[]>('salesforcedx-vscode-apex.apexoas.aa.class.annotations', []);
-  return [...new Set([...APEX_ACTION_CLASS_ANNOTATION, ...userDefinedModifiers])];
-};
-
 export const retrieveAAMethodAnnotations = (): string[] => {
   const userDefinedModifiers = vscode.workspace
     .getConfiguration()
     .get<string[]>('salesforcedx-vscode-apex.apexoas.aa.method.annotations', []);
   return [...new Set([...APEX_ACTION_METHOD_ANNOTATION, ...userDefinedModifiers])];
 };
 
+// The REST-related annotations should not be edited by users
+export const retrieveAAClassRestAnnotations = (): string[] => {
+  return [...new Set([...APEX_ACTION_CLASS_REST_ANNOTATION])];
+};
+
+export const retrieveAAMethodRestAnnotations = (): string[] => {
+  return [...new Set([...APEX_ACTION_METHOD_REST_ANNOTATION])];
+};
+
 export const retrieveGeneralClassAccessModifiers = (): string[] =>
   vscode.workspace
     .getConfiguration()