Commit ae43c7a5 authored by Mohamed Khalil Labidi's avatar Mohamed Khalil Labidi
Browse files

Merge branch 'fix-typos' into 'proactive-dev'

Fix typos in OS classes and add specific toString to some model classes

See merge request !92
parents 84bbf394 0101ef05
package org.activeeon.morphemic.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;
import java.util.List;
......@@ -15,6 +12,7 @@ import java.util.List;
@NoArgsConstructor
@Getter
@Setter
@ToString(callSuper = true)
public class ByonDefinition {
@JsonProperty("name")
private String name = null;
......
......@@ -8,7 +8,7 @@ import javax.persistence.Embedded;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Embeddable
......
......@@ -7,7 +7,7 @@ import java.io.Serializable;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Entity
......
......@@ -9,7 +9,7 @@ import java.util.Map;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Embeddable
......
......@@ -2,6 +2,7 @@ package org.activeeon.morphemic.model;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.hibernate.annotations.GenericGenerator;
import org.ow2.proactive.scheduler.common.task.TaskVariable;
......@@ -13,6 +14,7 @@ import java.util.Map;
@AllArgsConstructor
@NoArgsConstructor
@ToString(callSuper = true)
@Entity
@Table(name = "EMSDEPLOYMENTREQUEST")
public class EmsDeploymentRequest implements Serializable {
......
......@@ -13,7 +13,7 @@ import java.util.Map;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Entity
......
......@@ -7,7 +7,7 @@ import java.io.Serializable;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Entity
......
......@@ -12,7 +12,7 @@ public enum OperatingSystemArchitecture {
AMD64("AMD64"),
UNKOWN("UNKOWN"),
UNKNOWN("UNKNOWN"),
I386("I386"),
......@@ -39,7 +39,7 @@ public enum OperatingSystemArchitecture {
return b;
}
}
return UNKOWN;
return UNKNOWN;
}
}
......
......@@ -12,7 +12,7 @@ public enum OperatingSystemFamily {
UBUNTU("UBUNTU"),
UNKOWN_OS_FAMILY("UNKOWN_OS_FAMILY"),
UNKNOWN_OS_FAMILY("UNKNOWN_OS_FAMILY"),
AIX("AIX"),
......@@ -83,7 +83,7 @@ public enum OperatingSystemFamily {
return b;
}
}
return UNKOWN_OS_FAMILY;
return UNKNOWN_OS_FAMILY;
}
}
......@@ -7,7 +7,7 @@ import javax.persistence.Embeddable;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Embeddable
......
......@@ -8,7 +8,7 @@ import java.io.Serializable;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Entity
......
......@@ -14,7 +14,7 @@ import java.util.List;
@NoArgsConstructor
@ToString
@ToString(callSuper = true)
@Getter
@Setter
@Entity
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment