Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(static): add forEach() to KsqlStruct (MINOR) #3320

Merged
merged 1 commit into from
Sep 11, 2019
Merged

feat(static): add forEach() to KsqlStruct (MINOR) #3320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ksql-common/src/main/java/io/confluent/ksql/types/KsqlStruct.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.BiConsumer;

/**
* Instance of {@link io.confluent.ksql.schema.ksql.types.SqlStruct}.
Expand Down Expand Up @@ -55,6 +56,14 @@ public List<Optional<?>> values() {
return values;
}

public void forEach(final BiConsumer<? super Field, ? super Optional<?>> consumer) {
for (int idx = 0; idx < values.size(); idx++) {
final Field field = schema.fields().get(idx);
final Optional<?> value = values.get(idx);
consumer.accept(field, value);
}
}

@Override
public boolean equals(final Object o) {
if (this == o) {
Expand Down
33 changes: 33 additions & 0 deletions ksql-common/src/test/java/io/confluent/ksql/types/KsqlStructTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.mockito.Mockito.inOrder;

import io.confluent.ksql.schema.ksql.DataException;
import io.confluent.ksql.schema.ksql.Field;
Expand All @@ -25,10 +26,16 @@
import io.confluent.ksql.schema.ksql.types.SqlTypes;
import io.confluent.ksql.util.KsqlException;
import java.util.Optional;
import java.util.function.BiConsumer;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public class KsqlStructTest {

private static final SqlStruct SCHEMA = SqlTypes.struct()
Expand All @@ -39,6 +46,9 @@ public class KsqlStructTest {
@Rule
public final ExpectedException expectedException = ExpectedException.none();

@Mock
private BiConsumer<? super Field, ? super Optional<?>> consumer;

@Test
public void shouldHandleExplicitNulls() {
// When:
Expand Down Expand Up @@ -94,4 +104,27 @@ public void shouldBuildStruct() {
// Then:
assertThat(struct.values(), contains(Optional.of(10L), Optional.of(true)));
}

@Test
public void shouldVisitFieldsInOrder() {
// Given:
final KsqlStruct struct = KsqlStruct.builder(SCHEMA)
.set(FieldName.of("f0"), Optional.of(10L))
.set(FieldName.of("s1", "v1"), Optional.of(true))
.build();

// When:
struct.forEach(consumer);

// Then:
final InOrder inOrder = inOrder(consumer);
inOrder.verify(consumer).accept(
struct.schema().fields().get(0),
struct.values().get(0)
);
inOrder.verify(consumer).accept(
struct.schema().fields().get(1),
struct.values().get(1)
);
}
}