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

77_spec - Rename Relationship to DataRelationship data entity for naming consistency #1661

Merged
merged 2 commits into from
Apr 18, 2024
Merged

77_spec - Rename Relationship to DataRelationship data entity for naming consistency #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d53c3
77_spec - Rename Relationship to DataRelationship data entity for nam…
Vladysl Apr 17, 2024
7deed3b
Merge remote-tracking branch 'origin/main' into 77_spec
Vladysl Apr 17, 2024
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spring-starter-cloud = '3.1.0'
spring-starter-bootstrap = '3.1.0'
reactor-extra = '3.5.1'
micrometer-registry-prometheus = '1.9.0'
ingestion-contract-server = '0.1.39'
ingestion-contract-server = '0.1.40'
oddrn-generator-java = '0.1.21'
odd-integration-manifests = '0.0.6'
apache-collections = '4.4'
Expand Down
10 changes: 5 additions & 5 deletions ...src/main/java/org/opendatadiscovery/oddplatform/mapper/ingestion/IngestionMapperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataInput;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataQualityTest;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataQualityTestRun;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataRelationship;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataSet;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataSetField;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataSetFieldType;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataTransformer;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.DataTransformerRun;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.ERDRelationship;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.GraphRelationship;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.Relationship;
import org.opendatadiscovery.oddplatform.ingestion.contract.model.Tag;
import org.opendatadiscovery.oddplatform.model.tables.pojos.DataEntityPojo;
import org.opendatadiscovery.oddplatform.service.ingestion.DatasetVersionHashCalculator;
Expand Down Expand Up @@ -99,7 +99,7 @@ public class IngestionMapperImpl implements IngestionMapper {
Pair.of(de -> de.getDataQualityTestRun() != null, DATA_QUALITY_TEST_RUN),
Pair.of(de -> de.getDataEntityGroup() != null, DATA_ENTITY_GROUP),
Pair.of(de -> de.getDataInput() != null, DATA_INPUT),
Pair.of(de -> de.getDataEntityRelationship() != null, DATA_RELATIONSHIP)
Pair.of(de -> de.getDataRelationship() != null, DATA_RELATIONSHIP)
);

@Override
Expand Down Expand Up @@ -152,7 +152,7 @@ public DataEntityIngestionDto createIngestionDto(final DataEntity dataEntity, fi
}

if (entityClasses.contains(DATA_RELATIONSHIP)) {
builder = builder.dataRelationshipDto(createDataRelationship(dataEntity.getDataEntityRelationship()));
builder = builder.dataRelationshipDto(createDataRelationship(dataEntity.getDataRelationship()));
}

return builder.build();
Expand Down Expand Up @@ -310,9 +310,9 @@ private DataInputIngestionDto createDataInput(final DataInput dataInput) {
);
}

private DataRelationshipDto createDataRelationship(final Relationship relationship) {
private DataRelationshipDto createDataRelationship(final DataRelationship relationship) {
final DataRelationshipDetailsDto dataRelationshipDetailsDto =
Relationship.RelationshipTypeEnum.ERD == relationship.getRelationshipType()
DataRelationship.RelationshipTypeEnum.ERD == relationship.getRelationshipType()
? new DataRelationshipDetailsDto(
erdRelationIngestionMapper.mapERDRelation((ERDRelationship) relationship.getDetails()),
null)
Expand Down
Loading