Skip to content

Commit 471fe57

Browse files
committed
Use parent logging object exposed to service
1 parent 717b6ff commit 471fe57

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

plugin/src/main/java/com/siemens/bt/jazz/services/PersonalTokenService/builder/TokenReaderService.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.google.gson.JsonObject;
44
import com.ibm.team.repository.common.IContributor;
55
import com.ibm.team.repository.common.TeamRepositoryException;
6-
import com.ibm.team.repository.common.util.JazzLog;
76
import com.ibm.team.repository.service.TeamRawService;
87
import com.siemens.bt.jazz.services.PersonalTokenService.internal.BuildSecretsHelper;
98
import com.siemens.bt.jazz.services.PersonalTokenService.internal.BuildSecretsReader;
@@ -23,8 +22,6 @@
2322
import java.security.GeneralSecurityException;
2423

2524
public class TokenReaderService extends AbstractRestService {
26-
private static final JazzLog logger = JazzLog.getLog(TokenReaderService.class);
27-
2825
public TokenReaderService(Log log, HttpServletRequest request, HttpServletResponse response, RestRequest restRequest, TeamRawService parentService) {
2926
super(log, request, response, restRequest, parentService);
3027
}
@@ -44,13 +41,13 @@ public void execute() throws IOException, URISyntaxException, AuthenticationExce
4441
securedValue = BuildSecretsReader.getSecretByContributor(parentService, user, hashedKey);
4542
userToken = Crypto.decrypt(securedValue, privateKey);
4643
} catch (GeneralSecurityException ex) {
47-
logger.error("[PTS] Token Service decryption failed for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
44+
log.error("[PTS] Token Service decryption failed for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
4845
response.setStatus(500);
4946
} catch (UnsupportedEncodingException ex) {
50-
logger.error("[PTS] Token Service decryption failed due to encoding issues for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
47+
log.error("[PTS] Token Service decryption failed due to encoding issues for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
5148
response.setStatus(500);
5249
} catch (TeamRepositoryException ex) {
53-
logger.error("[PTS] Problem reading Build Secrets Store for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
50+
log.error("[PTS] Problem reading Build Secrets Store for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
5451
response.setStatus(500);
5552
}
5653

@@ -59,7 +56,7 @@ public void execute() throws IOException, URISyntaxException, AuthenticationExce
5956
formattedResponse.addProperty("token", userToken);
6057
response.getWriter().write(formattedResponse.toString());
6158
response.setStatus(200);
62-
logger.info("[PTS] Token read for '" + user.getUserId() + "'");
59+
log.info("[PTS] Token read for '" + user.getUserId() + "'");
6360
} else {
6461
response.setStatus(404);
6562
}

plugin/src/main/java/com/siemens/bt/jazz/services/PersonalTokenService/builder/TokenWriterService.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.security.GeneralSecurityException;
2626

2727
public final class TokenWriterService extends AbstractRestService {
28-
private static final JazzLog logger = JazzLog.getLog(TokenWriterService.class);
2928

3029
public TokenWriterService(Log log, HttpServletRequest request, HttpServletResponse response, RestRequest restRequest, TeamRawService parentService) {
3130
super(log, request, response, restRequest, parentService);
@@ -48,16 +47,16 @@ public void execute() throws IOException, URISyntaxException, AuthenticationExce
4847
try {
4948
String encryptedToken = Crypto.encrypt(token, privateKey);
5049
BuildSecretsWriter.storeSecret(parentService, user, hashedKey, encryptedToken);
51-
logger.info("[PTS] Token created by '" + user.getUserId() + "'");
50+
log.info("[PTS] Token created by '" + user.getUserId() + "'");
5251
response.setStatus(201);
5352
} catch (GeneralSecurityException ex) {
54-
logger.error("[PTS] Token Service encryption failed for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
53+
log.error("[PTS] Token Service encryption failed for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
5554
response.setStatus(500);
5655
} catch (UnsupportedEncodingException ex) {
57-
logger.error("[PTS] Token Service encryption failed due to encoding issues for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
56+
log.error("[PTS] Token Service encryption failed due to encoding issues for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
5857
response.setStatus(500);
5958
} catch (TeamRepositoryException ex) {
60-
logger.error("[PTS] Problem writing to Build Secrets Store for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
59+
log.error("[PTS] Problem writing to Build Secrets Store for user '" + user.getUserId() + "'. Error message: " + ex.getMessage());
6160
response.setStatus(500);
6261
}
6362
} else {

0 commit comments

Comments
 (0)