Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Dev/adelcast/fix author #188

Merged
merged 2 commits into from
Jan 4, 2018
+4 −4
Merged

Dev/adelcast/fix author #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0fc26
TfsUserLookup.find: fix logging message
Nov 17, 2017
db7ccae
tfs: use owner instead of commiter as author
Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tfs/src/main/java/hudson/plugins/tfs/commands/RemoteChangesetVersionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public Integer call() throws Exception {
final Changeset serverChangeset = serverChangeSets[0];
changeSetNumber = serverChangeset.getChangesetID();
final Date changeSetDate = serverChangeset.getDate().getTime();
final String author = serverChangeset.getCommitter();
final String author = serverChangeset.getOwner();
final SimpleDateFormat simpleDateFormat = DateUtil.TFS_DATETIME_FORMATTER.get();
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
final String changeSetDateIso8601 = simpleDateFormat.format(changeSetDate);
Expand Down
2 changes: 1 addition & 1 deletion tfs/src/main/java/hudson/plugins/tfs/model/Project.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public String getProjectPath() {
(com.microsoft.tfs.core.clients.versioncontrol.soapextensions.Changeset serverChangeset, UserLookup userLookup) {
final String version = Integer.toString(serverChangeset.getChangesetID(), 10);
final Date date = serverChangeset.getDate().getTime();
final String author = serverChangeset.getCommitter();
final String author = serverChangeset.getOwner();
final User authorUser = userLookup.find(author);
final String comment = serverChangeset.getComment();

Expand Down
4 changes: 2 additions & 2 deletions tfs/src/main/java/hudson/plugins/tfs/model/TfsUserLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ public TfsUserLookup(final IIdentityManagementService ims, final UserAccountMapp
*/
public User find(final String accountName) {
final String mappedAccountName = userAccountMapper.mapUserAccount(accountName);
logger.log(Level.FINE, "Looking up Jenkins user for account '%s'.", mappedAccountName);
logger.log(Level.FINE, String.format("Looking up Jenkins user for account '%s'.", mappedAccountName));
final User jenkinsUser = User.get(mappedAccountName);
Mailer.UserProperty mailerProperty = jenkinsUser.getProperty(Mailer.UserProperty.class);
if (mailerProperty == null || mailerProperty.getAddress() == null || mailerProperty.getAddress().length() == 0) {
logger.log(Level.FINE, "No Mailer.UserProperty defined for '%s', looking in TFS", mappedAccountName);
logger.log(Level.FINE, String.format("No Mailer.UserProperty defined for '%s', looking in TFS", mappedAccountName));
final TeamFoundationIdentity tfsUser = ims.readIdentity(
IdentitySearchFactor.ACCOUNT_NAME,
accountName,
Expand Down