Skip to content

Commit eb9472f

Browse files
duanemayduanemay
committed
Sonar fix
1 parent c7f630c commit eb9472f

File tree

12 files changed

+245
-220
lines changed

12 files changed

+245
-220
lines changed

‎model/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/SamlServiceProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public boolean equals(Object obj) {
213213
} else if (!entityId.equals(other.entityId)) {
214214
return false;
215215
}
216-
return !(version != other.version);
216+
return version == other.version;
217217
}
218218

219219
@Override

‎server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
*******************************************************************************/
1414
package org.cloudfoundry.identity.uaa.approval;
1515

16-
import org.cloudfoundry.identity.uaa.util.UaaStringUtils;
17-
import org.slf4j.Logger;
18-
import org.slf4j.LoggerFactory;
1916
import org.cloudfoundry.identity.uaa.approval.Approval.ApprovalStatus;
2017
import org.cloudfoundry.identity.uaa.audit.event.ApprovalModifiedEvent;
2118
import org.cloudfoundry.identity.uaa.audit.event.SystemDeletable;
19+
import org.cloudfoundry.identity.uaa.util.UaaStringUtils;
20+
import org.slf4j.Logger;
21+
import org.slf4j.LoggerFactory;
2222
import org.springframework.context.ApplicationEvent;
2323
import org.springframework.context.ApplicationEventPublisher;
2424
import org.springframework.context.ApplicationEventPublisherAware;
@@ -79,7 +79,7 @@ public class JdbcApprovalStore implements ApprovalStore, ApplicationEventPublish
7979
private ApplicationEventPublisher applicationEventPublisher;
8080

8181
public JdbcApprovalStore(JdbcTemplate jdbcTemplate) {
82-
Assert.notNull(jdbcTemplate);
82+
Assert.notNull(jdbcTemplate, "jdbcTemplate is required");
8383
this.jdbcTemplate = jdbcTemplate;
8484
}
8585

@@ -88,7 +88,9 @@ public void setHandleRevocationsAsExpiry(boolean handleRevocationsAsExpiry) {
8888
}
8989

