Compare commits

...

3 Commits

Author SHA1 Message Date
randgalt
19017e6693 [maven-release-plugin] prepare release record-builder-1.3.ea 2019-12-20 13:48:43 -05:00
randgalt
6d36b86c68 Added hashCode and equals implementations to the builder 2019-12-20 13:45:31 -05:00
randgalt
417ce0e139 [maven-release-plugin] prepare for next development iteration 2019-12-17 18:30:28 -05:00
6 changed files with 83 additions and 5 deletions

View File

@@ -84,6 +84,18 @@ public class NameAndAgeBuilder {
public String toString() {
return "NameAndAgeBuilder[name=" + name + ", age=" + age + "]";
}
@Override
public int hashCode() {
return Objects.hash(name, age);
}
@Override
public boolean equals(Object o) {
return (this == o) || ((o instanceof NameAndAgeBuilder b)
&& Objects.equals(name, b.name)
&& (age == b.age));
}
}
```

View File

@@ -5,7 +5,7 @@
<groupId>io.soabase.record-builder</groupId>
<artifactId>record-builder</artifactId>
<packaging>pom</packaging>
<version>1.2.ea</version>
<version>1.3.ea</version>
<modules>
<module>record-builder-core</module>
@@ -70,7 +70,7 @@
<url>https://github.com/randgalt/record-builder</url>
<connection>scm:git:https://github.com/randgalt/record-builder.git</connection>
<developerConnection>scm:git:git@github.com:randgalt/record-builder.git</developerConnection>
<tag>record-builder-1.2.ea</tag>
<tag>record-builder-1.3.ea</tag>
</scm>
<issueManagement>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>io.soabase.record-builder</groupId>
<artifactId>record-builder</artifactId>
<version>1.2.ea</version>
<version>1.3.ea</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>io.soabase.record-builder</groupId>
<artifactId>record-builder</artifactId>
<version>1.2.ea</version>
<version>1.3.ea</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -29,6 +29,7 @@ import javax.tools.JavaFileObject;
import java.io.IOException;
import java.io.Writer;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -68,6 +69,8 @@ public class RecordBuilderProcessor extends AbstractProcessor {
addStaticCopyMethod(builder, builderClassType, recordClassType, recordComponents, typeVariables, metaData);
addBuildMethod(builder, recordClassType, recordComponents, metaData);
addToStringMethod(builder, builderClassType, recordComponents);
addHashCodeMethod(builder, recordComponents);
addEqualsMethod(builder, builderClassType, recordComponents);
recordComponents.forEach(component -> {
add1Field(builder, component);
add1SetterMethod(builder, component, builderClassType);
@@ -124,6 +127,7 @@ public class RecordBuilderProcessor extends AbstractProcessor {
/*
add a toString() method similar to:
@Override
public String toString() {
return "MyRecord[p1=blah, p2=blah]";
}
@@ -147,6 +151,68 @@ public class RecordBuilderProcessor extends AbstractProcessor {
builder.addMethod(methodSpec);
}
private void addHashCodeMethod(TypeSpec.Builder builder, List<ClassType> recordComponents) {
/*
add an hashCode() method similar to:
@Override
public int hashCode() {
return Objects.hash(p1, p2);
}
*/
var codeBuilder = CodeBlock.builder().add("return $T.hash(", Objects.class);
IntStream.range(0, recordComponents.size()).forEach(index -> {
if (index > 0) {
codeBuilder.add(", ");
}
codeBuilder.add("$L", recordComponents.get(index).name());
});
codeBuilder.add(")");
var methodSpec = MethodSpec.methodBuilder("hashCode")
.addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class)
.returns(TypeName.INT)
.addStatement(codeBuilder.build())
.build();
builder.addMethod(methodSpec);
}
private void addEqualsMethod(TypeSpec.Builder builder, ClassType builderClassType, List<ClassType> recordComponents) {
/*
add an equals() method similar to:
@Override
public boolean equals(Object o) {
if (this == o) return true;
return (o instanceof MyRecordBuilder b)
&& Objects.equals(p1, b.p1)
&& Objects.equals(p2, b.p2);
}
*/
var codeBuilder = CodeBlock.builder();
codeBuilder.add("return (this == o) || (");
codeBuilder.add("(o instanceof $L b)", builderClassType.name());
recordComponents.forEach(recordComponent -> {
String name = recordComponent.name();
if (recordComponent.typeName().isPrimitive()) {
codeBuilder.add("\n&& ($L == b.$L)", name, name);
} else {
codeBuilder.add("\n&& $T.equals($L, b.$L)", Objects.class, name, name);
}
});
codeBuilder.add(")");
var methodSpec = MethodSpec.methodBuilder("equals")
.addParameter(Object.class, "o")
.addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class)
.returns(TypeName.BOOLEAN)
.addStatement(codeBuilder.build())
.build();
builder.addMethod(methodSpec);
}
private void addBuildMethod(TypeSpec.Builder builder, ClassType recordClassType, List<ClassType> recordComponents, RecordBuilderMetaData metaData) {
/*
Adds the build method that generates the record similar to:

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>io.soabase.record-builder</groupId>
<artifactId>record-builder</artifactId>
<version>1.2.ea</version>
<version>1.3.ea</version>
</parent>
<modelVersion>4.0.0</modelVersion>