From 26e5df2f66dd2f3b4252908f733bc93a6c6735af Mon Sep 17 00:00:00 2001
From: Bogdan Drutu <bogdandrutu@gmail.com>
Date: Mon, 1 Feb 2021 12:34:44 -0800
Subject: [PATCH] Remove unnecessary class (#2648)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
---
 .../api/baggage/ImmutableBaggage.java         | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/api/all/src/main/java/io/opentelemetry/api/baggage/ImmutableBaggage.java b/api/all/src/main/java/io/opentelemetry/api/baggage/ImmutableBaggage.java
index 7f5276ab81..4ccc471603 100644
--- a/api/all/src/main/java/io/opentelemetry/api/baggage/ImmutableBaggage.java
+++ b/api/all/src/main/java/io/opentelemetry/api/baggage/ImmutableBaggage.java
@@ -16,6 +16,7 @@ import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+@AutoValue
 @Immutable
 abstract class ImmutableBaggage extends ImmutableKeyValuePairs<String, BaggageEntry>
     implements Baggage {
@@ -30,19 +31,8 @@ abstract class ImmutableBaggage extends ImmutableKeyValuePairs<String, BaggageEn
     return new Builder();
   }
 
-  @AutoValue
-  @Immutable
-  abstract static class ArrayBackedBaggage extends ImmutableBaggage {
-    ArrayBackedBaggage() {}
-
-    @Override
-    protected abstract List<Object> data();
-
-    @Override
-    public BaggageBuilder toBuilder() {
-      return new ImmutableBaggage.Builder(new ArrayList<>(data()));
-    }
-  }
+  @Override
+  protected abstract List<Object> data();
 
   @Override
   public void forEach(BaggageConsumer consumer) {
@@ -61,14 +51,13 @@ abstract class ImmutableBaggage extends ImmutableKeyValuePairs<String, BaggageEn
 
   @Override
   public BaggageBuilder toBuilder() {
-    Builder builder = new Builder(data());
+    Builder builder = new Builder(new ArrayList<>(data()));
     builder.noImplicitParent = true;
     return builder;
   }
 
   private static Baggage sortAndFilterToBaggage(Object[] data) {
-    return new AutoValue_ImmutableBaggage_ArrayBackedBaggage(
-        sortAndFilter(data, /* filterNullValues= */ true));
+    return new AutoValue_ImmutableBaggage(sortAndFilter(data, /* filterNullValues= */ true));
   }
 
   // TODO: Migrate to AutoValue.Builder