fix related to comment changes

Varun Rathore · Varun Rathore · commit fbd0b212cf19 · 2025-06-23T11:08:24.000+05:30
diff --git a/src/main/java/com/google/firebase/remoteconfig/AndCondition.java b/src/main/java/com/google/firebase/remoteconfig/AndCondition.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClient.java b/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClient.java
@@ -42,5 +42,4 @@ ListVersionsResponse listVersions(
           ListVersionsOptions options) throws FirebaseRemoteConfigException;
   
   String getServerTemplate() throws FirebaseRemoteConfigException;
-  
-}
+}
diff --git a/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImpl.java b/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImpl.java
@@ -300,4 +300,4 @@ private RemoteConfigServiceErrorResponse safeParse(String response) {
       return new RemoteConfigServiceErrorResponse();
     }
   }
-}
+}
diff --git a/src/main/java/com/google/firebase/remoteconfig/KeysAndValues.java b/src/main/java/com/google/firebase/remoteconfig/KeysAndValues.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/remoteconfig/OneOfCondition.java b/src/main/java/com/google/firebase/remoteconfig/OneOfCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,4 +98,4 @@ OneOfConditionResponse toOneOfConditionResponse() {
     }
     return oneOfConditionResponse;
   }
-}
+}
diff --git a/src/main/java/com/google/firebase/remoteconfig/OrCondition.java b/src/main/java/com/google/firebase/remoteconfig/OrCondition.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerCondition.java b/src/main/java/com/google/firebase/remoteconfig/ServerCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,4 +86,4 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(name, serverCondition);
   }
-}
+}
diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerConfig.java b/src/main/java/com/google/firebase/remoteconfig/ServerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,4 +99,4 @@ private Value getValue(String key) {
     }
     return new Value(ValueSource.STATIC);
   }
-}
+}
diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerTemplate.java b/src/main/java/com/google/firebase/remoteconfig/ServerTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,20 +27,10 @@ public interface Builder {
     
     ServerTemplate build();
   }
-  /**
-  * Proccess the template data with a condition evaluator 
-  * based on the provided context. 
-  */
-  ServerConfig evaluate(KeysAndValues context) throws FirebaseRemoteConfigException;
-  /**
-  * Proccess the template data without context.
-  */
-  ServerConfig evaluate() throws FirebaseRemoteConfigException;
-
   /**
   * Fetches and caches the current active version of the project.
   */
   ApiFuture<Void> load() throws FirebaseRemoteConfigException;
 
   String toJson();
