Commit ffa655be authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch 'release-1.4' into 'master'

Release 1.4

See merge request genesys-pgr/application-blocks!34
parents cabd3831 149f457d
......@@ -31,7 +31,7 @@ import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
/**
* App Blocks utility with handy updates :-)
* App Blocks utility with handy updates :-).
*
* @author Matija Obreza
*/
......@@ -45,6 +45,7 @@ public class AppBlocksInitializer implements InitializingBean {
@Autowired
private PasswordEncoder passwordEncoder;
/** The tx manager. */
@Autowired
@Qualifier("transactionManager")
protected PlatformTransactionManager txManager;
......@@ -60,7 +61,7 @@ public class AppBlocksInitializer implements InitializingBean {
}
/**
* Ensure that all clientSecrets are encrypted
* Ensure that all clientSecrets are encrypted.
*/
void encodePasswords() {
long count = 0;
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -28,6 +28,8 @@ import org.springframework.security.core.userdetails.UserDetails;
* The Class SecurityContextUtil.
*/
public class SecurityContextUtil {
/** The Constant LOG. */
public static final Logger LOG = LoggerFactory.getLogger(SecurityContextUtil.class);
/**
......@@ -68,7 +70,7 @@ public class SecurityContextUtil {
}
/**
* Gets the current principal (User or OAuthClient)
* Gets the current principal (User or OAuthClient).
*
* @param <T> the generic type
* @return the current security principal
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -151,8 +151,8 @@ public class AclSid extends AuditedVersionedModel {
/**
* Subclasses should override this method and return a sensible display name for
* the SID
*
* the SID.
*
* @return SID full name
*/
public String getFullName() {
......
......@@ -75,7 +75,8 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AclSid imple
GOOGLE,
/** The system. */
SYSTEM,
/** Deleted user accounts */
/** Deleted user accounts. */
DELETED
}
......@@ -138,6 +139,9 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AclSid imple
private Date lastLogin;
/**
* Instantiates a new basic user.
*/
public BasicUser() {
setPrincipal(true);
}
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -40,8 +40,8 @@ public interface AclEntryPersistence extends JpaRepository<AclEntry, Long> {
List<AclEntry> findByObjectIdentity(@Param("aclObjectIdentity") AclObjectIdentity aclObjectIdentity);
/**
* List by SID and Object Identity
*
* List by SID and Object Identity.
*
* @param sid - SID
* @param objectIdentity the ACL object identity
* @return list of ACL entries for specified SID and OID
......@@ -81,8 +81,8 @@ public interface AclEntryPersistence extends JpaRepository<AclEntry, Long> {
List<AclSid> getSids(@Param("objectIdentity") AclObjectIdentity objectIdentity);
/**
* Delete AclEntries for a SID
*
* Delete AclEntries for a SID.
*
* @param <T> type extending AclSid (User, OAuthClient)
* @param sid the SID
* @return number of deleted entries
......
......@@ -38,7 +38,7 @@ public interface AclObjectIdentityPersistence extends JpaRepository<AclObjectIde
AclObjectIdentity findByObjectIdAndClassname(@Param("objectIdIdentity") long objectIdIdentity, @Param("aclClass") String aclClass);
/**
* Clear the parentObject of child OID that use this oID as parentObject
* Clear the parentObject of child OID that use this oID as parentObject.
*
* @param oID the object identifier ID
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment