Merge pull request #314 from domaframework/google-java-format-1.7

Upgrade google-java-format to 1.7

Author: nakamura-to

build.gradle

@@ -17,7 +17,7 @@ ext {
 
 spotless {
     java {
-        googleJavaFormat('1.6')
+        googleJavaFormat('1.7')
     }
 }
 

src/main/java/org/seasar/doma/internal/apt/annot/DaoAnnot.java

@@ -28,10 +28,7 @@ public class DaoAnnot extends AbstractAnnot {
     this.config = assertNonNullValue(values, CONFIG);
     this.accessLevel = assertNonNullValue(values, ACCESS_LEVEL);
     this.hasUserDefinedConfig =
-        annotationMirror
-            .getElementValues()
-            .keySet()
-            .stream()
+        annotationMirror.getElementValues().keySet().stream()
             .anyMatch(e -> e.getSimpleName().contentEquals(CONFIG));
   }
 

src/main/java/org/seasar/doma/internal/apt/cttype/CtTypes.java

@@ -193,9 +193,7 @@ public DomainCtType newDomainCtType(TypeMirror type) {
     }
     Iterator<? extends TypeMirror> typeArgs = declaredType.getTypeArguments().iterator();
     List<CtType> typeArgCtTypes =
-        typeElement
-            .getTypeParameters()
-            .stream()
+        typeElement.getTypeParameters().stream()
             .map(__ -> typeArgs.hasNext() ? newCtType(typeArgs.next()) : newNoneCtType())
             .collect(toList());
     Name binaryName = ctx.getMoreElements().getBinaryName(typeElement);
@@ -523,8 +521,7 @@ private CtType newCtTypeInternal(
             this::newResultCtType,
             this::newBatchResultCtType);
     CtType ctType =
-        functions
-            .stream()
+        functions.stream()
             .map(f -> f.apply(type))
             .filter(Objects::nonNull)
             .findFirst()

src/main/java/org/seasar/doma/internal/apt/decl/TypeDeclaration.java

@@ -177,8 +177,7 @@ public Optional<ConstructorDeclaration> getConstructorDeclaration(
     if (typeElement == null) {
       return Optional.empty();
     }
-    return constructorsIn(typeElement.getEnclosedElements())
-        .stream()
+    return constructorsIn(typeElement.getEnclosedElements()).stream()
         .filter(c -> c.getModifiers().contains(Modifier.PUBLIC))
         .filter(c -> c.getParameters().size() == parameterTypeDeclarations.size())
         .filter(c -> isAssignable(parameterTypeDeclarations, c.getParameters()))
@@ -201,16 +200,13 @@ private Optional<FieldDeclaration> getFieldDeclarationInternal(String name, bool
   }
 
   private List<FieldDeclaration> getCandidateFieldDeclarations(String name, boolean statik) {
-    return typeParameterDeclarationsMap
-        .entrySet()
-        .stream()
+    return typeParameterDeclarationsMap.entrySet().stream()
         .map(e -> new Pair<>(e.getKey(), e.getValue()))
         .map(p -> new Pair<>(ctx.getMoreElements().getTypeElement(p.fst), p.snd))
         .filter(p -> Objects.nonNull(p.fst))
         .flatMap(
             p ->
-                fieldsIn(p.fst.getEnclosedElements())
-                    .stream()
+                fieldsIn(p.fst.getEnclosedElements()).stream()
                     .filter(f -> !statik || f.getModifiers().contains(Modifier.STATIC))
                     .filter(f -> f.getSimpleName().contentEquals(name))
                     .map(f -> ctx.getDeclarations().newFieldDeclaration(f, p.snd)))
@@ -251,16 +247,13 @@ private Optional<MethodDeclaration> getMethodDeclarationInternal(
 
   private List<MethodDeclaration> getCandidateMethodDeclarations(
       String name, List<TypeDeclaration> parameterTypeDeclarations, boolean statik) {
-    return typeParameterDeclarationsMap
-        .entrySet()
-        .stream()
+    return typeParameterDeclarationsMap.entrySet().stream()
         .map(e -> new Pair<>(e.getKey(), e.getValue()))
         .map(p -> new Pair<>(ctx.getMoreElements().getTypeElement(p.fst), p.snd))
         .filter(p -> Objects.nonNull(p.fst))
         .flatMap(
             p ->
-                methodsIn(p.fst.getEnclosedElements())
-                    .stream()
+                methodsIn(p.fst.getEnclosedElements()).stream()
                     .filter(m -> !statik || m.getModifiers().contains(Modifier.STATIC))
                     .filter(m -> m.getModifiers().contains(Modifier.PUBLIC))
                     .filter(m -> m.getSimpleName().contentEquals(name))

src/main/java/org/seasar/doma/internal/apt/def/TypeParametersDef.java

@@ -22,9 +22,7 @@ public TypeParametersDef(Map<TypeParameterElement, String> typeParameterNameMap)
   }
 
   public List<String> getTypeVariables() {
-    return typeParameterNameMap
-        .keySet()
-        .stream()
+    return typeParameterNameMap.keySet().stream()
         .map(Element::getSimpleName)
         .map(Name::toString)
         .collect(collectingAndThen(toList(), Collections::unmodifiableList));

src/main/java/org/seasar/doma/internal/apt/meta/dao/DaoMetaFactory.java

@@ -155,8 +155,7 @@ private void validateUserDefinedConfig(
       ExecutableElement constructor = ctx.getMoreElements().getNoArgConstructor(configElement);
       if (constructor == null || !constructor.getModifiers().contains(Modifier.PUBLIC)) {
         Optional<VariableElement> field =
-            ElementFilter.fieldsIn(configElement.getEnclosedElements())
-                .stream()
+            ElementFilter.fieldsIn(configElement.getEnclosedElements()).stream()
                 .filter(e -> e.getSimpleName().contentEquals(SINGLETON_CONFIG_FIELD_NAME))
                 .filter(
                     e ->
@@ -179,8 +178,7 @@ private void validateUserDefinedConfig(
     } else {
       String methodName = singletonConfig.method();
       boolean present =
-          ElementFilter.methodsIn(configElement.getEnclosedElements())
-              .stream()
+          ElementFilter.methodsIn(configElement.getEnclosedElements()).stream()
               .filter(
                   m -> m.getModifiers().containsAll(EnumSet.of(Modifier.STATIC, Modifier.PUBLIC)))
               .filter(
@@ -224,10 +222,7 @@ private void doAnnotateWith(DaoMeta daoMeta) {
 
   private void doParentDao(DaoMeta daoMeta) {
     List<TypeElement> interfaces =
-        daoMeta
-            .getTypeElement()
-            .getInterfaces()
-            .stream()
+        daoMeta.getTypeElement().getInterfaces().stream()
             .map(type -> ctx.getMoreTypes().toTypeElement(type))
             .peek(
                 element -> {
@@ -258,8 +253,7 @@ private void doParentDao(DaoMeta daoMeta) {
 
   private ExecutableElement findNonDefaultMethod(TypeElement interfaceElement) {
     Optional<ExecutableElement> method =
-        ElementFilter.methodsIn(interfaceElement.getEnclosedElements())
-            .stream()
+        ElementFilter.methodsIn(interfaceElement.getEnclosedElements()).stream()
             .filter(m -> !m.isDefault())
             .findAny();
     if (method.isPresent()) {

src/main/java/org/seasar/doma/internal/apt/meta/domain/DomainMetaFactory.java

@@ -386,8 +386,7 @@ String inferAccessorMethod(VariableElement field) {
 
     VariableElement findSingleField(TypeElement classElement, DomainMeta domainMeta) {
       List<VariableElement> fields =
-          ElementFilter.fieldsIn(classElement.getEnclosedElements())
-              .stream()
+          ElementFilter.fieldsIn(classElement.getEnclosedElements()).stream()
               .filter(field -> !field.getModifiers().contains(Modifier.STATIC))
               .collect(Collectors.toList());
       if (fields.size() == 0) {

src/main/java/org/seasar/doma/internal/apt/processor/SingletonConfigProcessor.java

@@ -57,8 +57,7 @@ protected void validateClass(TypeElement typeElement, SingletonConfigAnnot mirro
   }
 
   protected void validateConstructors(TypeElement typeElement) {
-    ElementFilter.constructorsIn(typeElement.getEnclosedElements())
-        .stream()
+    ElementFilter.constructorsIn(typeElement.getEnclosedElements()).stream()
         .filter(c -> !c.getModifiers().contains(Modifier.PRIVATE))
         .findAny()
         .ifPresent(
@@ -69,8 +68,7 @@ protected void validateConstructors(TypeElement typeElement) {
 
   protected void validateMethod(TypeElement typeElement, String methodName) {
     Optional<ExecutableElement> method =
-        ElementFilter.methodsIn(typeElement.getEnclosedElements())
-            .stream()
+        ElementFilter.methodsIn(typeElement.getEnclosedElements()).stream()
             .filter(m -> m.getModifiers().containsAll(EnumSet.of(Modifier.STATIC, Modifier.PUBLIC)))
             .filter(
                 m -> ctx.getMoreTypes().isAssignableWithErasure(m.getReturnType(), Config.class))

src/main/java/org/seasar/doma/internal/apt/validator/ExpressionValidator.java

@@ -598,9 +598,7 @@ public TypeDeclaration visitStaticFieldOperatorNode(StaticFieldOperatorNode node
   private TypeDeclaration convertIfOptional(TypeDeclaration typeDeclaration) {
     if (typeDeclaration.is(Optional.class)) {
       TypeParameterDeclaration typeParameterDeclaration =
-          typeDeclaration
-              .getTypeParameterDeclarations()
-              .stream()
+          typeDeclaration.getTypeParameterDeclarations().stream()
               .findFirst()
               .orElseThrow(() -> new AptIllegalStateException(typeDeclaration.toString()));
       return ctx.getDeclarations().newTypeDeclaration(typeParameterDeclaration.getActualType());

src/main/java/org/seasar/doma/internal/apt/validator/SqlValidator.java

@@ -75,9 +75,7 @@ public void validate(SqlNode sqlNode) {
       sqlNode.accept(this, null);
       Set<String> unreferredName = new HashSet<>(parameterTypeMap.keySet());
       unreferredName.removeAll(expressionValidator.getValidatedParameterNames());
-      methodElement
-          .getParameters()
-          .stream()
+      methodElement.getParameters().stream()
           .filter(e -> unreferredName.contains(e.getSimpleName().toString()))
           .forEach(this::reportUnreferredParameter);
     } catch (AptException e) {