-}
+}
diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerTemplateData.java b/src/main/java/com/google/firebase/remoteconfig/ServerTemplateData.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java b/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,27 +19,18 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
-import com.google.common.collect.ImmutableMap;
-import com.google.firebase.ErrorCode;
-import com.google.firebase.remoteconfig.internal.TemplateResponse.ParameterValueResponse;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public final class ServerTemplateImpl implements ServerTemplate {
 
   private final KeysAndValues defaultConfig;
   private FirebaseRemoteConfigClient client;
   private ServerTemplateData cache;
   private final AtomicReference<String> cachedTemplate; // Added field for cached template
-  private static final Logger logger = LoggerFactory.getLogger(ServerTemplate.class);
-
+  
   public static class Builder implements ServerTemplate.Builder {
     private KeysAndValues defaultConfig;
     private String cachedTemplate;
@@ -74,25 +65,10 @@ private ServerTemplateImpl(Builder builder) {
     try {
       this.cache = ServerTemplateData.fromJSON(this.cachedTemplate.get());
     } catch (FirebaseRemoteConfigException e) {
-      // TODO Auto-generated catch block
       e.printStackTrace();
     }
   }
 
-  //TODO : Implementation of Evaluate will be in another PR
-  @Override
-  public ServerConfig evaluate(KeysAndValues context) throws FirebaseRemoteConfigException {
-    
-    Map<String, Value> configValues = new HashMap<>();
-    return new ServerConfig(configValues);
-  }
-
-  @Override
-  public ServerConfig evaluate() throws FirebaseRemoteConfigException {
-    KeysAndValues context = new KeysAndValues.Builder().build();
-    return evaluate(context);
-  }
-
   @Override
   public ApiFuture<Void> load() throws FirebaseRemoteConfigException {
     String serverTemplate = client.getServerTemplate();
@@ -115,62 +91,4 @@ public String toJson() {
     Gson gson = new GsonBuilder().setPrettyPrinting().create();
     return gson.toJson(this.cache);
   }
-
-  private void mergeDerivedConfigValues(ImmutableMap<String, Boolean> evaluatedCondition,
-      ImmutableMap<String, Parameter> parameters, Map<String, Value> configValues) {
-    // Overlays config Value objects derived by evaluating the template.
-    for (String parameterName : parameters.keySet()) {
-      Parameter parameter = parameters.get(parameterName);
-      if (parameter == null) {
-        logger.warn(String.format("Parameter value is not assigned for %s", parameterName));
-        continue;
-      }
-
-      ImmutableMap<String, ParameterValue> conditionalValues = ImmutableMap.copyOf(
-          parameter.getConditionalValues());
-      ParameterValue derivedValue = null;
-
-      // Iterates in order over condition list. If there is a value associated
-      // with a condition, this checks if the condition is true.
-      for (String conditionName : evaluatedCondition.keySet()) {
-        boolean conditionEvaluation = evaluatedCondition.get(conditionName);
-        if (conditionalValues.containsKey(conditionName) && conditionEvaluation) {
-          derivedValue = conditionalValues.get(conditionName);
-          break;
-        }
-      }
-
-      if (derivedValue != null && derivedValue.toParameterValueResponse().isUseInAppDefault()) {
-        logger.warn(
-            String.format("Derived value found for %s but parameter is set to use in app default.",
-                parameterName));
-        continue;
-      }
-
-      if (derivedValue != null) {
-        String parameterValue = derivedValue.toParameterValueResponse().getValue();
-        Value value = new Value(ValueSource.REMOTE, parameterValue);
-        configValues.put(parameterName, value);
-        continue;
-      }
-
-      ParameterValue defaultValue = parameter.getDefaultValue();
-      if (defaultValue == null) {
-        logger.warn(String.format("Default parameter value for %s is not set.",
-            parameterName));
-        continue;
-      }
-
-      ParameterValueResponse defaultValueResponse = defaultValue.toParameterValueResponse();
-      if (defaultValueResponse != null && defaultValueResponse.isUseInAppDefault()) {
-        logger.info(String.format("Default value for %s is set to use in app default.",
-            parameterName));
-        continue;
-      }
-
-      String parameterDefaultValue = defaultValue.toParameterValueResponse().getValue();
-      Value value = new Value(ValueSource.REMOTE, parameterDefaultValue);
-      configValues.put(parameterName, value);
-    }
-  }
 }
diff --git a/src/main/java/com/google/firebase/remoteconfig/Value.java b/src/main/java/com/google/firebase/remoteconfig/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,4 +132,4 @@ long asLong() {
   ValueSource getSource() {
     return source;
   }
-}
+}
diff --git a/src/main/java/com/google/firebase/remoteconfig/ValueSource.java b/src/main/java/com/google/firebase/remoteconfig/ValueSource.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/remoteconfig/internal/ServerTemplateResponse.java b/src/main/java/com/google/firebase/remoteconfig/internal/ServerTemplateResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -317,4 +317,4 @@ public MicroPercentRangeResponse setMicroPercentUpperBound(int microPercentUpper
       return this;
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`/*`
`3`		`- * Copyright 2020 Google LLC`
	`3`	`+ * Copyright 2025 Google LLC`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -300,4 +300,4 @@ private RemoteConfigServiceErrorResponse safeParse(String response) {`
`300`	`300`	`return new RemoteConfigServiceErrorResponse();`
`301`	`301`	`}`
`302`	`302`	`}`
`303`		`-}`
	`303`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2020 Google LLC`
	`2`	`+ * Copyright 2025 Google LLC`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -98,4 +98,4 @@ OneOfConditionResponse toOneOfConditionResponse() {`
`98`	`98`	`}`
`99`	`99`	`return oneOfConditionResponse;`
`100`	`100`	`}`
`101`		`-}`
	`101`	`+}`