Przeglądaj źródła

Address SonarLint findings in JniClass class

Patrick-Christopher Mattulat 1 rok temu
rodzic
commit
2f4b0921f5

+ 2 - 2
include/ls-std/core/jni/JniClass.hpp

@@ -3,7 +3,7 @@
 * Company:         Lynar Studios
 * E-Mail:          webmaster@lynarstudios.com
 * Created:         2023-04-07
-* Changed:         2023-04-11
+* Changed:         2023-05-16
 *
 * */
 
@@ -49,7 +49,7 @@ namespace ls::std::core::experimental
       void _callIntMethod(const ::std::string &_methodIdentifier, ls::std::core::experimental::JniReturnValue &_returnValue);
       void _callLongMethod(const ::std::string &_methodIdentifier, ls::std::core::experimental::JniReturnValue &_returnValue);
       void _callShortMethod(const ::std::string &_methodIdentifier, ls::std::core::experimental::JniReturnValue &_returnValue);
-      void _createJniApi();
+      void _createJniApi() const;
       [[nodiscard]] bool _hasMethod(const ::std::string &_methodIdentifier);
   };
 }

+ 3 - 5
source/ls-std/core/jni/JniClass.cpp

@@ -3,7 +3,7 @@
 * Company:         Lynar Studios
 * E-Mail:          webmaster@lynarstudios.com
 * Created:         2023-04-07
-* Changed:         2023-04-11
+* Changed:         2023-05-16
 *
 * */
 
@@ -30,13 +30,11 @@ using std::pair;
 using std::shared_ptr;
 using std::string;
 
-JniClass::JniClass(const shared_ptr<JniClassParameter> &_parameter, const string &_path)
+JniClass::JniClass(const shared_ptr<JniClassParameter> &_parameter, const string &_path) : parameter(_parameter), path(_path)
 {
   NullPointerArgumentEvaluator{_parameter, "no provided reference to JNI class parameter!"}.evaluate();
   EmptyStringArgumentEvaluator{_path, "path to associated Java class is empty!"}.evaluate();
   NullPointerArgumentEvaluator{_parameter->getJavaEnvironment(), "Java environment is not being provided!"}.evaluate();
-  this->parameter = _parameter;
-  this->path = _path;
   ConditionalFunctionExecutor{_parameter->getJniApi() == nullptr}.execute([this]() { _createJniApi(); });
 }
 
@@ -192,7 +190,7 @@ void JniClass::_callShortMethod(const string &_methodIdentifier, JniReturnValue
   }
 }
 
-void JniClass::_createJniApi()
+void JniClass::_createJniApi() const
 {
   this->parameter->setJniApi(make_shared<JniApi>(this->parameter->getJavaEnvironment()));
 }

+ 15 - 15
test/cases/core/jni/JniClassTest.cpp

@@ -3,7 +3,7 @@
 * Company:         Lynar Studios
 * E-Mail:          webmaster@lynarstudios.com
 * Created:         2023-04-07
-* Changed:         2023-04-11
+* Changed:         2023-05-16
 *
 * */
 
@@ -37,10 +37,10 @@ namespace
 
       JniClass createJniClass(const string &_classPath)
       {
-        shared_ptr<JniClassParameter> parameter = make_shared<JniClassParameter>();
+        auto parameter = make_shared<JniClassParameter>();
         this->jniApi = make_shared<MockJniApi>();
         parameter->setJniApi(this->jniApi);
-        shared_ptr<JNIEnv> environment = make_shared<JNIEnv>();
+        auto environment = make_shared<JNIEnv>();
         parameter->setJavaEnvironment(environment.get());
 
         return JniClass{parameter, _classPath};
@@ -120,7 +120,7 @@ namespace
     string methodIdentifier = "isBlue";
     string methodSignature = "()Z";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callBooleanMethod(testing::_, methodId)).Times(AtLeast(1));
@@ -142,7 +142,7 @@ namespace
     string methodIdentifier = "getDay";
     string methodSignature = "()B";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callByteMethod(testing::_, methodId)).Times(AtLeast(1));
@@ -164,7 +164,7 @@ namespace
     string methodIdentifier = "getLetter";
     string methodSignature = "()C";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callCharMethod(testing::_, methodId)).Times(AtLeast(1));
@@ -186,11 +186,11 @@ namespace
     string methodIdentifier = "getPi";
     string methodSignature = "()D";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callDoubleMethod(testing::_, methodId)).Times(AtLeast(1));
-    ON_CALL(*this->jniApi, callDoubleMethod(testing::_, methodId)).WillByDefault(Return(3.14159265l));
+    ON_CALL(*this->jniApi, callDoubleMethod(testing::_, methodId)).WillByDefault(Return(3.14159265L));
 
     ASSERT_TRUE(javaClass.load());
     ASSERT_TRUE(javaClass.loadMethod(methodIdentifier, methodSignature));
@@ -208,11 +208,11 @@ namespace
     string methodIdentifier = "getPi";
     string methodSignature = "()F";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callFloatMethod(testing::_, methodId)).Times(AtLeast(1));
-    ON_CALL(*this->jniApi, callFloatMethod(testing::_, methodId)).WillByDefault(Return(3.14159f));
+    ON_CALL(*this->jniApi, callFloatMethod(testing::_, methodId)).WillByDefault(Return(3.14159F));
 
     ASSERT_TRUE(javaClass.load());
     ASSERT_TRUE(javaClass.loadMethod(methodIdentifier, methodSignature));
@@ -230,7 +230,7 @@ namespace
     string methodIdentifier = "getYear";
     string methodSignature = "()I";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callIntMethod(testing::_, methodId)).Times(AtLeast(1));
@@ -252,7 +252,7 @@ namespace
     string methodIdentifier = "getAmountOfMoney";
     string methodSignature = "()J";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callLongMethod(testing::_, methodId)).Times(AtLeast(1));
@@ -274,7 +274,7 @@ namespace
     string methodIdentifier = "getDay";
     string methodSignature = "()S";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     EXPECT_CALL(*this->jniApi, callShortMethod(testing::_, methodId)).Times(AtLeast(1));
@@ -315,7 +315,7 @@ namespace
     string methodIdentifier = "getDay";
     string methodSignature = "()B";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     ASSERT_TRUE(javaClass.load());
@@ -333,7 +333,7 @@ namespace
     string methodIdentifier = "getDay";
     string methodSignature = "()B";
     EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
-    jmethodID methodId = (jmethodID) make_shared<int>().get();
+    auto methodId = (jmethodID) make_shared<int>().get();
     ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
 
     ASSERT_TRUE(javaClass.load());