Remove unnecessary class (#2648)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
This commit is contained in:
Bogdan Drutu 2021-02-01 12:34:44 -08:00 committed by GitHub
parent c048ab8954
commit 26e5df2f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 16 deletions

View File

@ -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,20 +31,9 @@ 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
public void forEach(BaggageConsumer consumer) {
for (int i = 0; i < data().size(); i += 2) {
@ -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