Google Java Format

gbif · Jun 18, 2024 · 9774433 · 9774433
1 parent a4b0037
commit 9774433
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 67 deletions.
diff --git a/core/src/main/java/org/gbif/vocabulary/persistence/dto/ParentDto.java b/core/src/main/java/org/gbif/vocabulary/persistence/dto/ParentDto.java
@@ -1,9 +1,22 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.gbif.vocabulary.persistence.dto;
 
-import lombok.Data;
-
 import org.gbif.vocabulary.model.LanguageRegion;
 
+import lombok.Data;
+
 @Data
 public class ParentDto {
   long key;

diff --git a/core/src/main/java/org/gbif/vocabulary/persistence/dto/SuggestDto.java b/core/src/main/java/org/gbif/vocabulary/persistence/dto/SuggestDto.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.gbif.vocabulary.persistence.dto;
 
-import lombok.Data;
 import org.gbif.vocabulary.model.LanguageRegion;
 
 import java.util.List;
 
+import lombok.Data;
+
 @Data
 public class SuggestDto {
 

diff --git a/core/src/main/java/org/gbif/vocabulary/service/VocabularyService.java b/core/src/main/java/org/gbif/vocabulary/service/VocabularyService.java
@@ -17,7 +17,6 @@
 import org.gbif.api.model.common.paging.PagingResponse;
 import org.gbif.vocabulary.model.LanguageRegion;
 import org.gbif.vocabulary.model.Vocabulary;
-import org.gbif.vocabulary.model.search.KeyNameResult;
 import org.gbif.vocabulary.model.search.SuggestResult;
 import org.gbif.vocabulary.model.search.VocabularySearchParams;
 

diff --git a/core/src/main/java/org/gbif/vocabulary/service/impl/DefaultConceptService.java b/core/src/main/java/org/gbif/vocabulary/service/impl/DefaultConceptService.java
@@ -13,8 +13,6 @@
  */
 package org.gbif.vocabulary.service.impl;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import org.gbif.api.model.common.paging.Pageable;
 import org.gbif.api.model.common.paging.PagingRequest;
 import org.gbif.api.model.common.paging.PagingResponse;
@@ -31,23 +29,28 @@
 import org.gbif.vocabulary.persistence.mappers.ConceptMapper;
 import org.gbif.vocabulary.persistence.mappers.VocabularyMapper;
 import org.gbif.vocabulary.service.ConceptService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.annotation.Secured;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Nullable;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.groups.Default;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nullable;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.groups.Default;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 import static org.gbif.vocabulary.model.normalizers.StringNormalizer.*;

diff --git a/core/src/test/java/org/gbif/vocabulary/persistence/mappers/ConceptMapperTest.java b/core/src/test/java/org/gbif/vocabulary/persistence/mappers/ConceptMapperTest.java
@@ -226,12 +226,12 @@ public void suggestTest() {
         Label.builder().language(LanguageRegion.ENGLISH).value("Label").createdBy("test").build());
 
     conceptMapper.addLabel(
-            c2.getKey(),
-            Label.builder()
-                    .language(LanguageRegion.PORTUGUESE)
-                    .value("tílDE")
-                    .createdBy("test")
-                    .build());
+        c2.getKey(),
+        Label.builder()
+            .language(LanguageRegion.PORTUGUESE)
+            .value("tílDE")
+            .createdBy("test")
+            .build());
 
     // check result values
     List<SuggestDto> result =

diff --git a/core/src/test/java/org/gbif/vocabulary/persistence/mappers/VocabularyMapperTest.java b/core/src/test/java/org/gbif/vocabulary/persistence/mappers/VocabularyMapperTest.java
@@ -18,6 +18,12 @@
 import org.gbif.vocabulary.model.search.KeyNameResult;
 import org.gbif.vocabulary.model.search.VocabularySearchParams;
 import org.gbif.vocabulary.persistence.dto.SuggestDto;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.util.TestPropertyValues;
@@ -27,11 +33,6 @@
 import org.springframework.test.context.transaction.TestTransaction;
 import org.testcontainers.containers.PostgreSQLContainer;
 
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import static org.gbif.vocabulary.TestUtils.DEFAULT_PAGE;
 import static org.gbif.vocabulary.TestUtils.DEPRECATED_BY;
 import static org.gbif.vocabulary.model.normalizers.StringNormalizer.normalizeName;

diff --git a/model/src/main/java/org/gbif/vocabulary/model/search/SuggestResult.java b/model/src/main/java/org/gbif/vocabulary/model/search/SuggestResult.java
@@ -1,3 +1,16 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.gbif.vocabulary.model.search;
 
 import org.gbif.vocabulary.model.LanguageRegion;

diff --git a/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/documentation/Docs.java b/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/documentation/Docs.java
@@ -13,6 +13,11 @@
  */
 package org.gbif.vocabulary.restws.documentation;
 
+import org.gbif.api.documentation.CommonParameters;
+import org.gbif.vocabulary.model.LanguageRegion;
+
+import java.lang.annotation.*;
+
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.Explode;
@@ -21,10 +26,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import org.gbif.api.documentation.CommonParameters;
-import org.gbif.vocabulary.model.LanguageRegion;
-
-import java.lang.annotation.*;
 
 public class Docs {
 

diff --git a/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/ConceptResource.java b/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/ConceptResource.java
@@ -13,16 +13,6 @@
  */
 package org.gbif.vocabulary.restws.resources;
 
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.Explode;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.extensions.Extension;
-import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import org.assertj.core.util.Strings;
 import org.gbif.api.documentation.CommonParameters;
 import org.gbif.api.model.common.paging.Pageable;
 import org.gbif.api.model.common.paging.PagingResponse;
@@ -41,8 +31,6 @@
 import org.gbif.vocabulary.service.ConceptService;
 import org.gbif.vocabulary.service.TagService;
 import org.gbif.vocabulary.service.VocabularyService;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.function.Function;
@@ -51,6 +39,20 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.assertj.core.util.Strings;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.Explode;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.extensions.Extension;
+import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.gbif.vocabulary.restws.resources.LatestReleaseCache.conceptSuggestLatestReleaseCache;
 import static org.gbif.vocabulary.restws.utils.Constants.*;

diff --git a/...bulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/LatestReleaseCache.java b/...bulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/LatestReleaseCache.java
@@ -1,14 +1,29 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.gbif.vocabulary.restws.resources;
 
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.cache2k.Cache;
-import org.cache2k.Cache2kBuilder;
 import org.gbif.vocabulary.model.search.SuggestResult;
 
 import java.util.List;
 import java.util.Map;
 
+import org.cache2k.Cache;
+import org.cache2k.Cache2kBuilder;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 class LatestReleaseCache {
 

diff --git a/...bulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/VocabularyResource.java b/...bulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/VocabularyResource.java
@@ -13,18 +13,6 @@
  */
 package org.gbif.vocabulary.restws.resources;
 
-import io.swagger.v3.oas.annotations.*;
-import io.swagger.v3.oas.annotations.enums.Explode;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.extensions.Extension;
-import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
-import io.swagger.v3.oas.annotations.info.Info;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.servers.Server;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
 import org.gbif.api.documentation.CommonParameters;
 import org.gbif.api.model.common.paging.Pageable;
 import org.gbif.api.model.common.paging.PagingRequest;
@@ -44,6 +32,15 @@
 import org.gbif.vocabulary.service.ExportService;
 import org.gbif.vocabulary.service.VocabularyService;
 import org.gbif.vocabulary.tools.VocabularyDownloader;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
@@ -54,12 +51,18 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import io.swagger.v3.oas.annotations.*;
+import io.swagger.v3.oas.annotations.enums.Explode;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.extensions.Extension;
+import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
+import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.servers.Server;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.gbif.vocabulary.restws.utils.Constants.VOCABULARIES_PATH;

diff --git a/...ary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/mock/BaseResourceTest.java b/...ary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/mock/BaseResourceTest.java
@@ -18,12 +18,11 @@
 import org.gbif.vocabulary.model.Vocabulary;
 import org.gbif.vocabulary.model.VocabularyEntity;
 import org.gbif.vocabulary.model.search.KeyNameResult;
+import org.gbif.vocabulary.model.search.SuggestResult;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.gbif.vocabulary.model.search.SuggestResult;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;