cloudevents
/
sdk-java
mirror of https://github.com/cloudevents/sdk-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce CloudEventDataMapper.identity() (#286) 

* CloudEventDataMapper cannot be null
Cleanup of all mapper != null and replaced with CloudEventDataMapper.NOOP
Fixed all the missing wildcards

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>

* I forgot a bunch of them

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>

* CloudEventDataMapper.NOOP to CloudEventDataMapper.identity

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>

* Now it should be fine

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>
This commit is contained in:
Francesco Guardiani 2020-11-19 18:24:14 +01:00 committed by GitHub
parent 8ac23dc479
commit baf3b56d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/java/io/cloudevents/rw/CloudEventDataMapper.java
View File

@ -37,4 +37,10 @@ public interface CloudEventDataMapper<R extends CloudEventData> {
*/
R map(CloudEventData data) throws CloudEventRWException;
/**
* No-op identity mapper which can be used as default when no mapper is provided.
*/
static CloudEventDataMapper<CloudEventData> identity() {
return d -> d;
}
}

6
api/src/main/java/io/cloudevents/rw/CloudEventReader.java
View File

@ -17,7 +17,7 @@
package io.cloudevents.rw;
import io.cloudevents.lang.Nullable;
import io.cloudevents.CloudEventData;
import javax.annotation.ParametersAreNonnullByDefault;
@ -36,12 +36,12 @@ public interface CloudEventReader {
* @throws CloudEventRWException if something went wrong during the read.
*/
default <V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory) throws CloudEventRWException {
return read(writerFactory, null);
return read(writerFactory, CloudEventDataMapper.identity());
}
/**
* Like {@link CloudEventReader#read(CloudEventWriterFactory)}, but providing a mapper for {@link io.cloudevents.CloudEventData} to be invoked when the data field is available.
*/
<V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, @Nullable CloudEventDataMapper mapper) throws CloudEventRWException;
<V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException;
}

4
core/src/main/java/io/cloudevents/core/CloudEventUtils.java
View File

