Compare commits

..

No commits in common. 'master' and 'change_data_scheme' have entirely different histories.

  1. 17
      src/main/java/me/bearns/fias/helpers/UpdaterImpl.java
  2. 13
      src/main/java/me/bearns/fias/service/FiasUpdater.java
  3. 25
      src/test/java/me/bearns/fias/UpdaterTest.java

@ -1,14 +1,16 @@
package me.bearns.fias.helpers;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.bearns.fias.domain.FiasVersion;
import me.bearns.fias.exceptions.CommonException;
import me.bearns.fias.exceptions.DownloadException;
import me.bearns.fias.exceptions.UnzipException;
import me.bearns.fias.repository.AddrobjRepository;
import me.bearns.fias.repository.FiasVersionRepository;
import me.bearns.fias.service.Downloader;
import me.bearns.fias.service.StreamSaver;
import me.bearns.fias.xml.AddrObjAdapter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@ -26,16 +28,19 @@ import org.apache.commons.compress.archivers.zip.ZipFile;
@Slf4j
@Component
@AllArgsConstructor
public class UpdaterImpl implements UpdateHelper {
private Downloader fileService;
@Autowired
private static Downloader fileService;
private FiasVersionRepository versions;
@Autowired
private static FiasVersionRepository versions;
private Catalog catalog;
@Autowired
private static Catalog catalog;
private StreamSaver unmarshaller;
@Autowired
private static StreamSaver unmarshaller;
//transaction from here
@Transactional(rollbackFor = Exception.class)

@ -1,6 +1,5 @@
package me.bearns.fias.service;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.bearns.fias.domain.FiasVersion;
import me.bearns.fias.exceptions.CommonException;
@ -13,14 +12,16 @@ import java.util.*;
@Slf4j
@Service
@AllArgsConstructor
public class FiasUpdater implements Updater {
private FiasVersionRepository versions;
@Autowired
private static FiasVersionRepository versions;
private OnlineVersion clientStub;
@Autowired
private static OnlineVersion clientStub;
private UpdateHelper helper;
@Autowired
private static UpdateHelper helper;
@Override
public void update() throws CommonException {
@ -80,4 +81,6 @@ public class FiasUpdater implements Updater {
}
}
}

@ -1,25 +0,0 @@
package me.bearns.fias;
import me.bearns.fias.exceptions.CommonException;
import me.bearns.fias.service.Updater;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
@ActiveProfiles("test")
@RunWith(SpringRunner.class)
@SpringBootTest
public class UpdaterTest {
@Autowired
Updater service;
@Test
public void integrationTest() throws CommonException {
service.reload(22L);
}
}
Loading…
Cancel
Save