@@ -0,0 +1,1942 @@
+package com.box.l10n.mojito.service.assetExtraction;%0A%0Aimport com.box.l10n.mojito.localtm.merger.Branch;%0Aimport org.joda.time.DateTime;%0Aimport org.slf4j.Logger;%0Aimport org.slf4j.LoggerFactory;%0Aimport org.springframework.stereotype.Component;%0A%0Aimport java.time.Instant;%0Aimport java.util.Date;%0A%0A@Component%0Apublic class LocalBranchToEntityBranchConverter %7B%0A%0A    public static final String NULL_BRANCH_TEXT_PLACEHOLDER = %22$$MOJITO_DEFAULT$$%22;%0A    public static final DateTime NULL_BRANCH_DATE_PLACEHODLER = new DateTime(Instant.EPOCH.toEpochMilli());%0A%0A    /**%0A     * logger%0A     */%0A    static Logger logger = LoggerFactory.getLogger(LocalBranchToEntityBranchConverter.class);%0A%0A    public String localBranchNameToEntityBranchName(String localBranchName) %7B%0A        return NULL_BRANCH_TEXT_PLACEHOLDER.equals(localBranchName) ? null : localBranchName;%0A    %7D%0A%0A    public String entityBranchNameToLocalBranchName(String entityBranchName) %7B%0A        return entityBranchName == null ? NULL_BRANCH_TEXT_PLACEHOLDER : entityBranchName;%0A    %7D%0A%0A    public String branchEntityToLocalBranchName(com.box.l10n.mojito.entity.Branch branch) %7B%0A        return branch == null ? NULL_BRANCH_TEXT_PLACEHOLDER :%0A                entityBranchNameToLocalBranchName(branch.getName());%0A    %7D%0A%0A    public Branch convertEntityBranchToLocaleBranch(com.box.l10n.mojito.entity.Branch b) %7B%0A        Branch.Builder builder = Branch.builder();%0A%0A        if (b == null) %7B%0A            // This currently can be null in test, shouldn't be in real case%0A            builder.name(NULL_BRANCH_TEXT_PLACEHOLDER).createdAt(NULL_BRANCH_DATE_PLACEHODLER);%0A        %7D else %7B%0A            String branchName = b.getName() == null ? NULL_BRANCH_TEXT_PLACEHOLDER : b.getName();%0A            DateTime createdDate = b.getCreatedDate() != null ? b.getCreatedDate() : NULL_BRANCH_DATE_PLACEHODLER;%0A            builder.name(branchName).createdAt(createdDate);%0A        %7D%0A%0A        return builder.build();%0A    %7D%0A%7D%0A

Add converter to convert branch names between branch entity (nullable) and locale branch name (non nullable)