@ -76,7 +76,7 @@ public final class CloudEventUtils {
* @return the reader implementation
*/
public static CloudEvent toEvent(CloudEventReader reader) throws CloudEventRWException {
return toEvent(reader, null);
return toEvent(reader, CloudEventDataMapper.identity());
}
/**
@ -86,7 +86,7 @@ public final class CloudEventUtils {
* @param mapper the mapper to use when reading the data
* @return the reader implementation
*/
public static CloudEvent toEvent(CloudEventReader reader, @Nullable CloudEventDataMapper<?> mapper) throws CloudEventRWException {
public static CloudEvent toEvent(CloudEventReader reader, CloudEventDataMapper<?> mapper) throws CloudEventRWException {
return reader.read(CloudEventBuilder::fromSpecVersion, mapper);
}

4
core/src/main/java/io/cloudevents/core/format/EventFormat.java
View File

@ -18,7 +18,7 @@
package io.cloudevents.core.format;
import io.cloudevents.CloudEvent;
import io.cloudevents.lang.Nullable;
import io.cloudevents.CloudEventData;
import io.cloudevents.rw.CloudEventDataMapper;
import javax.annotation.ParametersAreNonnullByDefault;
@ -61,7 +61,7 @@ public interface EventFormat {
/**
* Like {@link EventFormat#deserialize(byte[])}, but allows a mapper that maps the parsed {@link io.cloudevents.CloudEventData} to another one.
*/
CloudEvent deserialize(byte[] bytes, @Nullable CloudEventDataMapper mapper) throws EventDeserializationException;
CloudEvent deserialize(byte[] bytes, CloudEventDataMapper<? extends CloudEventData> mapper) throws EventDeserializationException;
/**
* @return the set of content types this event format can deserialize. These content types are used

4
core/src/main/java/io/cloudevents/core/impl/BaseCloudEvent.java
View File

@ -50,13 +50,13 @@ public abstract class BaseCloudEvent implements CloudEvent, CloudEventReader, Cl
return this.extensions.keySet();
}
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper mapper) throws CloudEventRWException, IllegalStateException {
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
CloudEventWriter<V> visitor = writerFactory.create(this.getSpecVersion());
this.readAttributes(visitor);
this.readExtensions(visitor);
if (this.data != null) {
return visitor.end(mapper != null ? mapper.map(this.data) : this.data);
return visitor.end(mapper.map(this.data));
}
return visitor.end();

5
core/src/main/java/io/cloudevents/core/impl/CloudEventReaderAdapter.java
View File

@ -18,6 +18,7 @@
package io.cloudevents.core.impl;
import io.cloudevents.CloudEvent;
import io.cloudevents.CloudEventData;
import io.cloudevents.rw.*;
public class CloudEventReaderAdapter implements CloudEventReader, CloudEventContextReader {
@ -29,13 +30,13 @@ public class CloudEventReaderAdapter implements CloudEventReader, CloudEventCont
}
@Override
public <V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, CloudEventDataMapper mapper) throws RuntimeException {
public <V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws RuntimeException {
CloudEventWriter<R> visitor = writerFactory.create(event.getSpecVersion());
this.readAttributes(visitor);
this.readExtensions(visitor);
if (event.getData() != null) {
return visitor.end(mapper != null ? mapper.map(event.getData()) : event.getData());
return visitor.end(mapper.map(event.getData()));
}
return visitor.end();

9
core/src/main/java/io/cloudevents/core/message/MessageReader.java
View File

@ -20,7 +20,6 @@ package io.cloudevents.core.message;
import io.cloudevents.CloudEvent;
import io.cloudevents.CloudEventData;
import io.cloudevents.core.CloudEventUtils;
import io.cloudevents.lang.Nullable;
import io.cloudevents.rw.*;
import javax.annotation.ParametersAreNonnullByDefault;
@ -39,13 +38,13 @@ public interface MessageReader extends StructuredMessageReader, CloudEventReader
* @throws IllegalStateException if the message is not in binary encoding.
*/
default <V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory) throws CloudEventRWException, IllegalStateException {
return read(writerFactory, null);
return read(writerFactory, CloudEventDataMapper.identity());
}
/**
* Like {@link MessageReader#read(CloudEventWriterFactory)}, but providing a mapper for {@link io.cloudevents.CloudEventData} to be invoked when the data field is available.
*/
<V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, @Nullable CloudEventDataMapper mapper) throws CloudEventRWException, IllegalStateException;
<V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException;
/**
* Visit the message as structured encoded event using the provided visitor
@ -89,7 +88,7 @@ public interface MessageReader extends StructuredMessageReader, CloudEventReader
* @throws IllegalStateException if the message has an unknown encoding.
*/
default CloudEvent toEvent() throws CloudEventRWException, IllegalStateException {
return toEvent(null);
return toEvent(CloudEventDataMapper.identity());
}
/**
@ -99,7 +98,7 @@ public interface MessageReader extends StructuredMessageReader, CloudEventReader
* @throws CloudEventRWException if something went wrong during the visit.
* @throws IllegalStateException if the message has an unknown encoding.
*/
default CloudEvent toEvent(@Nullable CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
default CloudEvent toEvent(CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
switch (getEncoding()) {
case BINARY:
return CloudEventUtils.toEvent(this, mapper);

3
core/src/main/java/io/cloudevents/core/message/StructuredMessageReader.java
View File

@ -21,7 +21,6 @@ import io.cloudevents.CloudEvent;
import io.cloudevents.CloudEventData;
import io.cloudevents.core.format.EventFormat;
import io.cloudevents.core.message.impl.GenericStructuredMessageReader;
import io.cloudevents.lang.Nullable;
import io.cloudevents.rw.CloudEventDataMapper;
import io.cloudevents.rw.CloudEventRWException;
@ -45,7 +44,7 @@ public interface StructuredMessageReader {
return this.read(EventFormat::deserialize);
}
default CloudEvent toEvent(@Nullable CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
default CloudEvent toEvent(CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
return this.read((format, value) -> format.deserialize(value, mapper));
}

4
core/src/main/java/io/cloudevents/core/message/impl/BaseGenericBinaryMessageReaderImpl.java
View File

@ -48,7 +48,7 @@ public abstract class BaseGenericBinaryMessageReaderImpl<HK, HV> extends BaseBin
}
@Override
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper mapper) throws CloudEventRWException, IllegalStateException {
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
CloudEventWriter<V> visitor = writerFactory.create(this.version);
// Grab from headers the attributes and extensions
@ -72,7 +72,7 @@ public abstract class BaseGenericBinaryMessageReaderImpl<HK, HV> extends BaseBin
// Set the payload
if (this.body != null) {
return visitor.end(mapper != null ? mapper.map(this.body) : this.body);
return visitor.end(mapper.map(this.body));
}
return visitor.end();

3
core/src/main/java/io/cloudevents/core/message/impl/BaseStructuredMessageReader.java
View File

@ -17,6 +17,7 @@
package io.cloudevents.core.message.impl;
import io.cloudevents.CloudEventData;
import io.cloudevents.core.message.Encoding;
import io.cloudevents.core.message.MessageReader;
import io.cloudevents.rw.CloudEventDataMapper;
@ -31,7 +32,7 @@ public abstract class BaseStructuredMessageReader implements MessageReader {
}
@Override
public <V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, CloudEventDataMapper mapper) {
public <V extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<V, R> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) {
throw MessageUtils.generateWrongEncoding(Encoding.BINARY, Encoding.STRUCTURED);
}
}

3
core/src/main/java/io/cloudevents/core/message/impl/UnknownEncodingMessageReader.java
View File

@ -17,6 +17,7 @@
package io.cloudevents.core.message.impl;
import io.cloudevents.CloudEventData;
import io.cloudevents.core.message.Encoding;
import io.cloudevents.core.message.MessageReader;
import io.cloudevents.core.message.StructuredMessageWriter;
@ -32,7 +33,7 @@ public class UnknownEncodingMessageReader implements MessageReader {
}
@Override
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper mapper) throws CloudEventRWException, IllegalStateException {
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
throw new IllegalStateException("Unknown encoding");
}

9
core/src/test/java/io/cloudevents/core/mock/CSVFormat.java
View File

@ -18,6 +18,7 @@
package io.cloudevents.core.mock;
import io.cloudevents.CloudEvent;
import io.cloudevents.CloudEventData;
import io.cloudevents.SpecVersion;
import io.cloudevents.core.builder.CloudEventBuilder;
import io.cloudevents.core.data.BytesCloudEventData;
@ -59,7 +60,7 @@ public class CSVFormat implements EventFormat {
}
@Override
public CloudEvent deserialize(byte[] bytes, CloudEventDataMapper mapper) {
public CloudEvent deserialize(byte[] bytes, CloudEventDataMapper<? extends CloudEventData> mapper) {
String[] splitted = new String(bytes, StandardCharsets.UTF_8).split(Pattern.quote(","));
SpecVersion sv = SpecVersion.parse(splitted[0]);
@ -90,11 +91,7 @@ public class CSVFormat implements EventFormat {
builder.withTime(time);
}
if (data != null) {
if (mapper != null) {
builder.withData(mapper.map(new BytesCloudEventData(data)));
} else {
builder.withData(data);
}
builder.withData(mapper.map(new BytesCloudEventData(data)));
}
return builder.build();
}

4
core/src/test/java/io/cloudevents/core/mock/MockBinaryMessageWriter.java
View File

@ -62,7 +62,7 @@ public class MockBinaryMessageWriter extends BaseBinaryMessageReader implements
}
@Override
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper mapper) throws CloudEventRWException, IllegalStateException {
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
if (version == null) {
throw new IllegalStateException("MockBinaryMessage is empty");
}
@ -72,7 +72,7 @@ public class MockBinaryMessageWriter extends BaseBinaryMessageReader implements
this.readExtensions(visitor);
if (this.data != null) {
return visitor.end(mapper != null ? mapper.map(this.data) : this.data);
return visitor.end(mapper.map(this.data));
}
return visitor.end();

4
formats/json-jackson/src/main/java/io/cloudevents/jackson/CloudEventDeserializer.java
View File

@ -54,7 +54,7 @@ public class CloudEventDeserializer extends StdDeserializer<CloudEvent> {
}
@Override
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper mapper) throws CloudEventRWException, IllegalStateException {
public <T extends CloudEventWriter<V>, V> V read(CloudEventWriterFactory<T, V> writerFactory, CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException, IllegalStateException {
try {
SpecVersion specVersion = SpecVersion.parse(getStringNode(this.node, this.p, "specversion"));
CloudEventWriter<V> visitor = writerFactory.create(specVersion);
@ -144,7 +144,7 @@ public class CloudEventDeserializer extends StdDeserializer<CloudEvent> {
});
if (data != null) {
return visitor.end(mapper != null ? mapper.map(data) : data);
return visitor.end(mapper.map(data));
}
return visitor.end();
} catch (IOException e) {

9
formats/json-jackson/src/main/java/io/cloudevents/jackson/JsonFormat.java
View File

@ -20,6 +20,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import io.cloudevents.CloudEvent;
import io.cloudevents.CloudEventData;
import io.cloudevents.core.builder.CloudEventBuilder;
import io.cloudevents.core.format.EventDeserializationException;
import io.cloudevents.core.format.EventFormat;
@ -85,15 +86,15 @@ public final class JsonFormat implements EventFormat {
}
@Override
public CloudEvent deserialize(byte[] bytes, CloudEventDataMapper mapper) throws EventDeserializationException {
public CloudEvent deserialize(byte[] bytes, CloudEventDataMapper<? extends CloudEventData> mapper) throws EventDeserializationException {
CloudEvent deserialized = this.deserialize(bytes);
if (deserialized.getData() == null) {
return deserialized;
}
try {
return CloudEventBuilder.from(deserialized).withData(
mapper != null ? mapper.map(deserialized.getData()) : deserialized.getData()
).build();
return CloudEventBuilder.from(deserialized)
.withData(mapper.map(deserialized.getData()))
.build();
} catch (CloudEventRWException e) {
throw new EventDeserializationException(e);
}

2
kafka/src/test/java/io/cloudevents/kafka/CloudEventDeserializerTest.java
View File

@ -42,7 +42,7 @@ public class CloudEventDeserializerTest {
@Test
public void deserializerWithMapper() {
CloudEventDataMapper mapper = data -> MyCloudEventData.fromStringBytes(data.toBytes());
CloudEventDataMapper<MyCloudEventData> mapper = data -> MyCloudEventData.fromStringBytes(data.toBytes());
CloudEventDeserializer deserializer = new CloudEventDeserializer();
HashMap<String, Object> config = new HashMap<>();