Merge branch 'develop' into late-player-initialization

# Conflicts: # CHANGELOG.md # conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
bitmovin · Aug 26, 2024 · 6000797 · 6000797
2 parents 353d847 + 1c6d2f5
commit 6000797
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   - `ConvivaAnalyticsIntegration(customerKey:config:)` constructor without a `Player`
   - `ConvivaAnalyticsIntegration.attachPlayer()` to attach the `Player` at a later point in the session life-cycle
 
+### Removed
+- Unintentionally public initializers from `ConvivaAnalyticsIntegration` which were not intended to be public and only meant for testing
+
 ## 2.6.0 - 2024-08-13
 ### Added
 - `averageBitrate` to reported video metrics

diff --git a/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java b/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
@@ -86,35 +86,15 @@ public ConvivaAnalyticsIntegration(Player player, String customerKey, Context co
         this(player, customerKey, context, new ConvivaConfig());
     }
 
-    public ConvivaAnalyticsIntegration(Player player,
-                                       String customerKey,
-                                       Context context,
-                                       ConvivaConfig config) {
-        this(player, customerKey, context, config, null);
-    }
-
-    public ConvivaAnalyticsIntegration(Player player,
-                                       String customerKey,
-                                       Context context,
-                                       ConvivaConfig config,
-                                       ConvivaVideoAnalytics videoAnalytics
-    ) {
-        this(player, customerKey, context, config, videoAnalytics, null);
-    }
-
-    public ConvivaAnalyticsIntegration(Player player,
-                                       String customerKey,
-                                       Context context,
-                                       ConvivaConfig config,
-                                       ConvivaVideoAnalytics videoAnalytics,
-                                       ConvivaAdAnalytics adAnalytics
+    public ConvivaAnalyticsIntegration(
+        Player player,
+        String customerKey,
+        Context context,
+        ConvivaConfig config
     ) {
-        this(player, customerKey, context, config, videoAnalytics, adAnalytics, null);
+        this(player, customerKey, context, config, null, null, null);
     }
 
-    /**
-     * For testing purposes only.
-     */
     ConvivaAnalyticsIntegration(
         @Nullable Player player,
         String customerKey,