Found even more code that could be deleted

This commit is contained in:
Kai Zimmermann
2016-03-30 09:03:09 +02:00
parent f002eede43
commit 292ca31768
27 changed files with 2 additions and 171 deletions

View File

@@ -264,9 +264,6 @@ public class Action extends TenantAwareBaseEntity implements Comparable<Action>
@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;
} }

View File

@@ -150,9 +150,6 @@ public class ActionStatus extends TenantAwareBaseEntity {
@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;
} }

View File

@@ -86,93 +86,54 @@ public class ActionWithStatusCount {
action.setId(actionId); action.setId(actionId);
} }
/**
* @return the action
*/
public Action getAction() { public Action getAction() {
return action; return action;
} }
/**
* @return the actionId
*/
public Long getActionId() { public Long getActionId() {
return actionId; return actionId;
} }
/**
* @return the actionType
*/
public ActionType getActionType() { public ActionType getActionType() {
return actionType; return actionType;
} }
/**
* @return the actionActive
*/
public boolean isActionActive() { public boolean isActionActive() {
return actionActive; return actionActive;
} }
/**
* @return the actionForceTime
*/
public long getActionForceTime() { public long getActionForceTime() {
return actionForceTime; return actionForceTime;
} }
/**
* @return the actionStatus
*/
public Status getActionStatus() { public Status getActionStatus() {
return actionStatus; return actionStatus;
} }
/**
* @return the actionCreatedAt
*/
public Long getActionCreatedAt() { public Long getActionCreatedAt() {
return actionCreatedAt; return actionCreatedAt;
} }
/**
* @return the actionLastModifiedAt
*/
public Long getActionLastModifiedAt() { public Long getActionLastModifiedAt() {
return actionLastModifiedAt; return actionLastModifiedAt;
} }
/**
* @return the dsId
*/
public Long getDsId() { public Long getDsId() {
return dsId; return dsId;
} }
/**
* @return the dsName
*/
public String getDsName() { public String getDsName() {
return dsName; return dsName;
} }
/**
* @return the dsVersion
*/
public String getDsVersion() { public String getDsVersion() {
return dsVersion; return dsVersion;
} }
/**
* @return the actionStatusCount
*/
public Long getActionStatusCount() { public Long getActionStatusCount() {
return actionStatusCount; return actionStatusCount;
} }
/**
* @return the rolloutName
*/
public String getRolloutName() { public String getRolloutName() {
return rolloutName; return rolloutName;
} }

View File

@@ -64,9 +64,6 @@ public abstract class Artifact extends TenantAwareBaseEntity {
@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;
} }

View File

@@ -154,7 +154,7 @@ public abstract class BaseEntity implements Serializable, Identifiable<Long> {
if (obj == null) { if (obj == null) {
return false; return false;
} }
if (getClass() != obj.getClass()) { if (!(obj instanceof BaseEntity)) {
return false; return false;
} }
final BaseEntity other = (BaseEntity) obj; final BaseEntity other = (BaseEntity) obj;

View File

@@ -135,23 +135,14 @@ public class DistributionSet extends NamedVersionedEntity {
return tags; return tags;
} }
/**
* @return the deleted
*/
public boolean isDeleted() { public boolean isDeleted() {
return deleted; return deleted;
} }
/**
* @return the metadata
*/
public List<DistributionSetMetadata> getMetadata() { public List<DistributionSetMetadata> getMetadata() {
return metadata; return metadata;
} }
/**
* @return the actions
*/
public List<Action> getActions() { public List<Action> getActions() {
return actions; return actions;
} }
@@ -166,9 +157,6 @@ public class DistributionSet extends NamedVersionedEntity {
@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;
} }

View File

@@ -74,9 +74,6 @@ public class DistributionSetTag extends Tag {
@Override @Override
public boolean equals(final Object obj) { // NOSONAR - as this is generated public boolean equals(final Object obj) { // NOSONAR - as this is generated
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }

View File

@@ -295,9 +295,6 @@ public class DistributionSetType extends NamedEntity {
@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;
} }

View File

@@ -71,30 +71,18 @@ public class DistributionSetTypeElement implements Serializable {
this.mandatory = mandatory; this.mandatory = mandatory;
} }
/**
* @return the mandatory
*/
public boolean isMandatory() { public boolean isMandatory() {
return mandatory; return mandatory;
} }
/**
* @return the dsType
*/
public DistributionSetType getDsType() { public DistributionSetType getDsType() {
return dsType; return dsType;
} }
/**
* @return the smType
*/
public SoftwareModuleType getSmType() { public SoftwareModuleType getSmType() {
return smType; return smType;
} }
/**
* @return the key
*/
public DistributionSetTypeElementCompositeKey getKey() { public DistributionSetTypeElementCompositeKey getKey() {
return key; return key;
} }

View File

