Skip to content
This repository has been archived by the owner on May 12, 2020. It is now read-only.

Commit

Permalink
bump embed.process to 2.0.3 (fixes #132). remove commons-io from deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@smecsia
smecsia committed May 29, 2018
1 parent ee7ef49 commit e0ab714
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 30 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.process</artifactId>
<version>2.0.2</version>
<version>2.0.3</version>
</dependency>

<dependency>
Expand Down
22 changes: 12 additions & 10 deletions src/main/java/de/flapdoodle/embed/process/store/CachedPostgresArtifactStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;

import static de.flapdoodle.embed.process.config.store.FileType.Executable;
import static de.flapdoodle.embed.process.config.store.FileType.Library;
import static de.flapdoodle.embed.process.extract.ImmutableExtractedFileSet.builder;
import static java.nio.file.Files.exists;
import static java.nio.file.Files.walk;
import static java.nio.file.Paths.get;
import static org.apache.commons.io.FileUtils.iterateFiles;
import static org.apache.commons.io.filefilter.TrueFileFilter.TRUE;

public class CachedPostgresArtifactStore extends PostgresArtifactStore {
private static final Logger LOGGER = LoggerFactory.getLogger(CachedPostgresArtifactStore.class);
Expand Down Expand Up @@ -49,14 +49,16 @@ public IExtractedFileSet extractFileSet(Distribution distribution) throws IOExce
"pgsql" + "-" + distribution.getVersion().asInDownloadPath(), "pgsql");
if (exists(path)) {
final Builder extracted = builder(dir).baseDirIsGenerated(false);
iterateFiles(path.toFile(), TRUE, TRUE).forEachRemaining(file -> {
FileType type = Library;
if (filesSet.entries().stream()
.anyMatch(entry -> entry.matchingPattern().matcher(file.getPath()).matches())) {
type = Executable;
}
extracted.file(type, file);
});
walk(path)
.filter(Files::isRegularFile)
.forEach(file -> {
FileType type = Library;
if (filesSet.entries().stream()
.anyMatch(entry -> entry.matchingPattern().matcher(file.toString()).matches())) {
type = Executable;
}
extracted.file(type, file.toFile());
});
return extracted.build();
} else {
return super.extractFileSet(distribution);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/de/flapdoodle/embed/process/store/PostgresArtifactStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.io.IOException;
import java.util.EnumSet;

import static org.apache.commons.io.FileUtils.deleteQuietly;
import static de.flapdoodle.embed.process.io.file.Files.forceDelete;

/**
* @author Ilya Sadykov
Expand Down Expand Up @@ -46,16 +46,16 @@ public IDirectory getTempDir() {
public void removeFileSet(Distribution distribution, IExtractedFileSet all) {
for (FileType type : EnumSet.complementOf(EnumSet.of(FileType.Executable))) {
for (File file : all.files(type)) {
if (file.exists() && !deleteQuietly(file))
if (file.exists() && !forceDelete(file))
LOGGER.trace("Could not delete {} NOW: {}", type, file);
}
}
File exe = all.executable();
if (exe.exists() && !deleteQuietly(exe)) {
if (exe.exists() && !forceDelete(exe)) {
LOGGER.trace("Could not delete executable NOW: {}", exe);
}

if (all.baseDirIsGenerated() && !deleteQuietly(all.baseDir())) {
if (all.baseDirIsGenerated() && !forceDelete(all.baseDir())) {
LOGGER.trace("Could not delete generatedBaseDir: {}", all.baseDir());
}
}
Expand Down
25 changes: 13 additions & 12 deletions src/main/java/ru/yandex/qatools/embed/postgresql/PostgresProcess.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
import static de.flapdoodle.embed.process.io.file.Files.forceDelete;
import static java.lang.System.currentTimeMillis;
import static java.lang.Thread.sleep;
import static java.nio.file.Files.lines;
import static java.util.Arrays.asList;
import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static org.apache.commons.io.FileUtils.readLines;
import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.slf4j.LoggerFactory.getLogger;
import static ru.yandex.qatools.embed.postgresql.Command.CreateDb;
Expand Down Expand Up @@ -188,7 +188,7 @@ protected void onBeforeProcess(IRuntimeConfig runtimeConfig)
super.onBeforeProcess(runtimeConfig);
PostgresConfig config = getConfig();

final File dbDir = config.storage().dbDir();
final File dbDir = config.storage().dbDir();
if (dbDir.exists() && dbDir.listFiles() != null && dbDir.listFiles().length > 0) {
return;
}
Expand Down Expand Up @@ -241,18 +241,19 @@ protected void deleteTempFiles() {
@Override
protected final void onAfterProcessStart(ProcessControl process,
IRuntimeConfig runtimeConfig) throws IOException {
final Storage storage = getConfig().storage();
final Path pidFilePath = Paths.get(storage.dbDir().getAbsolutePath(), "postmaster.pid");
final File pidFile = new File(pidFilePath.toAbsolutePath().toString());
int timeout = TIMEOUT;
final Storage storage = getConfig().storage();
final Path pidFilePath = Paths.get(storage.dbDir().getAbsolutePath(), "postmaster.pid");
final File pidFile = new File(pidFilePath.toAbsolutePath().toString());
int timeout = TIMEOUT;
while (!pidFile.exists() && ((timeout = timeout - 100) > 0)) {
try {
sleep(100);
} catch (InterruptedException ie) { /* safe to ignore */ }
}
int pid = -1;
try {
pid = Integer.valueOf(readLines(pidFilePath.toFile()).get(0));
pid = lines(pidFilePath).findFirst().map(Integer::valueOf)
.orElseThrow(() -> new IllegalStateException("Pid file is empty"));
} catch (Exception e) {
LOGGER.error("Failed to read PID file ({})", e.getMessage(), e);
}
Expand All @@ -266,11 +267,11 @@ protected final void onAfterProcessStart(ProcessControl process,
int trial = 0;
do {
String output = runCmd(getConfig(),
runtimeConfig,
CreateDb,
"",
new HashSet<>(singleton("database creation failed")),
storage.dbName());
runtimeConfig,
CreateDb,
"",
new HashSet<>(singleton("database creation failed")),
storage.dbName());
try {
if (isEmpty(output) || !output.contains("could not connect to database")) {
this.processReady = true;
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/ru/yandex/qatools/embed/postgresql/TestDownloads.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import de.flapdoodle.embed.process.distribution.Platform;
import de.flapdoodle.embed.process.store.IArtifactStore;
import de.flapdoodle.embed.process.store.PostgresArtifactStoreBuilder;
import org.junit.Ignore;
import org.junit.Test;
import ru.yandex.qatools.embed.postgresql.distribution.Version;

Expand All @@ -18,6 +19,7 @@
public class TestDownloads {

@Test
@Ignore
public void testDownloads() throws IOException {
IArtifactStore artifactStore = new PostgresArtifactStoreBuilder().defaults(Command.Postgres).build();

Expand Down
4 changes: 1 addition & 3 deletions src/test/java/ru/yandex/qatools/embed/postgresql/TestPostgresCachedDirStarter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

import java.io.File;

import static org.apache.commons.io.FileUtils.getTempDirectory;

public class TestPostgresCachedDirStarter extends TestPostgresStarter {

@Override
protected IRuntimeConfig buildRuntimeConfig() {
// turns off the default functionality of unzipping on every run.
final String tmpDir = new File(getTempDirectory(), "pgembed").getPath();
final String tmpDir = new File(System.getProperty("java.io.tmpdir"), "pgembed").getPath();
final Command cmd = Command.Postgres;
final FixedPath cachedDir = new FixedPath(tmpDir);
return new RuntimeConfigBuilder()
Expand Down

0 comments on commit e0ab714

Please sign in to comment.