Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Suppress warnings about usage of deprecated Hashing.md5()
XDocLoader: Add missing case in switch on DiffMode
Change-Id: Icf1323659e5080d543172aa5d3fb34ee2c27c0d1
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocCache.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocCache.java
index c25d8d0..3031851 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocCache.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocCache.java
@@ -66,6 +66,7 @@
}
private String getParentsHash(Project.NameKey project) {
+ @SuppressWarnings("deprecation")
Hasher h = Hashing.md5().newHasher();
ProjectState p = projectCache.get(project);
if (p != null) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocLoader.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocLoader.java
index d98c037..324b0dd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocLoader.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocLoader.java
@@ -252,6 +252,7 @@
case UNIFIED:
htmlHeader += "unified.xsl";
break;
+ case NO_DIFF:
default:
log.error(String.format("Unsupported diff mode: %s", diffMode.name()));
throw new ResourceNotFoundException();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
index c61128a..3fd86ba 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
@@ -361,6 +361,7 @@
private static String computeETag(
Project.NameKey project, ObjectId revId, String file, ObjectId revIdB, DiffMode diffMode) {
+ @SuppressWarnings("deprecation")
Hasher hasher = Hashing.md5().newHasher();
hasher.putUnencodedChars(project.get());
if (revId != null) {
