diff --git a/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationStoreFactory.java b/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationStoreFactory.java index 1a6a76ec4f..4cffcedfc2 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationStoreFactory.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationStoreFactory.java @@ -19,6 +19,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.file.Files; import java.util.List; import java.util.Properties; import java.util.UUID; @@ -27,7 +28,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Splitter; -import com.google.common.io.Files; import com.tngtech.archunit.ArchConfiguration; import com.tngtech.archunit.base.MayResolveTypesViaReflection; import com.tngtech.archunit.lang.ArchRule; @@ -133,7 +133,7 @@ public void save(ArchRule rule, List violations) { private void write(List violations, File ruleDetails) { String updatedViolations = Joiner.on("\n").join(escape(violations)); try { - Files.write(updatedViolations, ruleDetails, UTF_8); + Files.write(ruleDetails.toPath(), updatedViolations.getBytes(UTF_8)); } catch (IOException e) { throw new StoreUpdateFailedException(e); } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/TestClassFile.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/TestClassFile.java index 700f9e5747..74ad9eec44 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/TestClassFile.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/TestClassFile.java @@ -2,8 +2,7 @@ import java.io.File; import java.io.IOException; - -import com.google.common.io.Files; +import java.nio.file.Files; import static com.google.common.base.Preconditions.checkState; import static com.tngtech.archunit.testutil.TestUtils.newTemporaryFolder; @@ -26,7 +25,7 @@ public TestClassFile create() { checkState(sourceFile.getParentFile().exists() || sourceFile.getParentFile().mkdirs(), "Can't create directory %s", sourceFile.getParentFile().getAbsolutePath()); - Files.write(sourceCode, sourceFile, UTF_8); + Files.write(sourceFile.toPath(), sourceCode.getBytes(UTF_8)); int result = getSystemJavaCompiler().run(null, null, null, sourceFile.getAbsolutePath()); checkState(result == 0, "Compiler exit code should be 0, but it was " + result); diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/ReplaceFileRule.java b/archunit/src/test/java/com/tngtech/archunit/testutil/ReplaceFileRule.java index d35482d2c0..cadfd5c209 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/ReplaceFileRule.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/ReplaceFileRule.java @@ -3,6 +3,7 @@ import java.io.File; import java.io.IOException; import java.nio.charset.Charset; +import java.nio.file.Files; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -13,12 +14,13 @@ import org.junit.rules.ExternalResource; import static com.google.common.base.Preconditions.checkState; +import static java.nio.file.StandardOpenOption.APPEND; +import static java.nio.file.StandardOpenOption.WRITE; public class ReplaceFileRule extends ExternalResource { private final File tempDir = TestUtils.newTemporaryFolder(); private final List fileActions = new ArrayList<>(); - private final List moveActions = new ArrayList<>(); private final Set replacedFiles = new HashSet<>(); public void replace(File target, String content, Charset charset) { @@ -56,7 +58,7 @@ private void write(File target, String content, Charset charset) { private void append(File file, String line, Charset charset) { try { - com.google.common.io.Files.append(System.lineSeparator() + line, file, charset); + Files.write(file.toPath(), (System.lineSeparator() + line).getBytes(charset), WRITE, APPEND); } catch (IOException e) { throw new RuntimeException(e); } @@ -64,7 +66,6 @@ private void append(File file, String line, Charset charset) { private void addMoveAction(MoveAction moveAction) { fileActions.add(moveAction); - moveActions.add(moveAction); } @Override @@ -102,7 +103,7 @@ public void revert() { private void move(File origin, File target) { try { - java.nio.file.Files.move(origin.toPath(), target.toPath()); + Files.move(origin.toPath(), target.toPath()); } catch (IOException e) { throw new RuntimeException(e); } @@ -142,7 +143,7 @@ private CreateFileAction(File target, String content, Charset charset) { @Override public FileAction execute() { try { - com.google.common.io.Files.write(content, target, charset); + Files.write(target.toPath(), content.getBytes(charset)); } catch (IOException e) { throw new RuntimeException(e); }