diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/Constants.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/Constants.java
index d8b7ada7b4b..0ba5bb7d108 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/Constants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/Constants.java
@@ -21,8 +21,8 @@ package org.wso2.carbon.device.mgt.core.search.mgt;
 
 public class Constants {
 
-    public static String GENERAL = "GENERAL";
-    public static String PROP_AND = "PROP_AND";
-    public static String PROP_OR = "PROP_OR";
-    public static String LOCATION = "LOCATION";
+    public static final String GENERAL = "GENERAL";
+    public static final String PROP_AND = "PROP_AND";
+    public static final String PROP_OR = "PROP_OR";
+    public static final String LOCATION = "LOCATION";
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java
index 3aef2ca2548..bb467761e71 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java
@@ -27,13 +27,13 @@ import java.util.Properties;
 
 public class TestDataHolder {
 
+    public final static String TEST_DEVICE_TYPE = "Test";
+    public final static Integer SUPER_TENANT_ID = -1234;
+    public final static String SUPER_TENANT_DOMAIN = "carbon.super";
+    public final static String initialDeviceIdentifier = "12345";
+    public final static String OWNER = "admin";
     public static Device initialTestDevice;
     public static DeviceType initialTestDeviceType;
-    public static String TEST_DEVICE_TYPE = "Test";
-    public static Integer SUPER_TENANT_ID = -1234;
-    public static String SUPER_TENANT_DOMAIN="carbon.super";
-    public static String initialDeviceIdentifier = "12345";
-    public static String OWNER = "admin";
 
     public static Device generateDummyDeviceData(String deviceType){
 
diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/src/main/java/org/wso2/carbon/identity/authenticator/backend/oauth/OauthAuthenticatorConstants.java b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/src/main/java/org/wso2/carbon/identity/authenticator/backend/oauth/OauthAuthenticatorConstants.java
index 4c7ace2e6db..66e96101a87 100755
--- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/src/main/java/org/wso2/carbon/identity/authenticator/backend/oauth/OauthAuthenticatorConstants.java
+++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/src/main/java/org/wso2/carbon/identity/authenticator/backend/oauth/OauthAuthenticatorConstants.java
@@ -24,6 +24,6 @@ public class OauthAuthenticatorConstants {
     public static final String BEARER_TOKEN_IDENTIFIER = "token";
     public static final String AUTHENTICATOR_NAME = "OAuthAuthenticator";
     public static final String SPLITING_CHARACTOR = " ";
-    public static String OAUTH_ENDPOINT_POSTFIX =
+    public static final String OAUTH_ENDPOINT_POSTFIX =
             "/services/OAuth2TokenValidationService.OAuth2TokenValidationServiceHttpsSoap12Endpoint/";
 }