Change it to keep query id

Author: MichaelRFairhurst

…rules/A0-1-2/UnusedReturnValueAutosar.ql …ar/src/rules/A0-1-2/UnusedReturnValue.qlcpp/autosar/src/rules/A0-1-2/UnusedReturnValueAutosar.ql renamed to cpp/autosar/src/rules/A0-1-2/UnusedReturnValue.ql cpp/autosar/src/rules/A0-1-2/UnusedReturnValueAutosar.ql renamed to cpp/autosar/src/rules/A0-1-2/UnusedReturnValue.ql

@@ -16,10 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
+import codingstandards.cpp.rules.unusedreturnvalueshared.UnusedReturnValueShared
 
-module UnusedReturnValueAutosarConfig implements UnusedReturnValueConfigSig {
-  Query getQuery() { result = DeadCodePackage::unusedReturnValueAutosarQuery() }
+module UnusedReturnValueConfig implements UnusedReturnValueSharedConfigSig {
+  Query getQuery() { result = DeadCodePackage::unusedReturnValueQuery() }
 }
 
-import UnusedReturnValue<UnusedReturnValueAutosarConfig>
+import UnusedReturnValueShared<UnusedReturnValueConfig>

cpp/autosar/test/rules/A0-1-2/UnusedReturnValue.testref

@@ -0,0 +1 @@
+cpp/common/test/rules/unusedreturnvalueshared/UnusedReturnValueShared.ql

cpp/autosar/test/rules/A0-1-2/UnusedReturnValueAutosar.testref

@@ -9,11 +9,11 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-signature module UnusedReturnValueConfigSig {
+signature module UnusedReturnValueSharedConfigSig {
   Query getQuery();
 }
 
-module UnusedReturnValue<UnusedReturnValueConfigSig Config> {
+module UnusedReturnValueShared<UnusedReturnValueSharedConfigSig Config> {
   /*
    * This query performs a simple syntactic check to ensure that the return value of the function is
    * not completely ignored. This matches the examples given in the rule, although the text itself is

…/unusedreturnvalue/UnusedReturnValue.qll …nvalueshared/UnusedReturnValueShared.qllcpp/common/src/codingstandards/cpp/rules/unusedreturnvalue/UnusedReturnValue.qll renamed to cpp/common/src/codingstandards/cpp/rules/unusedreturnvalueshared/UnusedReturnValueShared.qll cpp/common/src/codingstandards/cpp/rules/unusedreturnvalue/UnusedReturnValue.qll renamed to cpp/common/src/codingstandards/cpp/rules/unusedreturnvalueshared/UnusedReturnValueShared.qll

@@ -0,0 +1,8 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.unusedreturnvalueshared.UnusedReturnValueShared
+
+module TestFileConfig implements UnusedReturnValueSharedConfigSig {
+  Query getQuery() { result instanceof TestQuery }
+}
+
+import UnusedReturnValueShared<TestFileConfig>

cpp/common/test/rules/unusedreturnvalue/UnusedReturnValue.ql

@@ -14,10 +14,10 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
+import codingstandards.cpp.rules.unusedreturnvalueshared.UnusedReturnValueShared
 
-module UnusedReturnValueMisraCppConfig implements UnusedReturnValueConfigSig {
+module UnusedReturnValueMisraCppConfig implements UnusedReturnValueSharedConfigSig {
   Query getQuery() { result = DeadCode6Package::unusedReturnValueMisraCppQuery() }
 }
 
-import UnusedReturnValue<UnusedReturnValueMisraCppConfig>
+import UnusedReturnValueShared<UnusedReturnValueMisraCppConfig>

…edreturnvalue/UnusedReturnValue.expected …rnvalue/UnusedReturnValueShared.expectedcpp/common/test/rules/unusedreturnvalue/UnusedReturnValue.expected renamed to cpp/common/test/rules/unusedreturnvalue/UnusedReturnValueShared.expected cpp/common/test/rules/unusedreturnvalue/UnusedReturnValue.expected renamed to cpp/common/test/rules/unusedreturnvalue/UnusedReturnValueShared.expected

@@ -1 +1 @@
-cpp/common/test/rules/unusedreturnvalue/UnusedReturnValue.ql
+cpp/common/test/rules/unusedreturnvalueshared/UnusedReturnValueShared.ql

cpp/common/test/rules/unusedreturnvalue/UnusedReturnValueShared.ql

@@ -39,8 +39,8 @@
           "name": "Unused return value",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "UnusedReturnValueAutosar",
-          "shared_implementation_short_name": "UnusedReturnValue",
+          "short_name": "UnusedReturnValue",
+          "shared_implementation_short_name": "UnusedReturnValueShared",
           "tags": [
             "readability",
             "maintainability"