fixed sonar issue.

Signed-off-by: thiyagu06 <[email protected]>

Author: thiyagu06

src/main/java/dev/openfeature/sdk/ImmutableContext.java

@@ -74,18 +74,18 @@ public EvaluationContext merge(EvaluationContext overridingContext) {
         if (overridingContext == null) {
             return new ImmutableContext(this.targetingKey, this.asMap());
         }
-        String targetingKey = "";
+        String newTargetingKey = "";
         if (this.getTargetingKey() != null && !this.getTargetingKey().trim().equals("")) {
-            targetingKey = this.getTargetingKey();
+            newTargetingKey = this.getTargetingKey();
         }
 
         if (overridingContext.getTargetingKey() != null && !overridingContext.getTargetingKey().trim().equals("")) {
-            targetingKey = overridingContext.getTargetingKey();
+            newTargetingKey = overridingContext.getTargetingKey();
         }
         Map<String, Value> merged = new HashMap<>();
 
         merged.putAll(this.asMap());
         merged.putAll(overridingContext.asMap());
-        return new ImmutableContext(targetingKey, merged);
+        return new ImmutableContext(newTargetingKey, merged);
     }
 }

src/test/java/dev/openfeature/sdk/ImmutableContextTest.java

@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ImmutableContextTest {
+class ImmutableContextTest {
 
     @Test
     @DisplayName("Mutating targeting key is not allowed on Immutable Context")
@@ -26,7 +26,7 @@ void shouldCreateCopyOfAttributesForImmutableContext() {
         attributes.put("key2", new Value("val2"));
         EvaluationContext ctx = new ImmutableContext("targeting key", attributes);
         attributes.put("key3", new Value("val3"));
-        assertArrayEquals(ctx.keySet().toArray(), new Object[]{"key1", "key2"});
+        assertArrayEquals(new Object[]{"key1", "key2"}, ctx.keySet().toArray());
     }
 
     @DisplayName("targeting key should be changed from the overriding context")
@@ -62,6 +62,6 @@ void mergeShouldReturnAllTheValuesFromTheContextWhenOverridingContextIsNull() {
         EvaluationContext ctx = new ImmutableContext("targeting_key", attributes);
         EvaluationContext merge = ctx.merge(null);
         assertEquals("targeting_key", merge.getTargetingKey());
-        assertArrayEquals(merge.keySet().toArray(), new Object[]{"key1", "key2"});
+        assertArrayEquals(new Object[]{"key1", "key2"}, merge.keySet().toArray());
     }
 }

src/test/java/dev/openfeature/sdk/ImmutableStructureTest.java

@@ -15,13 +15,13 @@
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class ImmutableStructureTest {
-    @Test public void noArgShouldContainEmptyAttributes() {
+class ImmutableStructureTest {
+    @Test void noArgShouldContainEmptyAttributes() {
         ImmutableStructure structure = new ImmutableStructure();
         assertEquals(0, structure.asMap().keySet().size());
     }
 
-    @Test public void mapArgShouldContainNewMap() {
+    @Test void mapArgShouldContainNewMap() {
         String KEY = "key";
         Map<String, Value> map = new HashMap<String, Value>() {
             {
@@ -33,7 +33,7 @@ public class ImmutableStructureTest {
         assertNotSame(structure.asMap(), map); // should be a copy
     }
 
-    @Test public void MutatingGetValueShouldNotChangeOriginalValue() {
+    @Test void MutatingGetValueShouldNotChangeOriginalValue() {
         String KEY = "key";
         List<Value> lists = new ArrayList<>();
         lists.add(new Value(KEY));
@@ -50,7 +50,7 @@ public class ImmutableStructureTest {
         assertNotSame(structure.asMap(), map); // should be a copy
     }
 
-    @Test public void MutatingGetInstantValueShouldNotChangeOriginalValue() {
+    @Test void MutatingGetInstantValueShouldNotChangeOriginalValue() {
         String KEY = "key";
         Instant now = Instant.now();
         Map<String, Value> map = new HashMap<String, Value>() {
@@ -68,7 +68,7 @@ public class ImmutableStructureTest {
         assertEquals(now, structure.getValue(KEY).asInstant());
     }
 
-    @Test public void MutatingGetStructureValueShouldNotChangeOriginalValue() {
+    @Test void MutatingGetStructureValueShouldNotChangeOriginalValue() {
         String KEY = "key";
         List<Value> lists = new ArrayList<>();
         lists.add(new Value("dummy_list_1"));