Skip to content

Commit

Permalink
Generator: Use md5 instead of sha-1 for checksum files
Browse files Browse the repository at this point in the history
  • Loading branch information
Emil Forslund committed Jul 26, 2016
1 parent 3309d46 commit a1c8e41
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
Expand Up @@ -48,13 +48,13 @@
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;


import static com.speedment.common.codegen.internal.util.NullUtil.requireNonNulls;
import com.speedment.generator.internal.util.HashUtil; import com.speedment.generator.internal.util.HashUtil;
import com.speedment.runtime.component.InfoComponent; import com.speedment.runtime.component.InfoComponent;
import static com.speedment.runtime.internal.util.document.DocumentDbUtil.traverseOver;
import java.nio.file.DirectoryStream; import java.nio.file.DirectoryStream;
import static java.util.Objects.requireNonNull;
import java.util.stream.Stream; import java.util.stream.Stream;
import static com.speedment.common.codegen.internal.util.NullUtil.requireNonNulls;
import static com.speedment.runtime.internal.util.document.DocumentDbUtil.traverseOver;
import static java.util.Objects.requireNonNull;


/** /**
* *
Expand All @@ -65,7 +65,7 @@ public class TranslatorManagerImpl implements TranslatorManager {


private final static Logger LOGGER = LoggerManager.getLogger(TranslatorManagerImpl.class); private final static Logger LOGGER = LoggerManager.getLogger(TranslatorManagerImpl.class);
private final static String HASH_PREFIX = "."; private final static String HASH_PREFIX = ".";
private final static String HASH_SUFFIX = ".sha1"; private final static String HASH_SUFFIX = ".md5";
private final static boolean PRINT_CODE = false; private final static boolean PRINT_CODE = false;


private final AtomicInteger fileCounter = new AtomicInteger(0); private final AtomicInteger fileCounter = new AtomicInteger(0);
Expand Down Expand Up @@ -205,7 +205,7 @@ public void writeToFile(Path codePath, String content, boolean overwriteExisting
.resolve(secretFolderName()) .resolve(secretFolderName())
.resolve(HASH_PREFIX + codePath.getFileName().toString() + HASH_SUFFIX); .resolve(HASH_PREFIX + codePath.getFileName().toString() + HASH_SUFFIX);


write(hashPath, HashUtil.sha1(content), true); write(hashPath, HashUtil.md5(content), true);
write(codePath, content, false); write(codePath, content, false);


fileCounter.incrementAndGet(); fileCounter.incrementAndGet();
Expand Down
Expand Up @@ -21,43 +21,43 @@
*/ */
public final class HashUtil { public final class HashUtil {


private final static String ALGORITHM = "SHA-1"; private final static String ALGORITHM = "MD5";
private final static Charset CHARSET = StandardCharsets.UTF_8; private final static Charset CHARSET = StandardCharsets.UTF_8;


public static boolean compare(Path path, Path sha1) { public static boolean compare(Path contentPath, Path checksumPath) {
final String expected = sha1(path); final String expected = HashUtil.md5(contentPath);
final String actual = load(sha1).get(0); final String actual = load(checksumPath).get(0);
return expected.equals(actual); return expected.equals(actual);
} }


public static boolean compare(Path path, String sha1) { public static boolean compare(Path path, String checksum) {
final String expected = sha1(path); final String expected = HashUtil.md5(path);
return expected.equals(sha1); return expected.equals(checksum);
} }


public static boolean compare(String content, String sha1) { public static boolean compare(String content, String checksum) {
final String expected = sha1(content); final String expected = md5(content);
return expected.equals(sha1); return expected.equals(checksum);
} }


public static String sha1(Path path) { public static String md5(Path path) {
return sha1(load(path)); return md5(load(path));
} }


public static String sha1(String content) { public static String md5(String content) {
return sha1(Arrays.asList(content.split("\\s+"))); return md5(Arrays.asList(content.split("\\s+")));
} }


private static String sha1(List<String> rows) { private static String md5(List<String> rows) {
return sha1(rows.stream() return md5(rows.stream()
.map(String::trim) .map(String::trim)
.flatMap(s -> Arrays.asList(s.split("\\s+")).stream()) .flatMap(s -> Arrays.asList(s.split("\\s+")).stream())
.collect(joining()) .collect(joining())
.getBytes(CHARSET) .getBytes(CHARSET)
); );
} }


private static String sha1(byte[] bytes) { private static String md5(byte[] bytes) {
final MessageDigest md; final MessageDigest md;


try { try {
Expand Down

0 comments on commit a1c8e41

Please sign in to comment.