lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Reduce log output for entity not found in AmqpAuthenticationMessageHandler (#929)

Browse Source 
* Reduce log output for entity not found in AmqpAuthenticationMessageHandler

Signed-off-by: Sebastian Firsching <sebastian.firsching@bosch-si.com>

* Adapt tests for reduced log message

Signed-off-by: Sebastian Firsching <sebastian.firsching@bosch-si.com>

* Suppress sonar warning + change log level for EntityNotFound

Signed-off-by: Sebastian Firsching <sebastian.firsching@bosch-si.com>
This commit is contained in:
Sebastian Firsching
2020-02-18 11:29:41 +01:00
committed by GitHub
parent b5f46b8b5d
commit 87eadf59cd
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpAuthenticationMessageHandler.java
View File

@@ -193,6 +193,9 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
return artifact; return artifact;
} }
// suppress warning, EntityNotFoundException has not to be logged or
// rethrown as the exception has no valuable information
@SuppressWarnings("squid:S1166")
private Message handleAuthenticationMessage(final Message message) { private Message handleAuthenticationMessage(final Message message) {
final DmfDownloadResponse authenticationResponse = new DmfDownloadResponse(); final DmfDownloadResponse authenticationResponse = new DmfDownloadResponse();
final DmfTenantSecurityToken secruityToken = convertMessage(message, DmfTenantSecurityToken.class); final DmfTenantSecurityToken secruityToken = convertMessage(message, DmfTenantSecurityToken.class);
@@ -226,8 +229,8 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
authenticationResponse.setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value()); authenticationResponse.setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value());
authenticationResponse.setMessage("Building download URI failed"); authenticationResponse.setMessage("Building download URI failed");
} catch (final EntityNotFoundException e) { } catch (final EntityNotFoundException e) {
final String errorMessage = "Artifact for resource " + fileResource + "not found "; final String errorMessage = "Artifact for resource " + fileResource + " not found ";
LOG.warn(errorMessage, e); LOG.info(errorMessage);
authenticationResponse.setResponseCode(HttpStatus.NOT_FOUND.value()); authenticationResponse.setResponseCode(HttpStatus.NOT_FOUND.value());
authenticationResponse.setMessage(errorMessage); authenticationResponse.setMessage(errorMessage);
} }

24
hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java
View File

@@ -115,7 +115,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND,
"Artifact for resource FileResource [sha1=null, artifactId=null, filename=null]not found "); "Artifact for resource FileResource [sha1=null, artifactId=null, filename=null] not found ");
} }
@@ -131,8 +131,8 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
FileResource.createFileResourceBySha1(sha1Hash)); FileResource.createFileResourceBySha1(sha1Hash));
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND, "Artifact for resource FileResource [sha1=" + sha1Hash
"Artifact for resource FileResource [sha1=" + sha1Hash + ", artifactId=null, filename=null]not found "); + ", artifactId=null, filename=null] not found ");
} }
@Test @Test
@@ -144,7 +144,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND,
"Artifact for resource FileResource [sha1=12345, artifactId=null, filename=null]not found "); "Artifact for resource FileResource [sha1=12345, artifactId=null, filename=null] not found ");
} }
@@ -159,8 +159,8 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
FileResource.createFileResourceBySha1(sha1Hash)); FileResource.createFileResourceBySha1(sha1Hash));
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND, "Artifact for resource FileResource [sha1=" + sha1Hash
"Artifact for resource FileResource [sha1=" + sha1Hash + ", artifactId=null, filename=null]not found "); + ", artifactId=null, filename=null] not found ");
} }
@@ -176,7 +176,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND,
"Artifact for resource FileResource [sha1=2f532b93ed23b4341a81dc9b1ee8a1c44b5526ab, artifactId=null, filename=null]not found "); "Artifact for resource FileResource [sha1=2f532b93ed23b4341a81dc9b1ee8a1c44b5526ab, artifactId=null, filename=null] not found ");
} }
@@ -258,7 +258,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND,
"Artifact for resource FileResource [sha1=null, artifactId=null, filename=Test.txt]not found "); "Artifact for resource FileResource [sha1=null, artifactId=null, filename=Test.txt] not found ");
} }
@@ -274,7 +274,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND,
"Artifact for resource FileResource [sha1=null, artifactId=null, filename=filename0]not found "); "Artifact for resource FileResource [sha1=null, artifactId=null, filename=filename0] not found ");
} }
@@ -289,7 +289,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, "Artifact for resource FileResource [sha1=null, artifactId=" verifyResult(returnMessage, HttpStatus.NOT_FOUND, "Artifact for resource FileResource [sha1=null, artifactId="
+ artifacts.get(0).getId() + ", filename=null]not found "); + artifacts.get(0).getId() + ", filename=null] not found ");
} }
@@ -320,7 +320,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND,
"Artifact for resource FileResource [sha1=null, artifactId=null, filename=null]not found "); "Artifact for resource FileResource [sha1=null, artifactId=null, filename=null] not found ");
} }
@@ -340,7 +340,7 @@ public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmq
final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken); final Message returnMessage = sendAndReceiveAuthenticationMessage(securityToken);
verifyResult(returnMessage, HttpStatus.NOT_FOUND, verifyResult(returnMessage, HttpStatus.NOT_FOUND,
"Artifact for resource FileResource [sha1=null, artifactId=null, filename=null]not found "); "Artifact for resource FileResource [sha1=null, artifactId=null, filename=null] not found ");
} }