Avoid coding useless conditions.

This commit is contained in:
Angel Borroy
2020-02-13 11:31:35 +01:00
parent e4ba6c6d2c
commit fe315ca710
@@ -993,13 +993,13 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
NamedList<Object> report = new SimpleOrderedMap<>(); NamedList<Object> report = new SimpleOrderedMap<>();
Long nodeid = ofNullable(params.get(ARG_NODEID)).map(Long::valueOf).orElse(null); if (params.get(ARG_NODEID) == null)
if (nodeid == null)
{ {
report.add(ACTION_STATUS_ERROR, "No " + ARG_NODEID +" parameter set."); report.add(ACTION_STATUS_ERROR, "No " + ARG_NODEID +" parameter set.");
return report; return report;
} }
Long nodeid = Long.valueOf(params.get(ARG_NODEID));
String requestedCoreName = coreName(params); String requestedCoreName = coreName(params);
coreNames().stream() coreNames().stream()
@@ -1032,13 +1032,13 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
{ {
NamedList<Object> report = new SimpleOrderedMap<>(); NamedList<Object> report = new SimpleOrderedMap<>();
Long aclid = ofNullable(params.get(ARG_ACLID)).map(Long::valueOf).orElse(null); if (params.get(ARG_ACLID) == null)
if (aclid == null)
{ {
report.add(ACTION_STATUS_ERROR, "No " + ARG_ACLID + " parameter set."); report.add(ACTION_STATUS_ERROR, "No " + ARG_ACLID + " parameter set.");
return report; return report;
} }
Long aclid = Long.valueOf(params.get(ARG_ACLID));
String requestedCoreName = coreName(params); String requestedCoreName = coreName(params);
coreNames().stream() coreNames().stream()
@@ -1077,13 +1077,13 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
{ {
NamedList<Object> report = new SimpleOrderedMap<>(); NamedList<Object> report = new SimpleOrderedMap<>();
Long txid = ofNullable(params.get(ARG_TXID)).map(Long::valueOf).orElse(null); if (params.get(ARG_TXID) == null)
if (txid == null)
{ {
report.add(ACTION_STATUS_ERROR, "No " + ARG_TXID + " parameter set."); report.add(ACTION_STATUS_ERROR, "No " + ARG_TXID + " parameter set.");
return report; return report;
} }
Long txid = Long.valueOf(params.get(ARG_TXID));
String requestedCoreName = coreName(params); String requestedCoreName = coreName(params);
coreNames().stream() coreNames().stream()
@@ -1126,13 +1126,13 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
{ {
NamedList<Object> report = new SimpleOrderedMap<>(); NamedList<Object> report = new SimpleOrderedMap<>();
Long acltxid = ofNullable(params.get(ARG_ACLTXID)).map(Long::valueOf).orElse(null); if (params.get(ARG_ACLTXID) == null)
if (acltxid == null)
{ {
report.add(ACTION_STATUS_ERROR, "No " + ARG_ACLTXID + " parameter set."); report.add(ACTION_STATUS_ERROR, "No " + ARG_ACLTXID + " parameter set.");
return report; return report;
} }
Long acltxid = Long.valueOf(params.get(ARG_ACLTXID));
String requestedCoreName = coreName(params); String requestedCoreName = coreName(params);
coreNames().stream() coreNames().stream()
@@ -1174,7 +1174,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
{ {
NamedList<Object> response = new SimpleOrderedMap<>(); NamedList<Object> response = new SimpleOrderedMap<>();
String coreName = ofNullable(coreName(params)).orElse(null); String coreName = coreName(params);
if (coreName == null) if (coreName == null)
{ {
response.add(ACTION_STATUS_ERROR, "No " + CoreAdminParams.CORE + " parameter set."); response.add(ACTION_STATUS_ERROR, "No " + CoreAdminParams.CORE + " parameter set.");
@@ -1290,7 +1290,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
{ {
NamedList<Object> response = new SimpleOrderedMap<>(); NamedList<Object> response = new SimpleOrderedMap<>();
String coreName = ofNullable(coreName(params)).orElse(null); String coreName = coreName(params);
if (coreName == null) if (coreName == null)
{ {
response.add(ACTION_STATUS_ERROR, "No " + CoreAdminParams.CORE + " parameter set."); response.add(ACTION_STATUS_ERROR, "No " + CoreAdminParams.CORE + " parameter set.");