lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Optimized equals.

Browse Source 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2016-04-06 10:57:23 +02:00
parent d8268e8b6b
commit f4f9c10186
3 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetMetadata.java
View File

@@ -34,16 +34,9 @@ public class DistributionSetMetadata extends MetaData {
private DistributionSet distributionSet; private DistributionSet distributionSet;
public DistributionSetMetadata() { public DistributionSetMetadata() {
super(); // default public constructor for JPA
} }
/**
* Parameter constructor.
*
* @param key
* @param distributionSet
* @param value
*/
public DistributionSetMetadata(final String key, final DistributionSet distributionSet, final String value) { public DistributionSetMetadata(final String key, final DistributionSet distributionSet, final String value) {
super(key, value); super(key, value);
this.distributionSet = distributionSet; this.distributionSet = distributionSet;
@@ -71,15 +64,9 @@ public class DistributionSetMetadata extends MetaData {
@Override @Override
public boolean equals(final Object obj) { public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }
if (!(obj instanceof DistributionSetMetadata)) {
return false;
}
final DistributionSetMetadata other = (DistributionSetMetadata) obj; final DistributionSetMetadata other = (DistributionSetMetadata) obj;
if (distributionSet == null) { if (distributionSet == null) {
if (other.distributionSet != null) { if (other.distributionSet != null) {

2
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/MetaData.java
View File

@@ -74,7 +74,7 @@ public abstract class MetaData implements Serializable {
if (obj == null) { if (obj == null) {
return false; return false;
} }
if (!(obj instanceof MetaData)) { if (!(this.getClass().isInstance(obj))) {
return false; return false;
} }
final MetaData other = (MetaData) obj; final MetaData other = (MetaData) obj;

20
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleMetadata.java
View File

@@ -33,22 +33,10 @@ public class SoftwareModuleMetadata extends MetaData {
@JoinColumn(name = "sw_id", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_metadata_sw")) @JoinColumn(name = "sw_id", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_metadata_sw"))
private SoftwareModule softwareModule; private SoftwareModule softwareModule;
/**
* Default constructor for JPA.
*/
public SoftwareModuleMetadata() { public SoftwareModuleMetadata() {
super(); // default public constructor for JPA
} }
/**
* Standard constructor.
*
* @param key
* of the meta data element
* @param softwareModule
* @param value
* of the meta data element
*/
public SoftwareModuleMetadata(final String key, final SoftwareModule softwareModule, final String value) { public SoftwareModuleMetadata(final String key, final SoftwareModule softwareModule, final String value) {
super(key, value); super(key, value);
this.softwareModule = softwareModule; this.softwareModule = softwareModule;
@@ -76,15 +64,9 @@ public class SoftwareModuleMetadata extends MetaData {
@Override @Override
public boolean equals(final Object obj) { public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }
if (!(obj instanceof SoftwareModuleMetadata)) {
return false;
}
final SoftwareModuleMetadata other = (SoftwareModuleMetadata) obj; final SoftwareModuleMetadata other = (SoftwareModuleMetadata) obj;
if (softwareModule == null) { if (softwareModule == null) {
if (other.softwareModule != null) { if (other.softwareModule != null) {