Merge pull request #13 from dpursehouse/fix-compilation-warnings
Fix compilation warnings
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
index 8c60968..418453c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
@@ -86,9 +86,8 @@
String val = pluginConfig.getString(key.section, null, key.name);
if (val == null) {
return key.defaultVal.toString();
- } else {
- return val;
}
+ return val;
}
public int getInt(Keys key) {
@@ -125,7 +124,7 @@
}
private AMQP.BasicProperties generateBasicProperties() {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(Keys.GERRIT_NAME.key, getString(Keys.GERRIT_NAME));
headers.put(Keys.GERRIT_HOSTNAME.key, getString(Keys.GERRIT_HOSTNAME));
headers.put(Keys.GERRIT_SCHEME.key, getString(Keys.GERRIT_SCHEME));