PR Fixes

Author: lahirumaramba

src/main/java/com/google/firebase/remoteconfig/Condition.java

@@ -24,6 +24,8 @@
 import com.google.firebase.internal.Nullable;
 import com.google.firebase.remoteconfig.internal.TemplateResponse.ConditionResponse;
 
+import java.util.Objects;
+
 /**
  * Represents a Remote Config condition that can be included in a {@link Template}.
  * A condition targets a specific group of users. A list of these conditions make up
@@ -38,7 +40,7 @@ public final class Condition {
   /**
    * Creates a new {@link Condition}.
    *
-   * @param name A non-null, non-empty, and unique name of this condition.
+   * @param name       A non-null, non-empty, and unique name of this condition.
    * @param expression A non-null and non-empty expression of this condition.
    */
   public Condition(@NonNull String name, @NonNull String expression) {
@@ -47,7 +49,23 @@ public Condition(@NonNull String name, @NonNull String expression) {
             "condition expression must not be null or empty");
     this.name = name;
     this.expression = expression;
-    this.tagColor = TagColor.UNSPECIFIED;
+  }
+
+  /**
+   * Creates a new {@link Condition}.
+   *
+   * @param name       A non-null, non-empty, and unique name of this condition.
+   * @param expression A non-null and non-empty expression of this condition.
+   * @param tagColor   A non-null tag color of this condition.
+   */
+  public Condition(@NonNull String name, @NonNull String expression, @NonNull TagColor tagColor) {
+    checkArgument(!Strings.isNullOrEmpty(name), "condition name must not be null or empty");
+    checkArgument(!Strings.isNullOrEmpty(expression),
+            "condition expression must not be null or empty");
+    checkNotNull(tagColor, "condition tag color must not be null");
+    this.name = name;
+    this.expression = expression;
+    this.tagColor = tagColor;
   }
 
   Condition(@NonNull ConditionResponse conditionResponse) {
@@ -64,7 +82,7 @@ public Condition(@NonNull String name, @NonNull String expression) {
   /**
    * Gets the name of the condition.
    *
-   * @return The {@link String} name of the condition.
+   * @return The name of the condition.
    */
   @NonNull
   public String getName() {
@@ -74,7 +92,7 @@ public String getName() {
   /**
    * Gets the expression of the condition.
    *
-   * @return The {@link String} expression of the condition.
+   * @return The expression of the condition.
    */
   @NonNull
   public String getExpression() {
@@ -84,7 +102,7 @@ public String getExpression() {
   /**
    * Gets the tag color of the condition.
    *
-   * @return The {@link String} tag color of the condition.
+   * @return The tag color of the condition.
    */
   @NonNull
   public TagColor getTagColor() {
@@ -127,18 +145,30 @@ public Condition setExpression(@NonNull String expression) {
    * with the condition.
    *
    * @param tagColor The tag color of this condition.
-   *                 Passing null sets to {@code TagColor.UNSPECIFIED}
    * @return This {@link Condition}.
    */
   public Condition setTagColor(@Nullable TagColor tagColor) {
-    this.tagColor = tagColor == null ? TagColor.UNSPECIFIED : tagColor;
+    this.tagColor = tagColor;
     return this;
   }
 
   ConditionResponse toConditionResponse() {
     return new ConditionResponse()
             .setName(this.name)
             .setExpression(this.expression)
-            .setTagColor(this.tagColor.getColor());
+            .setTagColor(this.tagColor == null ? null : this.tagColor.getColor());
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Condition condition = (Condition) o;
+    return Objects.equals(name, condition.name)
+            && Objects.equals(expression, condition.expression) && tagColor == condition.tagColor;
   }
 }

src/main/java/com/google/firebase/remoteconfig/TagColor.java

@@ -1,5 +1,24 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.firebase.remoteconfig;
 
+/**
+ * Colors that are associated with conditions for display purposes.
+ */
 public enum TagColor {
   BLUE("BLUE"),
   BROWN("BROWN"),

src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImplTest.java

@@ -45,7 +45,6 @@
 import com.google.firebase.testing.TestUtils;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -112,20 +111,16 @@ public void testGetTemplate() throws Exception {
 
     // Check Conditions
     List<Condition> actualConditions = template.getConditions();
-    List<Condition> expectedConditions = new ArrayList<>();
-    expectedConditions
-            .add(new Condition("ios_en", "device.os == 'ios' && device.country in ['us', 'uk']")
-                    .setTagColor(TagColor.INDIGO));
-    expectedConditions
-            .add(new Condition("android_en",
+    List<Condition> expectedConditions = ImmutableList.of(
+            new Condition("ios_en", "device.os == 'ios' && device.country in ['us', 'uk']")
+                    .setTagColor(TagColor.INDIGO),
+            new Condition("android_en",
                     "device.os == 'android' && device.country in ['us', 'uk']")
-                    .setTagColor(TagColor.UNSPECIFIED));
+                    .setTagColor(TagColor.UNSPECIFIED)
+    );
     assertEquals(expectedConditions.size(), actualConditions.size());
     for (int i = 0; i < expectedConditions.size(); i++) {
-      assertEquals(expectedConditions.get(i).getName(), actualConditions.get(i).getName());
-      assertEquals(expectedConditions.get(i).getExpression(),
-              actualConditions.get(i).getExpression());
-      assertEquals(expectedConditions.get(i).getTagColor(), actualConditions.get(i).getTagColor());
+      assertEquals(expectedConditions.get(i), actualConditions.get(i));
     }
   }