Add some abstraction to avoid direct generated object use

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/AirbyteMessage.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects;
+
+import io.airbyte.protocol.models.AirbyteTraceMessage;
+
+public interface AirbyteMessage {
+
+  AirbyteMessageType getType();
+
+  ConnectorSpecification getSpec();
+
+  // TODO should be an interface
+  AirbyteTraceMessage getTrace();
+
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/AirbyteMessageType.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects;
+
+public enum AirbyteMessageType {
+  RECORD,
+  STATE,
+  LOG,
+  CONNECTION_STATUS,
+  CATALOG,
+  TRACE,
+  SPEC,
+  CONTROL
+
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/ConnectorSpecification.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.airbyte.commons.protocol.objects.serde.ConnectionSpecificationDeserializer;
+import io.airbyte.commons.protocol.objects.serde.ConnectionSpecificationSerializer;
+import io.airbyte.commons.protocol.objects.serde.JsonSerializable;
+import io.airbyte.protocol.models.AdvancedAuth;
+import io.airbyte.protocol.models.AuthSpecification;
+import java.net.URI;
+import java.util.List;
+
+@JsonDeserialize(using = ConnectionSpecificationDeserializer.class)
+@JsonSerialize(using = ConnectionSpecificationSerializer.class)
+public interface ConnectorSpecification extends JsonSerializable {
+
+  URI getDocumentationUrl();
+
+  URI getChangelogUrl();
+
+  JsonNode getConnectorSpecification();
+
+  Boolean isSupportingIncremental();
+
+  Boolean isSupportingNormalization();
+
+  Boolean isSupportingDBT();
+
+  List<DestinationSyncMode> getSupportedDestinationSyncModes();
+
+  // TODO introduce specific interfaces
+  AuthSpecification getAuthSpecification();
+
+  // TODO introduce specific interfaces
+  AdvancedAuth getAdvancedAuth();
+
+  // Clients should use this interface rather than the underlying object
+  @Deprecated
+  io.airbyte.protocol.models.ConnectorSpecification getRaw();
+
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/DestinationSyncMode.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects;
+
+public enum DestinationSyncMode {
+  APPEND,
+  OVERWRITE,
+  APPEND_DEDUP
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/impl/AirbyteMessageAdapter.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects.impl;
+
+import io.airbyte.commons.protocol.objects.AirbyteMessage;
+import io.airbyte.commons.protocol.objects.AirbyteMessageType;
+import io.airbyte.commons.protocol.objects.ConnectorSpecification;
+import io.airbyte.protocol.models.AirbyteMessage.Type;
+import io.airbyte.protocol.models.AirbyteTraceMessage;
+import java.util.Map;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
+public class AirbyteMessageAdapter implements AirbyteMessage {
+
+  private final io.airbyte.protocol.models.AirbyteMessage airbyteMessage;
+
+  public AirbyteMessageAdapter(final io.airbyte.protocol.models.AirbyteMessage airbyteMessage) {
+    this.airbyteMessage = airbyteMessage;
+  }
+
+  @Override
+  public AirbyteMessageType getType() {
+    return fromProtocolObject(airbyteMessage.getType());
+  }
+
+  @Override
+  public ConnectorSpecification getSpec() {
+    return new ConnectorSpecificationAdapter(airbyteMessage.getSpec());
+  }
+
+  @Override
+  public AirbyteTraceMessage getTrace() {
+    return airbyteMessage.getTrace();
+  }
+
+  public static AirbyteMessageType fromProtocolObject(final Type type) {
+    return fromProtocolObject.get(type);
+  }
+
+  private final static Map<Type, AirbyteMessageType> fromProtocolObject = Map.of(
+      Type.RECORD, AirbyteMessageType.RECORD,
+      Type.STATE, AirbyteMessageType.STATE,
+      Type.LOG, AirbyteMessageType.RECORD,
+      Type.CONNECTION_STATUS, AirbyteMessageType.CONNECTION_STATUS,
+      Type.CATALOG, AirbyteMessageType.CATALOG,
+      Type.TRACE, AirbyteMessageType.TRACE,
+      Type.SPEC, AirbyteMessageType.SPEC,
+      Type.CONTROL, AirbyteMessageType.CONTROL);
+
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/impl/ConnectorSpecificationAdapter.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects.impl;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.airbyte.commons.json.Jsons;
+import io.airbyte.commons.protocol.objects.ConnectorSpecification;
+import io.airbyte.commons.protocol.objects.DestinationSyncMode;
+import io.airbyte.protocol.models.AdvancedAuth;
+import io.airbyte.protocol.models.AuthSpecification;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
+public class ConnectorSpecificationAdapter implements ConnectorSpecification {
+
+  final io.airbyte.protocol.models.ConnectorSpecification connectorSpecification;
+
+  public ConnectorSpecificationAdapter(final io.airbyte.protocol.models.ConnectorSpecification connectorSpecification) {
+    this.connectorSpecification = connectorSpecification;
+  }
+
+  @Override
+  public URI getDocumentationUrl() {
+    return connectorSpecification.getDocumentationUrl();
+  }
+
+  @Override
+  public URI getChangelogUrl() {
+    return connectorSpecification.getChangelogUrl();
+  }
+
+  @Override
+  public JsonNode getConnectorSpecification() {
+    return connectorSpecification.getConnectionSpecification();
+  }
+
+  @Override
+  public Boolean isSupportingIncremental() {
+    return connectorSpecification.getSupportsIncremental();
+  }
+
+  @Override
+  public Boolean isSupportingNormalization() {
+    return connectorSpecification.getSupportsNormalization();
+  }
+
+  @Override
+  public Boolean isSupportingDBT() {
+    return connectorSpecification.getSupportsDBT();
+  }
+
+  @Override
+  public List<DestinationSyncMode> getSupportedDestinationSyncModes() {
+    return connectorSpecification.getSupportedDestinationSyncModes().stream().map(fromProtocolObjects::get).toList();
+  }
+
+  @Override
+  public AuthSpecification getAuthSpecification() {
+    return connectorSpecification.getAuthSpecification();
+  }
+
+  @Override
+  public AdvancedAuth getAdvancedAuth() {
+    return connectorSpecification.getAdvancedAuth();
+  }
+
+  @Override
+  public String toJson() {
+    return Jsons.serialize(connectorSpecification);
+  }
+
+  static public ConnectorSpecification fromJson(final String jsonString) {
+    return new ConnectorSpecificationAdapter(Jsons.deserialize(jsonString, io.airbyte.protocol.models.ConnectorSpecification.class));
+  }
+
+  @Override
+  public io.airbyte.protocol.models.ConnectorSpecification getRaw() {
+    return connectorSpecification;
+  }
+
+  private final static Map<io.airbyte.protocol.models.DestinationSyncMode, DestinationSyncMode> fromProtocolObjects = Map.of(
+      io.airbyte.protocol.models.DestinationSyncMode.APPEND, DestinationSyncMode.APPEND,
+      io.airbyte.protocol.models.DestinationSyncMode.APPEND_DEDUP, DestinationSyncMode.APPEND_DEDUP,
+      io.airbyte.protocol.models.DestinationSyncMode.OVERWRITE, DestinationSyncMode.OVERWRITE);
+
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/serde/ConnectionSpecificationDeserializer.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects.serde;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import io.airbyte.commons.protocol.objects.ConnectorSpecification;
+import io.airbyte.commons.protocol.objects.impl.ConnectorSpecificationAdapter;
+import java.io.IOException;
+
+public class ConnectionSpecificationDeserializer extends StdDeserializer<ConnectorSpecification> {
+
+  public ConnectionSpecificationDeserializer() {
+    this(null);
+  }
+
+  protected ConnectionSpecificationDeserializer(Class<?> vc) {
+    super(vc);
+  }
+
+  @Override
+  public ConnectorSpecification deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
+    final JsonNode node = p.getCodec().readTree(p);
+    final String jsonString = node.get("object").asText();
+    return ConnectorSpecificationAdapter.fromJson(jsonString);
+  }
+
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/serde/ConnectionSpecificationSerializer.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects.serde;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import io.airbyte.commons.protocol.objects.ConnectorSpecification;
+import java.io.IOException;
+
+public class ConnectionSpecificationSerializer extends StdSerializer<ConnectorSpecification> {
+
+  public ConnectionSpecificationSerializer() {
+    this(null);
+  }
+
+  protected ConnectionSpecificationSerializer(Class<ConnectorSpecification> t) {
+    super(t);
+  }
+
+  @Override
+  public void serialize(ConnectorSpecification value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+    gen.writeStartObject();
+    gen.writeStringField("object", value.toJson());
+    gen.writeEndObject();
+  }
+
+}

airbyte-commons-protocol/src/main/java/io/airbyte/commons/protocol/objects/serde/JsonSerializable.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.protocol.objects.serde;
+
+public interface JsonSerializable {
+
+  String toJson();
+
+}