yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-26 18:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small refactor to be able to print correct message when reviewer is invalid (#19810)

Browse Source
This commit is contained in:
IceS2 2025-02-16 20:58:55 +01:00 committed by GitHub
parent e4c34210ec
commit 2cb51f71cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openmetadata-service/src/main/java/org/openmetadata/csv/EntityCsv.java
View File

@ -50,6 +50,7 @@ import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.function.Function;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVFormat;
@ -193,7 +194,11 @@ public abstract class EntityCsv<T extends EntityInterface> {
} }
/** Owner field is in entityType:entityName format */ /** Owner field is in entityType:entityName format */
public List<EntityReference> getOwners(CSVPrinter printer, CSVRecord csvRecord, int fieldNumber) public List<EntityReference> getOwners(
CSVPrinter printer,
CSVRecord csvRecord,
int fieldNumber,
Function<Integer, String> invalidMessageCreator)
throws IOException { throws IOException {
if (!processRecord) { if (!processRecord) {
return null; return null;
@ -207,7 +212,7 @@ public abstract class EntityCsv<T extends EntityInterface> {
for (String owner : owners) { for (String owner : owners) {
List<String> ownerTypes = listOrEmpty(CsvUtil.fieldToEntities(owner)); List<String> ownerTypes = listOrEmpty(CsvUtil.fieldToEntities(owner));
if (ownerTypes.size() != 2) { if (ownerTypes.size() != 2) {
importFailure(printer, invalidOwner(fieldNumber), csvRecord); importFailure(printer, invalidMessageCreator.apply(fieldNumber), csvRecord);
return Collections.emptyList(); return Collections.emptyList();
} }
EntityReference ownerRef = EntityReference ownerRef =
@ -219,6 +224,16 @@ public abstract class EntityCsv<T extends EntityInterface> {
return refs.isEmpty() ? null : refs; return refs.isEmpty() ? null : refs;
} }
public List<EntityReference> getOwners(CSVPrinter printer, CSVRecord csvRecord, int fieldNumber)
throws IOException {
return getOwners(printer, csvRecord, fieldNumber, EntityCsv::invalidOwner);
}
public List<EntityReference> getReviewers(
CSVPrinter printer, CSVRecord csvRecord, int fieldNumber) throws IOException {
return getOwners(printer, csvRecord, fieldNumber, EntityCsv::invalidReviewer);
}
/** Owner field is in entityName format */ /** Owner field is in entityName format */
public EntityReference getOwnerAsUser(CSVPrinter printer, CSVRecord csvRecord, int fieldNumber) public EntityReference getOwnerAsUser(CSVPrinter printer, CSVRecord csvRecord, int fieldNumber)
throws IOException { throws IOException {
@ -868,6 +883,11 @@ public abstract class EntityCsv<T extends EntityInterface> {
return String.format(FIELD_ERROR_MSG, CsvErrorType.INVALID_FIELD, field + 1, error); return String.format(FIELD_ERROR_MSG, CsvErrorType.INVALID_FIELD, field + 1, error);
} }
public static String invalidReviewer(int field) {
String error = "Reviewer should be of format user:userName or team:teamName";
return String.format(FIELD_ERROR_MSG, CsvErrorType.INVALID_FIELD, field + 1, error);
}
public static String invalidExtension(int field, String key, String value) { public static String invalidExtension(int field, String key, String value) {
String error = String error =
"Invalid key-value pair in extension string: Key = " "Invalid key-value pair in extension string: Key = "

2
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java
View File

@ -200,7 +200,7 @@ public class GlossaryRepository extends EntityRepository<Glossary> {
.withTags( .withTags(
getTagLabels( getTagLabels(
printer, csvRecord, List.of(Pair.of(7, TagLabel.TagSource.CLASSIFICATION)))) printer, csvRecord, List.of(Pair.of(7, TagLabel.TagSource.CLASSIFICATION))))
.withReviewers(getOwners(printer, csvRecord, 8)) .withReviewers(getReviewers(printer, csvRecord, 8))
.withOwners(getOwners(printer, csvRecord, 9)) .withOwners(getOwners(printer, csvRecord, 9))
.withStatus(getTermStatus(printer, csvRecord)) .withStatus(getTermStatus(printer, csvRecord))
.withExtension(getExtension(printer, csvRecord, 11)); .withExtension(getExtension(printer, csvRecord, 11));