@@ -81,18 +81,11 @@ public class ExternalArtifact extends Artifact {
return softwareModule; return softwareModule;
} }
/**
* @param softwareModule
* the softwareModule to set
*/
public final void setSoftwareModule(final SoftwareModule softwareModule) { public final void setSoftwareModule(final SoftwareModule softwareModule) {
this.softwareModule = softwareModule; this.softwareModule = softwareModule;
this.softwareModule.addArtifact(this); this.softwareModule.addArtifact(this);
} }
/**
* @return the externalArtifactProvider
*/
public ExternalArtifactProvider getExternalArtifactProvider() { public ExternalArtifactProvider getExternalArtifactProvider() {
return externalArtifactProvider; return externalArtifactProvider;
} }
@@ -101,17 +94,10 @@ public class ExternalArtifact extends Artifact {
return new StringBuilder().append(externalArtifactProvider.getBasePath()).append(urlSuffix).toString(); return new StringBuilder().append(externalArtifactProvider.getBasePath()).append(urlSuffix).toString();
} }
/**
* @return the urlSuffix
*/
public String getUrlSuffix() { public String getUrlSuffix() {
return urlSuffix; return urlSuffix;
} }
/**
* @param externalArtifactProvider
* the externalArtifactProvider to set
*/
public void setExternalArtifactProvider(final ExternalArtifactProvider externalArtifactProvider) { public void setExternalArtifactProvider(final ExternalArtifactProvider externalArtifactProvider) {
this.externalArtifactProvider = externalArtifactProvider; this.externalArtifactProvider = externalArtifactProvider;
} }
@@ -134,9 +120,6 @@ public class ExternalArtifact extends Artifact {
@Override @Override
public boolean equals(final Object obj) { // NOSONAR - as this is generated public boolean equals(final Object obj) { // NOSONAR - as this is generated
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }

View File

@@ -83,9 +83,6 @@ public class ExternalArtifactProvider extends NamedEntity {
@Override @Override
public boolean equals(final Object obj) { // NOSONAR - as this is generated public boolean equals(final Object obj) { // NOSONAR - as this is generated
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }

View File

@@ -83,9 +83,6 @@ public class LocalArtifact extends Artifact {
@Override @Override
public boolean equals(final Object obj) { // NOSONAR - as this is generated public boolean equals(final Object obj) { // NOSONAR - as this is generated
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }

View File

@@ -71,9 +71,6 @@ public abstract class NamedEntity extends TenantAwareBaseEntity {
@Override @Override
public boolean equals(final Object obj) { // NOSONAR - as this is generated public boolean equals(final Object obj) { // NOSONAR - as this is generated
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }

View File

@@ -58,9 +58,6 @@ public abstract class NamedVersionedEntity extends NamedEntity {
@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;
} }

View File

@@ -242,9 +242,6 @@ public class Rollout extends NamedEntity {
@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;
} }

View File

@@ -487,9 +487,6 @@ public class RolloutGroup extends NamedEntity {
@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;
} }

View File

@@ -13,13 +13,8 @@ import java.io.Serializable;
/** /**
* Combined unique key of the table {@link RolloutTargetGroup}. * Combined unique key of the table {@link RolloutTargetGroup}.
* *
* @author Michael Hirsch
*
*/ */
public class RolloutTargetGroupId implements Serializable { public class RolloutTargetGroupId implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Long rolloutGroup; private Long rolloutGroup;

View File

@@ -208,17 +208,10 @@ public class SoftwareModule extends NamedVersionedEntity {
return type; return type;
} }
/**
* @return the deleted
*/
public boolean isDeleted() { public boolean isDeleted() {
return deleted; return deleted;
} }
/**
* @param deleted
* the deleted to set
*/
public void setDeleted(final boolean deleted) { public void setDeleted(final boolean deleted) {
this.deleted = deleted; this.deleted = deleted;
} }
@@ -227,9 +220,6 @@ public class SoftwareModule extends NamedVersionedEntity {
this.type = type; this.type = type;
} }
/**
* @return the metadata
*/
public List<SoftwareModuleMetadata> getMetadata() { public List<SoftwareModuleMetadata> getMetadata() {
return metadata; return metadata;
} }
@@ -250,9 +240,6 @@ public class SoftwareModule extends NamedVersionedEntity {
@Override @Override
public boolean equals(final Object obj) { // NOSONAR - as this is generated public boolean equals(final Object obj) { // NOSONAR - as this is generated
if (this == obj) {
return true;
}
if (!super.equals(obj)) { if (!super.equals(obj)) {
return false; return false;
} }

View File

@@ -125,9 +125,6 @@ public class SoftwareModuleType extends NamedEntity {
@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;
} }

View File

@@ -67,9 +67,6 @@ public abstract class Tag extends NamedEntity implements Identifiable<Long> {
@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;
} }

View File

@@ -139,13 +139,10 @@ public class Target extends NamedEntity implements Persistable<Long> {
*/ */
@Override @Override
public boolean equals(final Object obj) {// NOSONAR - as this is generated public boolean equals(final Object obj) {// NOSONAR - as this is generated
if (this == obj) {
return true;
}
if (obj == null) { if (obj == null) {
return false; return false;
} }
if (getClass() != obj.getClass()) { if (!(obj instanceof Target)) {
return false; return false;
} }
final Target other = (Target) obj; final Target other = (Target) obj;

View File

@@ -66,9 +66,6 @@ public class TargetFilterQuery extends TenantAwareBaseEntity {
@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;
} }

View File

@@ -74,9 +74,6 @@ public class TargetTag extends Tag {
@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;
} }

View File

@@ -30,32 +30,18 @@ public class TargetWithActionStatus {
this.target = target; this.target = target;
} }
/**
* @return the target
*/
public Target getTarget() { public Target getTarget() {
return target; return target;
} }
/**
* @return the status
*/
public Status getStatus() { public Status getStatus() {
return status; return status;
} }
/**
* @param target
* the target to set
*/
public void setTarget(final Target target) { public void setTarget(final Target target) {
this.target = target; this.target = target;
} }
/**
* @param status
* the status to set
*/
public void setStatus(final Status status) { public void setStatus(final Status status) {
this.status = status; this.status = status;
} }

View File

@@ -101,9 +101,6 @@ public abstract class TenantAwareBaseEntity extends BaseEntity {
*/ */
@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;
} }

View File

@@ -92,9 +92,6 @@ public class TenantConfiguration extends TenantAwareBaseEntity implements Serial
@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;
} }

View File

@@ -88,9 +88,6 @@ public class TenantMetaData extends BaseEntity {
@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;
} }