Merge pull request #450 from ministryofjustice/bugfix/common-pool-ldap-context

Author: marcus-bcl

src/main/java/uk/co/bconline/ndelius/config/cache/CacheConfig.java

@@ -11,41 +11,42 @@
 import uk.co.bconline.ndelius.service.RoleGroupService;
 import uk.co.bconline.ndelius.service.RoleService;
 
+import java.util.Objects;
+import java.util.stream.Stream;
+
 @Slf4j
 @Configuration
 @EnableCaching
-public class CacheConfig
-{
+public class CacheConfig {
 	private final RoleService roleService;
 	private final RoleGroupService roleGroupService;
 
 	@Autowired
-	public CacheConfig(RoleService roleService, RoleGroupService roleGroupService)
-	{
+	public CacheConfig(RoleService roleService, RoleGroupService roleGroupService) {
 		this.roleService = roleService;
 		this.roleGroupService = roleGroupService;
 	}
 
 	@Bean
-	public CacheManager cacheManager()
-	{
+	public CacheManager cacheManager() {
 		return new ConcurrentMapCacheManager();
 	}
 
-	public void evictCache()
-	{
-		cacheManager().getCacheNames().parallelStream()
-				.map(cacheManager()::getCache)
-				.peek(cache -> log.debug("Cache {} = {}", cache.getName(), cache.getNativeCache()))
-				.forEach(Cache::clear);
+	public void evictCache() {
+		getCaches().forEach(Cache::clear);
 		log.info("Flushed all caches");
 
 		// Populate role + rolegroup cache
 		roleService.getAllRoles();
 		roleGroupService.getRoleGroups().forEach(group -> roleGroupService.getRoleGroup(group.getName()));
 		log.info("Re-populated role and group caches");
-		cacheManager().getCacheNames().parallelStream()
+		getCaches();
+	}
+
+	private Stream<Cache> getCaches() {
+		return cacheManager().getCacheNames().parallelStream()
 				.map(cacheManager()::getCache)
-				.forEach(cache -> log.info("Cache {} = {}", cache.getName(), cache.getNativeCache()));
+				.filter(Objects::nonNull)
+				.peek(cache -> log.debug("Cache {} = {}", cache.getName(), cache.getNativeCache()));
 	}
 }

src/main/java/uk/co/bconline/ndelius/service/impl/UserEntryServiceImpl.java

@@ -198,10 +198,13 @@ private void updateUserGroups(String username, Set<Name> groups)
 		val newGroups = ofNullable(groups).orElse(emptySet());
 		val groupsToAdd = Sets.difference(newGroups, existingGroups);
 		val groupsToRemove = Sets.difference(existingGroups, newGroups);
-		groupService.getGroups(groupsToAdd).parallelStream()
+		// Note: We must use serial streams here, due to a bug in Spring LDAP meaning the commonPool loads the
+		// incorrect DirContext class.
+		// See https://github.com/spring-projects/spring-ldap/issues/501
+		groupService.getGroups(groupsToAdd).stream()
 				.peek(group -> group.getMembers().add(userDn))
 				.forEach(groupService::save);
-		groupService.getGroups(groupsToRemove).parallelStream()
+		groupService.getGroups(groupsToRemove).stream()
 				.peek(group -> group.getMembers().remove(userDn))
 				.forEach(groupService::save);
 	}
@@ -227,10 +230,10 @@ public void save(UserEntry user)
 
 		// Preferences
 		log.debug("Checking if user preferences exist");
-		if (!preferencesRepository.findOne(query()
+		if (preferencesRepository.findOne(query()
 				.searchScope(ONELEVEL)
 				.base(getDn(user.getUsername()))
-				.where(OBJECTCLASS).isPresent()).isPresent())
+				.where(OBJECTCLASS).isPresent()).isEmpty())
 		{
 			log.debug("Creating user preferences");
 			preferencesRepository.save(new UserPreferencesEntry(user.getUsername()));

src/main/resources/application.yml

@@ -2,12 +2,10 @@ spring.application.name: ndelius-um
 
 server:
   servlet.context-path: /umt
-  compression:
-    enabled: true # Enable GZIP compression
-    mime-types: application/json,application/xml,text/html,text/xml,text/plain,application/javascript,text/css
+  compression.enabled: true # Enable GZIP compression
 
 spring.resources:
-  static-locations: classpath:/ui
+  chain.strategy.content.enabled: true
   cache.cachecontrol:
     cache-public: true # Enable resource caching by browser or intermediaries
     no-cache: true     # Enable revalidation on each request

ui/angular.json

@@ -18,7 +18,7 @@
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "aot": true,
-            "outputPath": "dist/ui",
+            "outputPath": "dist/static",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",