refactor: CustomJpaRepository 의 로직을 EntityManager 로 이동

src/main/java/persistence/entity/CustomJpaRepository.java

@@ -8,9 +8,6 @@ public CustomJpaRepository(EntityManager entityManager) {
  }
 
  public T save(T t) {
- if (entityManager.isDirty(t)) {
- entityManager.merge(t);
- }
- return t;
+ return entityManager.persist(t);
  }
 }

src/main/java/persistence/entity/EntityManager.java

@@ -5,13 +5,9 @@
 public interface EntityManager {
  <T> Optional<T> find(Class<T> clazz, Object id);
 
- void persist(Object entity);
+ <T> T persist(T entity);
 
  void remove(Object entity);
 
- void merge(Object entity);
-
- void detach(Object entity);
-
  boolean isDirty(Object entity);
 }

src/main/java/persistence/entity/EntityManagerImpl.java

@@ -29,16 +29,17 @@ public <T> Optional<T> find(Class<T> clazz, Object id) {
  }
 
  @Override
- public void persist(Object entity) {
+ public <T> T persist(T entity) {
+ if (!isDirty(entity)) {
+ return entity;
+ }
  final String query = hasEntity(entity)
  ? dml.getUpdateQuery(entity)
  : dml.getInsertQuery(entity);
  jdbcTemplate.execute(query);
  context.addEntity(entity);
- context.getDatabaseSnapshot(
- new EntityKey<>(entity),
- EntityHelper.clone(entity)
- );
+ saveSnapshot(new EntityKey(entity));
+ return entity;
  }
 
  @Override
@@ -54,19 +55,6 @@ public void remove(Object entity) {
  context.removeEntity(entity);
  }
 
- @Override
- public void merge(Object entity) {
- persist(entity);
- context.getDatabaseSnapshot(
- new EntityKey<>(entity), entity
- );
- }
-
- @Override
- public void detach(Object entity) {
- context.removeEntity(entity);
- }
-
  @Override
  public boolean isDirty(Object entity) {
  return !hasEntity(entity) || !EntityHelper.equals(
@@ -97,4 +85,11 @@ private boolean hasEntity(Object entity) {
  new EntityKey(entity).getEntityId()
  ).isPresent();
  }
+
+ private void saveSnapshot(EntityKey key) {
+ final Object snapshot = EntityHelper.clone(
+ context.getEntity(key)
+ );
+ context.getDatabaseSnapshot(key, snapshot);
+ }
 }