9090
public boolean refreshApproval(final Approval approval, final String zoneId) {
91-
logger.debug("refreshing approval: [{}]", UaaStringUtils.getCleanedUserControlString(approval.toString()));
91+
if (logger.isDebugEnabled()) {
92+
logger.debug("refreshing approval: [{}]", UaaStringUtils.getCleanedUserControlString(approval.toString()));
93+
}
9294
int refreshed = jdbcTemplate.update(REFRESH_AUTHZ_SQL, ps -> {
9395
ps.setTimestamp(1, new Timestamp(approval.getLastUpdatedAt().getTime()));
9496
ps.setTimestamp(2, new Timestamp(approval.getExpiresAt().getTime()));
@@ -106,7 +108,9 @@ public boolean refreshApproval(final Approval approval, final String zoneId) {
106108

107109
@Override
108110
public boolean addApproval(final Approval approval, final String zoneId) {
109-
logger.debug("adding approval: [{}]", UaaStringUtils.getCleanedUserControlString(approval.toString()));
111+
if (logger.isDebugEnabled()) {
112+
logger.debug("adding approval: [{}]", UaaStringUtils.getCleanedUserControlString(approval.toString()));
113+
}
110114
try {
111115
refreshApproval(approval, zoneId); // try to refresh the approval
112116
} catch (DataIntegrityViolationException ex) { // could not find the
@@ -184,10 +188,10 @@ public boolean purgeExpiredApprovals() {
184188
logger.debug("Purging expired approvals from database");
185189
try {
186190
int deleted = jdbcTemplate.update(DELETE_AUTHZ_SQL + " where expiresAt <= ?",
187-
ps -> { //PreparedStatementSetter
188-
ps.setTimestamp(1, new Timestamp(new Date().getTime()));
189-
});
190-
logger.debug(deleted + " expired approvals deleted");
191+
//PreparedStatementSetter
192+
ps -> ps.setTimestamp(1, new Timestamp(new Date().getTime()))
193+
);
194+
logger.debug("{} expired approvals deleted", deleted);
191195
} catch (DataAccessException ex) {
192196
logger.error("Error purging expired approvals", ex);
193197
return false;
@@ -252,28 +256,28 @@ public void publish(ApplicationEvent event) {
252256
@Override
253257
public int deleteByIdentityZone(String zoneId) {
254258
int approvalCount = jdbcTemplate.update(DELETE_ZONE_APPROVALS, zoneId);
255-
getLogger().debug("Deleted zone approvals '%s' and count:%s".formatted(zoneId, approvalCount));
259+
getLogger().debug("Deleted zone approvals '{}' and count:{}", zoneId, approvalCount);
256260
return approvalCount;
257261
}
258262

259263
@Override
260264
public int deleteByOrigin(String origin, String zoneId) {
261265
int approvalCount = jdbcTemplate.update(DELETE_OF_USER_APPROVALS_BY_PROVIDER, origin, zoneId);
262-
getLogger().debug("Deleted provider approvals '%s'/%s and count:%s".formatted(origin, zoneId, approvalCount));
266+
getLogger().debug("Deleted provider approvals '{}'/{} and count:{}", origin, zoneId, approvalCount);
263267
return approvalCount;
264268
}
265269

266270
@Override
267271
public int deleteByClient(String clientId, String zoneId) {
268272
int approvalCount = jdbcTemplate.update(DELETE_CLIENT_APPROVALS, clientId, zoneId);
269-
getLogger().debug("Deleted client '%s' and %s approvals".formatted(clientId, approvalCount));
273+
getLogger().debug("Deleted client '{}' and {} approvals", clientId, approvalCount);
270274
return approvalCount;
271275
}
272276

273277
@Override
274278
public int deleteByUser(String userId, String zoneId) {
275279
int approvalCount = jdbcTemplate.update(DELETE_USER_APPROVALS, userId, zoneId);
276-
getLogger().debug("Deleted user '%s' and %s approvals".formatted(userId, approvalCount));
280+
getLogger().debug("Deleted user '{}' and {} approvals", userId, approvalCount);
277281
return approvalCount;
278282
}
279283

@@ -283,7 +287,6 @@ public Logger getLogger() {
283287
}
284288

285289
private static class AuthorizationRowMapper implements RowMapper<Approval> {
286-
287290
@Override
288291
public Approval mapRow(ResultSet rs, int rowNum) throws SQLException {
289292
String userId = rs.getString(1);

‎server/src/main/java/org/cloudfoundry/identity/uaa/audit/event/SystemDeletable.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,53 @@
1616
package org.cloudfoundry.identity.uaa.audit.event;
1717

1818
import org.cloudfoundry.identity.uaa.constants.OriginKeys;
19+
import org.cloudfoundry.identity.uaa.oauth.provider.ClientDetails;
1920
import org.cloudfoundry.identity.uaa.provider.IdentityProvider;
2021
import org.cloudfoundry.identity.uaa.scim.ScimUser;
2122
import org.cloudfoundry.identity.uaa.user.UaaUser;
2223
import org.cloudfoundry.identity.uaa.zone.IdentityZone;
2324
import org.slf4j.Logger;
2425
import org.springframework.context.ApplicationListener;
25-
import org.cloudfoundry.identity.uaa.oauth.provider.ClientDetails;
2626

2727
public interface SystemDeletable extends ApplicationListener<AbstractUaaEvent> {
2828
default void onApplicationEvent(EntityDeletedEvent<?> event) {
2929
if (event == null || event.getDeleted() == null) {
3030
return;
31-
} else if (event.getDeleted() instanceof IdentityZone) {
32-
IdentityZone identityZone = (IdentityZone) event.getDeleted();
33-
31+
}
32+
if (event.getDeleted() instanceof IdentityZone identityZone) {
3433
String zoneId = identityZone.getId();
35-
getLogger().debug("Received zone deletion event for id:%s".formatted(zoneId));
34+
getLogger().debug("Received zone deletion event for id:{}", zoneId);
3635
if (identityZone.isUaa()) {
37-
getLogger().debug("Attempt to delete default zone ignored:" + event.getDeleted());
36+
getLogger().debug("Attempt to delete default zone ignored:{}", event.getDeleted());
3837
return;
3938
}
4039
deleteByIdentityZone(zoneId);
41-
} else if (event.getDeleted() instanceof IdentityProvider) {
42-
String zoneId = ((IdentityProvider) event.getDeleted()).getIdentityZoneId();
43-
String origin = ((IdentityProvider) event.getDeleted()).getOriginKey();
44-
getLogger().debug("Received provider deletion event for zone_id:%s and origin:%s".formatted(zoneId, origin));
40+
} else if (event.getDeleted() instanceof IdentityProvider provider) {
41+
String zoneId = provider.getIdentityZoneId();
42+
String origin = provider.getOriginKey();
43+
getLogger().debug("Received provider deletion event for zone_id:{} and origin:{}", zoneId, origin);
4544
if (OriginKeys.UAA.equals(origin)) {
46-
getLogger().debug("Attempt to delete default UAA provider ignored:" + event.getDeleted());
45+
getLogger().debug("Attempt to delete default UAA provider ignored:{}", event.getDeleted());
4746
return;
4847
}
4948
deleteByOrigin(origin, zoneId);
5049
} else if (event.getDeleted() instanceof ClientDetails) {
5150
String clientId = ((ClientDetails) event.getDeleted()).getClientId();
5251
String zoneId = event.getIdentityZoneId();
53-
getLogger().debug("Received client deletion event for zone_id:%s and client:%s".formatted(zoneId, clientId));
52+
getLogger().debug("Received client deletion event for zone_id:{} and client:{}", zoneId, clientId);
5453
deleteByClient(clientId, zoneId);
5554
} else if (event.getDeleted() instanceof UaaUser) {
5655
String userId = ((UaaUser) event.getDeleted()).getId();
5756
String zoneId = ((UaaUser) event.getDeleted()).getZoneId();
58-
getLogger().debug("Received UAA user deletion event for zone_id:%s and user:%s".formatted(zoneId, userId));
57+
getLogger().debug("Received UAA user deletion event for zone_id:{} and user:{}", zoneId, userId);
5958
deleteByUser(userId, zoneId);
6059
} else if (event.getDeleted() instanceof ScimUser) {
6160
String userId = ((ScimUser) event.getDeleted()).getId();
6261
String zoneId = ((ScimUser) event.getDeleted()).getZoneId();
63-
getLogger().debug("Received SCIM user deletion event for zone_id:%s and user:%s".formatted(zoneId, userId));
62+
getLogger().debug("Received SCIM user deletion event for zone_id:{} and user:{}", zoneId, userId);
6463
deleteByUser(userId, zoneId);
6564
} else {
66-
getLogger().debug("Unsupported deleted event for deletion of object:" + event.getDeleted());
65+
getLogger().debug("Unsupported deleted event for deletion of object:{}", event.getDeleted());
6766
}
6867
}
6968

‎server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalLoginAuthenticationManager.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ public UaaUserDatabase getUserDatabase() {
115115

116116
@Override
117117
public Authentication authenticate(Authentication request) throws AuthenticationException {
118-
logger.debug("Starting external authentication for:{}", UaaStringUtils.getCleanedUserControlString(request.toString()));
118+
if (logger.isDebugEnabled()) {
119+
logger.debug("Starting external authentication for:{}", UaaStringUtils.getCleanedUserControlString(request.toString()));
120+
}
119121
ExternalAuthenticationDetails authenticationData = getExternalAuthenticationDetails(request);
120122
UaaUser userFromRequest = getUser(request, authenticationData);
121123
if (userFromRequest == null) {
@@ -125,10 +127,10 @@ public Authentication authenticate(Authentication request) throws Authentication
125127
UaaUser userFromDb;
126128

127129
try {
128-
logger.debug(String.format("Searching for user by (username:%s , origin:%s)", userFromRequest.getUsername(), getOrigin()));
130+
logger.debug("Searching for user by (username:{} , origin:{})", userFromRequest.getUsername(), getOrigin());
129131
userFromDb = userDatabase.retrieveUserByName(userFromRequest.getUsername(), getOrigin());
130132
} catch (UsernameNotFoundException e) {
131-
logger.debug(String.format("Searching for user by (email:%s , origin:%s)", userFromRequest.getEmail(), getOrigin()));
133+
logger.debug("Searching for user by (email:{} , origin:{})", userFromRequest.getEmail(), getOrigin());
132134
userFromDb = userDatabase.retrieveUserByEmail(userFromRequest.getEmail(), getOrigin());
133135
}
134136

@@ -161,8 +163,7 @@ public Authentication authenticate(Authentication request) throws Authentication
161163
}
162164

163165
protected void populateAuthenticationAttributes(UaaAuthentication authentication, Authentication request, ExternalAuthenticationDetails authenticationData) {
164-
if (request.getPrincipal() instanceof UserDetails) {
165-
UserDetails userDetails = (UserDetails) request.getPrincipal();
166+
if (request.getPrincipal() instanceof UserDetails userDetails) {
166167
authentication.setUserAttributes(getUserAttributes(userDetails));
167168
authentication.setExternalGroups(new HashSet<>(getExternalUserAuthorities(userDetails)));
168169
}
@@ -174,10 +175,10 @@ protected void populateAuthenticationAttributes(UaaAuthentication authentication
174175
if ((hasUserAttributes(authentication) || hasExternalGroups(authentication)) && getProviderProvisioning() != null) {
175176
IdentityProvider<ExternalIdentityProviderDefinition> provider = getProviderProvisioning().retrieveByOrigin(getOrigin(), IdentityZoneHolder.get().getId());
176177
if (provider.getConfig() != null && provider.getConfig().isStoreCustomAttributes()) {
177-
logger.debug("Storing custom attributes for user_id:" + authentication.getPrincipal().getId());
178+
logger.debug("Storing custom attributes for user_id:{}", authentication.getPrincipal().getId());
178179
UserInfo userInfo = new UserInfo()
179180
.setUserAttributes(authentication.getUserAttributes())
180-
.setRoles(new LinkedList(ofNullable(authentication.getExternalGroups()).orElse(emptySet())));
181+
.setRoles(new LinkedList<>(ofNullable(authentication.getExternalGroups()).orElse(emptySet())));
181182
getUserDatabase().storeUserInfo(authentication.getPrincipal().getId(), userInfo);
182183
}
183184
}
@@ -227,10 +228,10 @@ protected UaaUser getUser(Authentication request, ExternalAuthenticationDetails
227228
userDetails = new User(username, credentials != null ? credentials.toString() : "",
228229
true, true, true, true, UaaAuthority.USER_AUTHORITIES);
229230
} else if (request.getPrincipal() == null) {
230-
logger.debug(this.getClass().getName() + "[" + name + "] cannot process null principal");
231+
logger.debug("{}[{}] cannot process null principal", this.getClass().getName(), name);
231232
return null;
232233
} else {
233-
logger.debug(this.getClass().getName() + "[" + name + "] cannot process request of type: " + request.getClass().getName());
234+
logger.debug("{}[{}] cannot process request of type: {}" , this.getClass().getName(), name, request.getClass().getName());
234235
return null;
235236
}
236237

@@ -284,7 +285,7 @@ protected String generateEmailIfNullOrEmpty(String name) {
284285
if (name.split("@").length == 2 && !name.startsWith("@") && !name.endsWith("@")) {
285286
email = name;
286287
} else {
287-
email = name.replaceAll("@", "") + "@user.from." + getOrigin() + ".cf";
288+
email = name.replace("@", "") + "@user.from." + getOrigin() + ".cf";
288289
}
289290
} else {
290291
email = name + "@user.from." + getOrigin() + ".cf";
@@ -315,5 +316,4 @@ protected List<? extends GrantedAuthority> mapAuthorities(String origin, Collect
315316
public void setBeanName(String name) {
316317
this.name = name;
317318
}
318-
319319
}

0 commit comments

Comments
 (0)