CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from querydsl/equals-contract

Browse Source 
Improve equals contract
This commit is contained in:
Timo Westkämper 2014-11-05 20:34:21 +02:00
commit 7331fc4489
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysema.codegen</groupId>
<artifactId>codegen</artifactId>
<version>0.6.4</version>
<version>0.6.5</version>
<name>Codegen</name>
<description>Code generation and compilation for Java</description>

15
src/main/java/com/mysema/codegen/model/TypeExtends.java
View File

@ -16,6 +16,7 @@ package com.mysema.codegen.model;
import java.util.Collections;
import java.util.Set;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
/**
@ -45,7 +46,7 @@ public class TypeExtends extends TypeAdapter {
@Override
public String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes) {
if (!asArgType) {
if (type.equals(Types.OBJECT)) {
if (Types.OBJECT.equals(type)) {
return "?";
} else {
String genericName = super.getGenericName(true, packages, classes);
@ -60,4 +61,16 @@ public class TypeExtends extends TypeAdapter {
return varName;
}
@Override
public boolean equals(Object o) {
if (o == this) {
return true;
} else if (o instanceof TypeExtends) {
return Objects.equal(((TypeExtends) o).varName, varName)
&& ((TypeExtends) o).type.equals(type);
} else {
return false;
}
}
}

14
src/main/java/com/mysema/codegen/model/TypeSuper.java
View File

@ -16,6 +16,8 @@ package com.mysema.codegen.model;
import java.util.Collections;
import java.util.Set;
import com.google.common.base.Objects;
/**
* TypeSuper is a Type for type variables and wildcard types
*
@ -63,4 +65,16 @@ public class TypeSuper extends TypeAdapter {
public String getVarName() {
return varName;
}
@Override
public boolean equals(Object o) {
if (o == this) {
return true;
} else if (o instanceof TypeSuper) {
return Objects.equal(((TypeSuper) o).varName, varName)
&& ((TypeSuper) o).superType.equals(superType);
} else {
return false;
}
}
}