From 62787577dbfb62b724d0ac4de01aa2f8362d72ba Mon Sep 17 00:00:00 2001
From: David Steinacher <david.steinacher@bitmovin.com>
Date: Mon, 26 Aug 2024 09:27:35 +0200
Subject: [PATCH 1/3] remove unintentionally public initializers

* add changelog entry
---
 CHANGELOG.md                                  |  3 ++
 .../conviva/ConvivaAnalyticsIntegration.java  | 44 ++++++-------------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5416f26..e9f61bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Remove unintentionally public initializers from `ConvivaAnalyticsIntegration` which were not intended to be public and only meant for testing
 
 ## 2.6.0 - 2024-08-13
 ### Added
diff --git a/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java b/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
index 2c5d86f..c7960cb 100644
--- a/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
+++ b/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
@@ -57,42 +57,26 @@ 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
+    public ConvivaAnalyticsIntegration(
+        Player player,
+        String customerKey,
+        Context context,
+        ConvivaConfig config
     ) {
-        this(player, customerKey, context, config, videoAnalytics, null);
-    }
-
-    public ConvivaAnalyticsIntegration(Player player,
-                                       String customerKey,
-                                       Context context,
-                                       ConvivaConfig config,
-                                       ConvivaVideoAnalytics videoAnalytics,
-                                       ConvivaAdAnalytics adAnalytics
-    ) {
-        this(player, customerKey, context, config, videoAnalytics, adAnalytics, null);
+        this(player, customerKey, context, config, null, null, null);
     }
 
     /**
      * For testing purposes only.
      */
-    ConvivaAnalyticsIntegration(Player player,
-                                String customerKey,
-                                Context context,
-                                ConvivaConfig config,
-                                ConvivaVideoAnalytics videoAnalytics,
-                                ConvivaAdAnalytics adAnalytics,
-                                DefaultSsaiApi ssai
+    ConvivaAnalyticsIntegration(
+        Player player,
+        String customerKey,
+        Context context,
+        ConvivaConfig config,
+        ConvivaVideoAnalytics videoAnalytics,
+        ConvivaAdAnalytics adAnalytics,
+        DefaultSsaiApi ssai
     ) {
         this.bitmovinPlayer = player;
         this.playerHelper = new BitmovinPlayerHelper(player);

From 6f744d6cdd8f7df62540879a9452af799f4f5c8b Mon Sep 17 00:00:00 2001
From: David Steinacher <david.steinacher@bitmovin.com>
Date: Mon, 26 Aug 2024 09:35:48 +0200
Subject: [PATCH 2/3] remove unnecessary comment

---
 .../analytics/conviva/ConvivaAnalyticsIntegration.java         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java b/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
index c7960cb..01ab80f 100644
--- a/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
+++ b/conviva/src/main/java/com/bitmovin/analytics/conviva/ConvivaAnalyticsIntegration.java
@@ -66,9 +66,6 @@ public ConvivaAnalyticsIntegration(
         this(player, customerKey, context, config, null, null, null);
     }
 
-    /**
-     * For testing purposes only.
-     */
     ConvivaAnalyticsIntegration(
         Player player,
         String customerKey,

From bc1c69f7641c97c868da08ac04e020b0d35ad698 Mon Sep 17 00:00:00 2001
From: David Steinacher <david.steinacher@bitmovin.com>
Date: Mon, 26 Aug 2024 09:39:44 +0200
Subject: [PATCH 3/3] change changelog entry to a removed entry

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f61bc..66686c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
-### Fixed
-- Remove unintentionally public initializers from `ConvivaAnalyticsIntegration` which were not intended to be public and only meant for testing
+### 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