Update constructor to use ? instead of object - reverting

Author: The-inside-man

core-api/src/main/java/com/optimizely/ab/Optimizely.java

@@ -422,7 +422,7 @@ private Boolean isFeatureEnabled(@Nonnull ProjectConfig projectConfig,
             return false;
         }
 
-        Map<String, Object> copiedAttributes = copyAttributes(attributes);
+        Map<String, ?> copiedAttributes = copyAttributes(attributes);
         FeatureDecision.DecisionSource decisionSource = FeatureDecision.DecisionSource.ROLLOUT;
         FeatureDecision featureDecision = decisionService.getVariationForFeature(featureFlag, createUserContext(userId, copiedAttributes), projectConfig).getResult();
         Boolean featureEnabled = false;
@@ -732,7 +732,7 @@ <T> T getFeatureVariableValueForType(@Nonnull String featureKey,
         }
 
         String variableValue = variable.getDefaultValue();
-        Map<String, Object> copiedAttributes = copyAttributes(attributes);
+        Map<String, ?> copiedAttributes = copyAttributes(attributes);
         FeatureDecision featureDecision = decisionService.getVariationForFeature(featureFlag, createUserContext(userId, copiedAttributes), projectConfig).getResult();
         Boolean featureEnabled = false;
         if (featureDecision.variation != null) {
@@ -865,7 +865,7 @@ public OptimizelyJSON getAllFeatureVariables(@Nonnull String featureKey,
             return null;
         }
 
-        Map<String, Object> copiedAttributes = copyAttributes(attributes);
+        Map<String, ?> copiedAttributes = copyAttributes(attributes);
         FeatureDecision featureDecision = decisionService.getVariationForFeature(featureFlag, createUserContext(userId, copiedAttributes), projectConfig, Collections.emptyList()).getResult();
         Boolean featureEnabled = false;
         Variation variation = featureDecision.variation;
@@ -935,7 +935,7 @@ public List<String> getEnabledFeatures(@Nonnull String userId, @Nonnull Map<Stri
             return enabledFeaturesList;
         }
 
-        Map<String, Object> copiedAttributes = copyAttributes(attributes);
+        Map<String, ?> copiedAttributes = copyAttributes(attributes);
         for (FeatureFlag featureFlag : projectConfig.getFeatureFlags()) {
             String featureKey = featureFlag.getKey();
             if (isFeatureEnabled(projectConfig, featureKey, userId, copiedAttributes))
@@ -951,7 +951,7 @@ public List<String> getEnabledFeatures(@Nonnull String userId, @Nonnull Map<Stri
     public Variation getVariation(@Nonnull Experiment experiment,
                                   @Nonnull String userId) throws UnknownExperimentException {
 
-        return getVariation(experiment, userId, Collections.<String, String>emptyMap());
+        return getVariation(experiment, userId, Collections.emptyMap());
     }
 
     @Nullable
@@ -966,7 +966,7 @@ private Variation getVariation(@Nonnull ProjectConfig projectConfig,
                                    @Nonnull Experiment experiment,
                                    @Nonnull String userId,
                                    @Nonnull Map<String, ?> attributes) throws UnknownExperimentException {
-        Map<String, Object> copiedAttributes = copyAttributes(attributes);
+        Map<String, ?> copiedAttributes = copyAttributes(attributes);
         Variation variation = decisionService.getVariation(experiment, createUserContext(userId, copiedAttributes), projectConfig).getResult();
         String notificationType = NotificationCenter.DecisionNotificationType.AB_TEST.toString();
 
@@ -1150,7 +1150,7 @@ public OptimizelyConfig getOptimizelyConfig() {
      * @return An OptimizelyUserContext associated with this OptimizelyClient.
       */
     public OptimizelyUserContext createUserContext(@Nonnull String userId,
-                                                   @Nonnull Map<String, Object> attributes) {
+                                                   @Nonnull Map<String, ?> attributes) {
         if (userId == null) {
             logger.warn("The userId parameter must be nonnull.");
             return null;
@@ -1360,7 +1360,7 @@ public Variation getFlagVariationByKey(String flagKey, String variationKey) {
      * @param attributes map to copy
      * @return copy of attributes
      */
-    private Map<String, Object> copyAttributes(Map<String, ?> attributes) {
+    private Map<String, ?> copyAttributes(Map<String, ?> attributes) {
         Map<String, Object> copiedAttributes = null;
         if (attributes != null) {
             copiedAttributes = new HashMap<>(attributes);

core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java

@@ -59,7 +59,7 @@ static class ForcedDecision {
 
     public OptimizelyUserContext(@Nonnull Optimizely optimizely,
                                  @Nonnull String userId,
-                                 @Nonnull Map<String, Object> attributes) {
+                                 @Nonnull Map<String, ?> attributes) {
         this.optimizely = optimizely;
         this.userId = userId;
         if (attributes != null) {