third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#1215 Add import correctly for array types

Browse Source
This commit is contained in:
Filip Hrisafov 2017-05-30 21:35:39 +02:00 committed by GitHub
parent 6187a72a2b
commit ceaa869c65
10 changed files with 265 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
processor/src/main/java/org/mapstruct/ap/internal/model/GeneratedType.java
View File

@ -199,6 +199,14 @@ public abstract class GeneratedType extends ModelElement {
return importedTypes;
}
public SortedSet<String> getImportTypeNames() {
SortedSet<String> importTypeNames = new TreeSet<String>();
for ( Type type : getImportTypes() ) {
importTypeNames.add( type.getImportName() );
}
return importTypeNames;
}
public Constructor getConstructor() {
return constructor;
}
@ -222,7 +230,7 @@ public abstract class GeneratedType extends ModelElement {
return false;
}
if ( typeToAdd.getTypeMirror().getKind() != TypeKind.DECLARED ) {
if ( typeToAdd.getTypeMirror().getKind() != TypeKind.DECLARED && !typeToAdd.isArrayType() ) {
return false;
}

2
processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
View File

@ -290,7 +290,7 @@ public class Type extends ModelElement implements Comparable<Type> {
* @return The name of this type as to be used within import statements.
*/
public String getImportName() {
return isArrayType() ? qualifiedName.substring( 0, qualifiedName.length() - 2 ) : qualifiedName;
return isArrayType() ? TypeFactory.trimSimpleClassName( qualifiedName ) : qualifiedName;
}
@Override

20
processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
View File

@ -175,6 +175,7 @@ public class TypeFactory {
String qualifiedName;
TypeElement typeElement;
Type componentType;
boolean isImported;
if ( mirror.getKind() == TypeKind.DECLARED ) {
DeclaredType declaredType = (DeclaredType) mirror;
@ -195,28 +196,38 @@ public class TypeFactory {
}
componentType = null;
isImported = isImported( name, qualifiedName );
}
else if ( mirror.getKind() == TypeKind.ARRAY ) {
TypeMirror componentTypeMirror = getComponentType( mirror );
StringBuilder builder = new StringBuilder("[]");
while ( componentTypeMirror.getKind() == TypeKind.ARRAY ) {
componentTypeMirror = getComponentType( componentTypeMirror );
builder.append( "[]" );
}
if ( componentTypeMirror.getKind() == TypeKind.DECLARED ) {
DeclaredType declaredType = (DeclaredType) componentTypeMirror;
TypeElement componentTypeElement = (TypeElement) declaredType.asElement();
name = componentTypeElement.getSimpleName().toString() + "[]";
String arraySuffix = builder.toString();
name = componentTypeElement.getSimpleName().toString() + arraySuffix;
packageName = elementUtils.getPackageOf( componentTypeElement ).getQualifiedName().toString();
qualifiedName = componentTypeElement.getQualifiedName().toString() + "[]";
qualifiedName = componentTypeElement.getQualifiedName().toString() + arraySuffix;
isImported = isImported( name, qualifiedName );
}
else {
name = mirror.toString();
packageName = null;
qualifiedName = name;
isImported = false;
}
isEnumType = false;
isInterface = false;
typeElement = null;
componentType = getType( componentTypeMirror );
componentType = getType( getComponentType( mirror ) );
}
else {
isEnumType = false;
@ -226,6 +237,7 @@ public class TypeFactory {
qualifiedName = name;
typeElement = null;
componentType = null;
isImported = false;
}
return new Type(
@ -244,7 +256,7 @@ public class TypeFactory {
isCollectionType,
isMapType,
isStreamType,
isImported( name, qualifiedName )
isImported
);
}

4
processor/src/main/resources/org/mapstruct/ap/internal/model/GeneratedType.ftl
View File

@ -23,8 +23,8 @@
package ${packageName};
</#if>
<#list importTypes as importedType>
import ${importedType.importName};
<#list importTypeNames as importedType>
import ${importedType};
</#list>
<#if !generatedTypeAvailable>/*</#if>

49
processor/src/test/java/org/mapstruct/ap/test/bugs/_1215/Issue1215Test.java Normal file
View File

@ -0,0 +1,49 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* 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.mapstruct.ap.test.bugs._1215;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.test.bugs._1215.dto.EntityDTO;
import org.mapstruct.ap.test.bugs._1215.entity.AnotherTag;
import org.mapstruct.ap.test.bugs._1215.entity.Entity;
import org.mapstruct.ap.test.bugs._1215.entity.Tag;
import org.mapstruct.ap.test.bugs._1215.mapper.Issue1215Mapper;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
/**
* @author Filip Hrisafov
*/
@WithClasses( {
EntityDTO.class,
Entity.class,
Tag.class,
AnotherTag.class,
Issue1215Mapper.class
} )
@IssueKey( "1215" )
@RunWith( AnnotationProcessorTestRunner.class )
public class Issue1215Test {
@Test
public void shouldCompile() {
}
}

46
processor/src/test/java/org/mapstruct/ap/test/bugs/_1215/dto/EntityDTO.java Normal file
View File

@ -0,0 +1,46 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* 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.mapstruct.ap.test.bugs._1215.dto;
import org.mapstruct.ap.test.bugs._1215.entity.AnotherTag;
import org.mapstruct.ap.test.bugs._1215.entity.Tag;
/**
* @author Filip Hrisafov
*/
public class EntityDTO {
private Tag[] tags;
private AnotherTag[][] otherTags;
public Tag[] getTags() {
return tags;
}
public void setTags(Tag[] tags) {
this.tags = tags;
}
public AnotherTag[][] getOtherTags() {
return otherTags;
}
public void setOtherTags(AnotherTag[][] otherTags) {
this.otherTags = otherTags;
}
}

34
processor/src/test/java/org/mapstruct/ap/test/bugs/_1215/entity/AnotherTag.java Normal file
View File

@ -0,0 +1,34 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* 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.mapstruct.ap.test.bugs._1215.entity;
/**
* @author Filip Hrisafov
*/
public class AnotherTag {
private String name;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

43
processor/src/test/java/org/mapstruct/ap/test/bugs/_1215/entity/Entity.java Normal file
View File

@ -0,0 +1,43 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* 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.mapstruct.ap.test.bugs._1215.entity;
/**
* @author Filip Hrisafov
*/
public class Entity {
private Tag[] tags;
private AnotherTag[][] otherTags;
public Tag[] getTags() {
return tags;
}
public void setTags(Tag[] tags) {
this.tags = tags;
}
public AnotherTag[][] getOtherTags() {
return otherTags;
}
public void setOtherTags(AnotherTag[][] otherTags) {
this.otherTags = otherTags;
}
}

34
processor/src/test/java/org/mapstruct/ap/test/bugs/_1215/entity/Tag.java Normal file
View File

@ -0,0 +1,34 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* 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.mapstruct.ap.test.bugs._1215.entity;
/**
* @author Filip Hrisafov
*/
public class Tag {
private String name;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

31
processor/src/test/java/org/mapstruct/ap/test/bugs/_1215/mapper/Issue1215Mapper.java Normal file
View File

@ -0,0 +1,31 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* 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.mapstruct.ap.test.bugs._1215.mapper;
import org.mapstruct.Mapper;
import org.mapstruct.ap.test.bugs._1215.dto.EntityDTO;
import org.mapstruct.ap.test.bugs._1215.entity.Entity;
/**
* @author Filip Hrisafov
*/
@Mapper
public interface Issue1215Mapper {
Entity fromDTO(EntityDTO dto);
}