Know who you will break before you hit merge.

// ===== UserProfileService.java =====
package demo;
public class UserProfileService {
  public User getUserProfile(String id) {
    User u = repository.findById(id);
    if (u == null) throw new NotFound("user");
    cacheInRedis(u);
    return u;
  }
  public void updateUserProfile(User u){
    repository.save(u);
    archiveToS3(u);
    indexInElasticsearch(u);
  }
  private void archiveToS3(User u){ /* s3://profiles/{id}.json */ }
  private void cacheInRedis(User u){ /* redis.set("user:"+u.id, json(u)) */ }
  private void indexInElasticsearch(User u){ /* es.index("users", u.id, u) */ }
}

// ===== EventProcessorService.java =====
package demo;
public class EventProcessorService {
  public void processUserEvent(Event e){
    insertUserEventToDb(e);
    archiveEventToS3(e);
  }
  private void insertUserEventToDb(Event e){ /* INSERT INTO user_events ... */ }
  private void archiveEventToS3(Event e){ /* s3://events/{id}.json */ }
}

// ===== FileImportService.java =====
package demo;
public class FileImportService {
  public void processBulkImport(File f){
    List rows = parse(f);
    insertImportRecordsToDb(rows);
    indexImportForSearch(rows);
  }
  public void processDataImportFromUrl(String url){ /* fetch+parse */ }
  private void insertImportRecordsToDb(List rows){ /* batch insert */ }
  private void indexImportForSearch(List rows){ /* es.bulk */ }
}

// ===== UserProfileService.java =====
package demo;
public class UserProfileService {
  public User getUserProfile(String id) { /* ... */ }
  public void updateUserProfile(User u){ /* ... */ }
  private void archiveToS3(User u){ /* ... */ }
  private void cacheInRedis(User u){ /* ... */ }
  private void indexInElasticsearch(User u){ /* ... */ }
}

// ===== EventProcessorService.java =====
package demo;
public class EventProcessorService { /* ... */ }

// ===== FileImportService.java =====
package demo;
public class FileImportService { /* ... */ }