Fix formatting due to fmt-format-plugin update

sidohaakma · May 24, 2019 · bced4a2 · bced4a2
1 parent df76044
commit bced4a2
Show file tree

Hide file tree

Showing 101 changed files with 184 additions and 431 deletions.
diff --git a/molgenis-api-data/src/main/java/org/molgenis/api/data/RestService.java b/molgenis-api-data/src/main/java/org/molgenis/api/data/RestService.java
@@ -380,8 +380,7 @@ private List<?> convertMref(Attribute attr, Object paramValue) {
       EntityType mrefEntity = attr.getRefEntity();
       Attribute mrefEntityIdAttr = mrefEntity.getIdAttribute();
       value =
-          mrefParamValues
-              .stream()
+          mrefParamValues.stream()
               .map(mrefParamValue -> toEntityValue(mrefEntityIdAttr, mrefParamValue, null))
               .map(mrefIdValue -> entityManager.getReference(mrefEntity, mrefIdValue))
               .collect(toList());

diff --git a/molgenis-api-data/src/main/java/org/molgenis/api/data/v2/EntityAggregatesResponse.java b/molgenis-api-data/src/main/java/org/molgenis/api/data/v2/EntityAggregatesResponse.java
@@ -75,8 +75,7 @@ private static Integer toAggregateThreshold(AggregateResult aggs) {
     }
 
     private static List<Object> convert(List<Object> xLabels) {
-      return xLabels
-          .stream()
+      return xLabels.stream()
           .map(
               xLabel -> {
                 Object value;

diff --git a/molgenis-api-data/src/main/java/org/molgenis/api/data/v2/RestControllerV2.java b/molgenis-api-data/src/main/java/org/molgenis/api/data/v2/RestControllerV2.java
@@ -307,9 +307,7 @@ public EntityCollectionBatchCreateResponseBodyV2 createEntities(
 
     try {
       final List<Entity> entities =
-          request
-              .getEntities()
-              .stream()
+          request.getEntities().stream()
               .map(e -> this.restService.toEntity(meta, e))
               .collect(toList());
       final EntityCollectionBatchCreateResponseBodyV2 responseBody =
@@ -318,8 +316,7 @@ public EntityCollectionBatchCreateResponseBodyV2 createEntities(
 
       // Add all entities
       if (ATTRIBUTE_META_DATA.equals(entityTypeId)) {
-        entities
-            .stream()
+        entities.stream()
             .map(attribute -> (Attribute) attribute)
             .forEach(attribute -> dataService.getMeta().addAttribute(attribute));
       } else {
@@ -434,9 +431,7 @@ public synchronized void updateEntities(
 
     try {
       List<Entity> entities =
-          request
-              .getEntities()
-              .stream()
+          request.getEntities().stream()
               .map(e -> this.restService.toEntity(meta, e))
               .collect(toList());
 
@@ -481,9 +476,7 @@ public synchronized void updateAttribute(
       }
 
       final List<Entity> entities =
-          request
-              .getEntities()
-              .stream()
+          request.getEntities().stream()
               .filter(e -> e.size() == 2)
               .map(e -> this.restService.toEntity(meta, e))
               .collect(toList());
@@ -565,10 +558,7 @@ public String getL10nProperties(@PathVariable String namespace, @PathVariable St
   public void registerMissingResourceStrings(
       @PathVariable String namespace, HttpServletRequest request) {
     Set<String> messageIDs =
-        request
-            .getParameterMap()
-            .entrySet()
-            .stream()
+        request.getParameterMap().entrySet().stream()
             .map(Map.Entry::getKey)
             .filter(id -> !id.equals(TIME_PARAM_NAME))
             .collect(toSet());

diff --git a/molgenis-api-identities/src/main/java/org/molgenis/api/identities/GroupRestController.java b/molgenis-api-identities/src/main/java/org/molgenis/api/identities/GroupRestController.java
@@ -140,9 +140,7 @@ public ResponseEntity deleteGroup(@PathVariable(value = "groupName") String grou
   })
   @ResponseBody
   public List<GroupResponse> getGroups() {
-    return groupService
-        .getGroups()
-        .stream()
+    return groupService.getGroups().stream()
         .filter(
             group ->
                 userPermissionEvaluator.hasPermission(
@@ -158,9 +156,7 @@ public Collection<GroupMemberResponse> getMembers(
       @PathVariable(value = "groupName") String groupName) {
     checkGroupPermission(groupName, GroupPermission.VIEW_MEMBERSHIP);
     Iterable<Role> roles = groupService.getGroup(groupName).getRoles();
-    return roleMembershipService
-        .getMemberships(Lists.newArrayList(roles))
-        .stream()
+    return roleMembershipService.getMemberships(Lists.newArrayList(roles)).stream()
         .map(GroupMemberResponse::fromEntity)
         .collect(Collectors.toList());
   }
@@ -291,9 +287,7 @@ public Collection<RoleResponse> getGroupRoles(
   @ResponseBody
   @PreAuthorize("hasAnyRole('SU', 'MANAGER')")
   public Collection<UserResponse> getUsers() {
-    return userService
-        .getUsers()
-        .stream()
+    return userService.getUsers().stream()
         .filter(u -> !u.getUsername().equals("anonymous"))
         .map(UserResponse::fromEntity)
         .collect(Collectors.toList());
@@ -315,9 +309,7 @@ public Collection<Permission> getPermissions(
   }
 
   private String getManagerRoleName(GroupValue groupValue) {
-    return groupValue
-        .getRoles()
-        .stream()
+    return groupValue.getRoles().stream()
         .filter(role -> role.getLabel().equals(GroupService.MANAGER))
         .map(RoleValue::getName)
         .findFirst()

diff --git a/...nis-api-permissions/src/main/java/org/molgenis/api/permissions/PermissionsController.java b/...nis-api-permissions/src/main/java/org/molgenis/api/permissions/PermissionsController.java
@@ -141,9 +141,7 @@ public ApiResponse getRlsEntities() {
       response = List.class)
   public ApiResponse getSuitablePermissions(@PathVariable(value = TYPE_ID) String typeId) {
     return ApiResponse.create(
-        permissionService
-            .getSuitablePermissionsForType(typeId)
-            .stream()
+        permissionService.getSuitablePermissionsForType(typeId).stream()
             .map(PermissionSetUtils::getPermissionStringValue)
             .collect(Collectors.toSet()));
   }
@@ -174,9 +172,7 @@ public PagedApiResponse getAcls(
     }
 
     Set<ObjectResponse> data =
-        permissionService
-            .getObjects(typeId, page, pageSize)
-            .stream()
+        permissionService.getObjects(typeId, page, pageSize).stream()
             .map(
                 labelledObject ->
                     ObjectResponse.create(labelledObject.getId(), labelledObject.getLabel()))
@@ -335,8 +331,7 @@ private void validateQueryParams(Integer page, Integer pageSize, boolean inherit
   }
 
   private Set<TypeResponse> convertTypes(Set<LabelledType> types) {
-    return types
-        .stream()
+    return types.stream()
         .map(type -> TypeResponse.create(type.getId(), type.getEntityType(), type.getLabel()))
         .collect(Collectors.toSet());
   }
@@ -355,8 +350,7 @@ private TypePermissionsResponse convertToTypeResponse(
       Set<LabelledPermission> permissions = entry.getValue();
       if (!permissions.isEmpty()) {
         LabelledPermission labelledObjectPermission =
-            permissions
-                .stream()
+            permissions.stream()
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException("Empty set of permissions"));
         objectPermissions.add(
@@ -372,8 +366,7 @@ private TypePermissionsResponse convertToTypeResponse(
 
   private Set<PermissionResponse> convertToPermissions(Set<LabelledPermission> permissions) {
     LinkedHashSet<PermissionResponse> result = new LinkedHashSet();
-    permissions
-        .stream()
+    permissions.stream()
         .map(
             labelledPermission ->
                 PermissionResponse.create(

diff --git a/molgenis-api-tests/src/test/java/org/molgenis/api/tests/utils/RestTestUtils.java b/molgenis-api-tests/src/test/java/org/molgenis/api/tests/utils/RestTestUtils.java
@@ -379,9 +379,7 @@ public static void setGrantedRepositoryPermissions(
       String adminToken, String username, Map<String, Permission> permissions) {
     if (adminToken != null) {
       Map<String, String> params =
-          permissions
-              .entrySet()
-              .stream()
+          permissions.entrySet().stream()
               .collect(
                   toMap(
                       entry -> "radio-" + entry.getKey(),
@@ -414,9 +412,7 @@ public static void setGrantedPackagePermissions(
       String adminToken, String username, Map<String, Permission> permissions) {
     if (adminToken != null) {
       Map<String, String> params =
-          permissions
-              .entrySet()
-              .stream()
+          permissions.entrySet().stream()
               .collect(
                   toMap(
                       entry -> "radio-" + entry.getKey(),

diff --git a/molgenis-bootstrap/src/main/java/org/molgenis/bootstrap/populate/SystemEntityPopulator.java b/molgenis-bootstrap/src/main/java/org/molgenis/bootstrap/populate/SystemEntityPopulator.java
@@ -41,9 +41,7 @@ void populate(ContextRefreshedEvent event) {
   private void populate(SystemEntityRegistry systemEntityRegistry) {
     // sort entities by type
     Multimap<EntityType, Entity> entityByTypeMap =
-        systemEntityRegistry
-            .getEntities()
-            .stream()
+        systemEntityRegistry.getEntities().stream()
             .collect(toArrayListMultimap(Entity::getEntityType, Function.identity()));
 
     // sort entity types

diff --git a/...e-ui/src/main/java/org/molgenis/core/ui/admin/permission/PermissionManagerController.java b/...e-ui/src/main/java/org/molgenis/core/ui/admin/permission/PermissionManagerController.java
@@ -110,8 +110,7 @@ public String init(Model model) {
     model.addAttribute(
         "users",
         Lists.newArrayList(
-            getUsers()
-                .stream()
+            getUsers().stream()
                 .filter(
                     user -> {
                       Boolean superuser = user.isSuperuser();
@@ -128,8 +127,7 @@ private List<EntityTypeRlsResponse> getEntityTypeDtos() {
         getEntityTypes().filter(entityType -> !entityType.isAbstract()).collect(toList());
     Collection<String> aclClasses = mutableAclClassService.getAclClassTypes();
     entityTypes.sort(comparing(EntityType::getLabel));
-    return entityTypes
-        .stream()
+    return entityTypes.stream()
         .map(
             entityType -> {
               boolean rlsEnabled = aclClasses.contains(EntityIdentityUtils.toType(entityType));
@@ -300,10 +298,7 @@ public void updateEntityClassRls(@Valid @RequestBody EntityTypeRlsRequest entity
   @GetMapping("/permissionSets")
   @ResponseBody
   public List<PermissionSetResponse> getPermissionSets() {
-    return permissionRegistry
-        .getPermissionSets()
-        .entrySet()
-        .stream()
+    return permissionRegistry.getPermissionSets().entrySet().stream()
         .map(entry -> PermissionSetResponse.create(entry.getKey(), entry.getValue()))
         .sorted(comparing(PermissionSetResponse::getPermissions, comparingInt(List::size)))
         .collect(toList());
@@ -366,8 +361,7 @@ private Permissions getPermissions(Sid sid, List<ObjectIdentity> objectIdentitie
     Map<ObjectIdentity, Acl> aclMap =
         mutableAclService.readAclsById(objectIdentities, singletonList(sid));
     Set<String> ids =
-        objectIdentities
-            .stream()
+        objectIdentities.stream()
             .map(ObjectIdentity::getIdentifier)
             .map(Object::toString)
             .collect(toSet());
@@ -379,8 +373,7 @@ private Multimap<String, String> getPermissions(Map<ObjectIdentity, Acl> acls, S
     acls.forEach(
         (objectIdentity, acl) -> {
           String id = objectIdentity.getIdentifier().toString();
-          acl.getEntries()
-              .stream()
+          acl.getEntries().stream()
               .filter(ace -> ace.getSid().equals(sid))
               .map(this::getPermissionString)
               .forEach(permission -> result.put(id, permission));

diff --git a/...is-core-ui/src/main/java/org/molgenis/core/ui/admin/permission/PermissionSetResponse.java b/...is-core-ui/src/main/java/org/molgenis/core/ui/admin/permission/PermissionSetResponse.java
@@ -23,8 +23,7 @@ public static PermissionSetResponse create(String name, List<PermissionResponse>
   public static PermissionSetResponse create(
       PermissionSet permissionSet, Set<Permission> permissions) {
     List<PermissionResponse> permissionsGranted =
-        permissions
-            .stream()
+        permissions.stream()
             .map(PermissionResponse::create)
             .sorted(comparing(PermissionResponse::getType))
             .collect(toList());

diff --git a/...is-core-ui/src/main/java/org/molgenis/core/ui/data/importer/wizard/OptionsWizardPage.java b/...is-core-ui/src/main/java/org/molgenis/core/ui/data/importer/wizard/OptionsWizardPage.java
@@ -196,8 +196,7 @@ private boolean isInDefaultPackage(String entityTypeId, Set<String> packages) {
 
   /** @return sorted map of writable packages ids to package path label */
   private Map<String, String> getPackageSelection(List<Package> packages) {
-    return packages
-        .stream()
+    return packages.stream()
         .filter(this::isReadablePackage)
         .sorted(comparing(this::getPackagePathLabel))
         .collect(toLinkedMap(Package::getId, this::getPackagePathLabel));

diff --git a/...is-core-ui/src/main/java/org/molgenis/core/ui/data/importer/wizard/PackageWizardPage.java b/...is-core-ui/src/main/java/org/molgenis/core/ui/data/importer/wizard/PackageWizardPage.java
@@ -95,9 +95,7 @@ public String handleRequest(HttpServletRequest request, BindingResult result, Wi
           // The entities that can not be imported. If even one entity can not be imported,
           // everything fails
           List<String> entitiesNotImportable =
-              entitiesImportable
-                  .entrySet()
-                  .stream()
+              entitiesImportable.entrySet().stream()
                   .filter(entity -> !entity.getValue())
                   .map(Map.Entry::getKey)
                   .collect(toList());

diff --git a/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l1/L1CacheRepositoryDecorator.java b/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l1/L1CacheRepositoryDecorator.java
@@ -100,16 +100,14 @@ private List<Entity> findAllBatch(List<Object> batch) {
     String entityId = getEntityType().getId();
     EntityType entityType = getEntityType();
     List<Object> missingIds =
-        batch
-            .stream()
+        batch.stream()
             .filter(id -> !l1Cache.get(entityId, id, entityType).isPresent())
             .collect(toList());
 
     Map<Object, Entity> missingEntities =
         delegate().findAll(missingIds.stream()).collect(toMap(Entity::getIdValue, e -> e));
 
-    return batch
-        .stream()
+    return batch.stream()
         .map(
             id ->
                 l1Cache

diff --git a/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l2/L2Cache.java b/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l2/L2Cache.java
@@ -102,10 +102,7 @@ public Entity get(Repository<Entity> repository, Object id) {
    */
   public List<Entity> getBatch(Repository<Entity> repository, Iterable<Object> ids) {
     try {
-      return getEntityCache(repository)
-          .getAll(ids)
-          .values()
-          .stream()
+      return getEntityCache(repository).getAll(ids).values().stream()
           .filter(Optional::isPresent)
           .map(Optional::get)
           .map(e -> entityHydration.hydrate(e, repository.getEntityType()))

diff --git a/molgenis-data-cache/src/main/java/org/molgenis/data/cache/utils/CombinedEntityCache.java b/molgenis-data-cache/src/main/java/org/molgenis/data/cache/utils/CombinedEntityCache.java
@@ -46,10 +46,7 @@ public void putDeletion(EntityKey entityKey) {
    * @param entityType the id of the entity whose entries are to be evicted
    */
   public void evictAll(EntityType entityType) {
-    cache
-        .asMap()
-        .keySet()
-        .stream()
+    cache.asMap().keySet().stream()
         .filter(e -> e.getEntityTypeId().equals(entityType.getId()))
         .forEach(cache::invalidate);
   }

diff --git a/...s-data-cache/src/test/java/org/molgenis/data/cache/l2/L2CacheRepositoryDecoratorTest.java b/...s-data-cache/src/test/java/org/molgenis/data/cache/l2/L2CacheRepositoryDecoratorTest.java
@@ -165,7 +165,7 @@ public void testFindAllQueriesInBatches() {
               List<Object> queried =
                   ((Stream<Object>) invocation.getArguments()[0]).collect(toList());
               return Lists.transform(
-                      queried, id -> lotsOfEntities.get(Integer.parseInt(id.toString())))
+                  queried, id -> lotsOfEntities.get(Integer.parseInt(id.toString())))
                   .stream();
             });
 

diff --git a/molgenis-data-cache/src/test/java/org/molgenis/data/cache/utils/EntityHydrationTest.java b/molgenis-data-cache/src/test/java/org/molgenis/data/cache/utils/EntityHydrationTest.java
@@ -129,9 +129,7 @@ public void hydrateTest() {
     assertTrue(EntityUtils.equals(actualHydratedEntity, hydratedEntity));
     // check that it has retrieved references of type TypeTestRef
     assertTrue(
-        entityTypeArgumentCaptor
-            .getAllValues()
-            .stream()
+        entityTypeArgumentCaptor.getAllValues().stream()
             .allMatch(emd -> emd.getId().equals("TypeTestRefDynamic")));
   }
 

diff --git a/...-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/AggregateResponseParser.java b/...-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/AggregateResponseParser.java
@@ -311,8 +311,7 @@ private void convertIdtoLabelLabels(
       // Get entities for ids
       // Use Iterables.transform to work around List<String> to Iterable<Object> cast error
       Stream<Object> idLabelsWithoutNull =
-          idLabels
-              .stream()
+          idLabels.stream()
               .filter(Objects::nonNull)
               .map(
                   untypedIdLabel ->

diff --git a/...ata-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/client/ClientFactory.java b/...ata-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/client/ClientFactory.java
@@ -82,8 +82,7 @@ private Client tryCreateClient(RetryContext retryContext) throws InterruptedExce
   }
 
   private InetSocketTransportAddress[] createInetTransportAddresses() {
-    return inetAddresses
-        .stream()
+    return inetAddresses.stream()
         .map(InetSocketTransportAddress::new)
         .toArray(InetSocketTransportAddress[]::new);
   }

diff --git a/...elasticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/QueryGenerator.java b/...elasticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/QueryGenerator.java
@@ -767,8 +767,7 @@ private QueryBuilder nestedQueryBuilder(
   }
 
   private String getQueryFieldName(List<Attribute> attributePath) {
-    return attributePath
-        .stream()
+    return attributePath.stream()
         .map(this::getQueryFieldName)
         .collect(joining(ATTRIBUTE_SEPARATOR));
   }

diff --git a/molgenis-data-excel/src/main/java/org/molgenis/data/excel/ExcelRepositoryCollection.java b/molgenis-data-excel/src/main/java/org/molgenis/data/excel/ExcelRepositoryCollection.java
@@ -110,8 +110,7 @@ public ExcelSheetWriter createWritable(
   public ExcelSheetWriter createWritable(String entityTypeId, List<String> attributeNames) {
     List<Attribute> attributes =
         attributeNames != null
-            ? attributeNames
-                .stream()
+            ? attributeNames.stream()
                 .map(attrName -> attributeFactory.create().setName(attrName))
                 .collect(Collectors.toList())
             : null;

diff --git a/molgenis-data-excel/src/main/java/org/molgenis/data/excel/ExcelWriter.java b/molgenis-data-excel/src/main/java/org/molgenis/data/excel/ExcelWriter.java
@@ -79,8 +79,7 @@ public void close() throws IOException {
   public ExcelSheetWriter createWritable(String entityTypeId, List<String> attributeNames) {
     List<Attribute> attributes =
         attributeNames != null
-            ? attributeNames
-                .stream()
+            ? attributeNames.stream()
                 .map(attrName -> attrMetaFactory.create().setName(attrName))
                 .collect(Collectors.toList())
             : null;