Remove unnecessary class (#2648)
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
This commit is contained in:
parent
c048ab8954
commit
26e5df2f66
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue