update from main

pom.xml

@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.mobiera.libs</groupId>
    <artifactId>aircast-api</artifactId>
-   <version>2.50</version>
+   <version>2.55</version>
    <name>Aircast API</name>
    <description>Client Library for Mobiera Aircast Containers</description>
    <url>https://github.com/mobiera/aircast-api</url>

src/main/java/com/mobiera/aircast/api/vo/SimVO.java

@@ -341,6 +341,71 @@ public class SimVO implements Serializable {
 	private Instant nextP2ScheduleTs;
 
 
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_ONLY, 
+			label="Last P3 Sent Ts", 
+			description="Last P3 Sent Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant lastP3SentTs;
+
+
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_WRITE, 
+			label="Next P3 Schedule Ts", 
+			description="Next P3 Schedule Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant nextP3ScheduleTs;
+
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_ONLY, 
+			label="Last P4 Sent Ts", 
+			description="Last P4 Sent Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant lastP4SentTs;
+
+
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_WRITE, 
+			label="Next P4 Schedule Ts", 
+			description="Next P4 Schedule Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant nextP4ScheduleTs;
+
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_ONLY, 
+			label="Last P5 Sent Ts", 
+			description="Last P5 Sent Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant lastP5SentTs;
+
+
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_WRITE, 
+			label="Next P5 Schedule Ts", 
+			description="Next P5 Schedule Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant nextP5ScheduleTs;
+
+
+
 
 
 	@UI( widgetType = WidgetType.DATETIME, 
@@ -355,6 +420,40 @@ public class SimVO implements Serializable {
 
 
 
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_ONLY, 
+			label="Last P3 Success Ts", 
+			description="Last P3 Success Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant lastP3SuccessTs;
+
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_ONLY, 
+			label="Last P4 Success Ts", 
+			description="Last P4 Success Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant lastP4SuccessTs;
+
+
+	@UI( widgetType = WidgetType.DATETIME, 
+			mode = Mode.READ_ONLY, 
+			label="Last P5 Success Ts", 
+			description="Last P5 Success Ts")
+			@Section(name = "OTA")
+
+	@JsonSerialize(using = InstantSerializer.class)
+	@JsonDeserialize(using = InstantDeserializer.class)
+	private Instant lastP5SuccessTs;
+
+
+
+
 	@UI( widgetType = WidgetType.DATETIME, 
 			mode = Mode.READ_ONLY, 
 			label="Last Discovery Sent Ts", 
@@ -755,6 +854,60 @@ public Instant getLastP2SuccessTs() {
 	public void setLastP2SuccessTs(Instant lastP2SuccessTs) {
 		this.lastP2SuccessTs = lastP2SuccessTs;
 	}
+	public Instant getLastP3SentTs() {
+		return lastP3SentTs;
+	}
+	public void setLastP3SentTs(Instant lastP3SentTs) {
+		this.lastP3SentTs = lastP3SentTs;
+	}
+	public Instant getNextP3ScheduleTs() {
+		return nextP3ScheduleTs;
+	}
+	public void setNextP3ScheduleTs(Instant nextP3ScheduleTs) {
+		this.nextP3ScheduleTs = nextP3ScheduleTs;
+	}
+	public Instant getLastP4SentTs() {
+		return lastP4SentTs;
+	}
+	public void setLastP4SentTs(Instant lastP4SentTs) {
+		this.lastP4SentTs = lastP4SentTs;
+	}
+	public Instant getNextP4ScheduleTs() {
+		return nextP4ScheduleTs;
+	}
+	public void setNextP4ScheduleTs(Instant nextP4ScheduleTs) {
+		this.nextP4ScheduleTs = nextP4ScheduleTs;
+	}
+	public Instant getLastP5SentTs() {
+		return lastP5SentTs;
+	}
+	public void setLastP5SentTs(Instant lastP5SentTs) {
+		this.lastP5SentTs = lastP5SentTs;
+	}
+	public Instant getNextP5ScheduleTs() {
+		return nextP5ScheduleTs;
+	}
+	public void setNextP5ScheduleTs(Instant nextP5ScheduleTs) {
+		this.nextP5ScheduleTs = nextP5ScheduleTs;
+	}
+	public Instant getLastP3SuccessTs() {
+		return lastP3SuccessTs;
+	}
+	public void setLastP3SuccessTs(Instant lastP3SuccessTs) {
+		this.lastP3SuccessTs = lastP3SuccessTs;
+	}
+	public Instant getLastP4SuccessTs() {
+		return lastP4SuccessTs;
+	}
+	public void setLastP4SuccessTs(Instant lastP4SuccessTs) {
+		this.lastP4SuccessTs = lastP4SuccessTs;
+	}
+	public Instant getLastP5SuccessTs() {
+		return lastP5SuccessTs;
+	}
+	public void setLastP5SuccessTs(Instant lastP5SuccessTs) {
+		this.lastP5SuccessTs = lastP5SuccessTs;
+	}
 
 
 

src/main/java/com/mobiera/aircast/commons/enums/ImpactPolicy.java

@@ -4,7 +4,7 @@
 
 public enum ImpactPolicy implements Serializable {
 
-	P0(0),P1(1),P2(2);
+	P0(0),P1(1),P2(2),P3(4),P4(4),P5(5);
 
 	private ImpactPolicy(Integer index){
 		this.index = index;
@@ -24,6 +24,9 @@ public static ImpactPolicy getEnum(Integer index){
 			case 0: return P0;
 			case 1: return P1;
 			case 2: return P2;
+			case 3: return P3;
+			case 4: return P4;
+			case 5: return P5;
 			default: return null;
 		}
 	}

src/main/java/com/mobiera/aircast/commons/enums/ParameterName.java

@@ -315,10 +315,23 @@ public enum ParameterName {
 	STRING_POLICY_P0_NAME(ParameterType.CAMPAIGN_POLICIES, "Name of P0 Policy", "Name of P0 Policy"),// 
 	STRING_POLICY_P1_NAME(ParameterType.CAMPAIGN_POLICIES, "Name of P1 Policy", "Name of P1 Policy"),// 
 	STRING_POLICY_P2_NAME(ParameterType.CAMPAIGN_POLICIES, "Name of P2 Policy", "Name of P2 Policy"),// 
-
-	INTEGER_POLICY_P0_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days for P0 Policy", "Number of days for P0 Policy"),// 
-	INTEGER_POLICY_P1_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days for P1 Policy", "Number of days for P1 Policy"),// 
-	INTEGER_POLICY_P2_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days for P2 Policy", "Number of days for P2 Policy"),// 
+	STRING_POLICY_P3_NAME(ParameterType.CAMPAIGN_POLICIES, "Name of P3 Policy", "Name of P3 Policy"),// 
+	STRING_POLICY_P4_NAME(ParameterType.CAMPAIGN_POLICIES, "Name of P4 Policy", "Name of P4 Policy"),// 
+	STRING_POLICY_P5_NAME(ParameterType.CAMPAIGN_POLICIES, "Name of P5 Policy", "Name of P5 Policy"),// 
+
+	INTEGER_POLICY_P0_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days between 2 impacts for P0 Policy", "Number of days between 2 impacts when looking for msisdn in full database for P0 Policy"),// 
+	INTEGER_POLICY_P1_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days between 2 impacts for P1 Policy", "Number of days between 2 impacts when looking for msisdn in full database for P1 Policy"),// 
+	INTEGER_POLICY_P2_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days between 2 impacts for P2 Policy", "Number of days between 2 impacts when looking for msisdn in full database for P2 Policy"),// 
+	INTEGER_POLICY_P3_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days between 2 impacts for P3 Policy", "Number of days between 2 impacts when looking for msisdn in full database for P3 Policy"),// 
+	INTEGER_POLICY_P4_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days between 2 impacts for P4 Policy", "Number of days between 2 impacts when looking for msisdn in full database for P4 Policy"),// 
+	INTEGER_POLICY_P5_DAYS(ParameterType.CAMPAIGN_POLICIES, "Number of days between 2 impacts for P5 Policy", "Number of days between 2 impacts when looking for msisdn in full database for P5 Policy"),// 
+
+	STRING_POLICY_P0_IMPACT_LIMIT(ParameterType.CAMPAIGN_POLICIES, "Max number of impacts per periodicity for P0 Policy", "Max number of impacts per periodicity for P0 Policy when using lists in campaigns. Ex 3/DAY, 10/WEEK, 5/MONTH"),// 
+	STRING_POLICY_P1_IMPACT_LIMIT(ParameterType.CAMPAIGN_POLICIES, "Max number of impacts per periodicity for P1 Policy", "Max number of impacts per periodicity for P1 Policy when using lists in campaigns. Ex 3/DAY, 10/WEEK, 5/MONTH"),// 
+	STRING_POLICY_P2_IMPACT_LIMIT(ParameterType.CAMPAIGN_POLICIES, "Max number of impacts per periodicity for P2 Policy", "Max number of impacts per periodicity for P2 Policy when using lists in campaigns. Ex 3/DAY, 10/WEEK, 5/MONTH"),// 
+	STRING_POLICY_P3_IMPACT_LIMIT(ParameterType.CAMPAIGN_POLICIES, "Max number of impacts per periodicity for P3 Policy", "Max number of impacts per periodicity for P3 Policy when using lists in campaigns. Ex 3/DAY, 10/WEEK, 5/MONTH"),// 
+	STRING_POLICY_P4_IMPACT_LIMIT(ParameterType.CAMPAIGN_POLICIES, "Max number of impacts per periodicity for P4 Policy", "Max number of impacts per periodicity for P4 Policy when using lists in campaigns. Ex 3/DAY, 10/WEEK, 5/MONTH"),// 
+	STRING_POLICY_P5_IMPACT_LIMIT(ParameterType.CAMPAIGN_POLICIES, "Max number of impacts per periodicity for P5 Policy", "Max number of impacts per periodicity for P5 Policy when using lists in campaigns. Ex 3/DAY, 10/WEEK, 5/MONTH"),// 
 
 	/*
 	 * Device API & TAC DB Update