From ddec2c5c7b7842536d6d705c2de20f96e16c8aa8 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 22 Oct 2014 17:38:57 +0000
Subject: [PATCH] #2021 feature - Added blocked request table and refactoring License actions
---
securis/src/main/java/net/curisit/securis/db/License.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/License.java b/securis/src/main/java/net/curisit/securis/db/License.java
index 869574e..239797c 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -63,7 +63,7 @@
@JoinColumn(name = "canceled_by")
private User canceledBy;
- private int status;
+ private LicenseStatus status;
@Column(name = "full_name")
@JsonProperty("full_name")
@@ -186,11 +186,11 @@
}
}
- public int getStatus() {
+ public LicenseStatus getStatus() {
return status;
}
- public void setStatus(int status) {
+ public void setStatus(LicenseStatus status) {
this.status = status;
}
@@ -289,21 +289,14 @@
}
public static class Status {
- public static final int CREATED = 1;
- public static final int REQUESTED = 2;
- public static final int PREACTIVE = 3;
- public static final int ACTIVE = 4;
- public static final int EXPIRED = 5;
- public static final int CANCELED = 6;
- public static final int DELETED = 7;
private static final Map<Integer, List<Integer>> transitions = Utils.createMap( //
- Action.REQUEST, Arrays.asList(CREATED, REQUESTED), //
- Action.ACTIVATION, Arrays.asList(REQUESTED, PREACTIVE, EXPIRED), //
- Action.SEND, Arrays.asList(ACTIVE, PREACTIVE), //
- Action.DOWNLOAD, Arrays.asList(ACTIVE, PREACTIVE), //
- Action.CANCEL, Arrays.asList(ACTIVE, PREACTIVE, REQUESTED, EXPIRED), //
- Action.DELETE, Arrays.asList(CANCELED, CREATED) //
+ Action.REQUEST, Arrays.asList(LicenseStatus.CREATED, LicenseStatus.REQUESTED), //
+ Action.ACTIVATION, Arrays.asList(LicenseStatus.REQUESTED, LicenseStatus.PRE_ACTIVE, LicenseStatus.EXPIRED), //
+ Action.SEND, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE), //
+ Action.DOWNLOAD, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE), //
+ Action.CANCEL, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE, LicenseStatus.REQUESTED, LicenseStatus.EXPIRED), //
+ Action.DELETE, Arrays.asList(LicenseStatus.CANCELLED, LicenseStatus.CREATED) //
);
@@ -315,7 +308,7 @@
* @param newStatus
* @return
*/
- public static boolean isActionValid(Integer action, Integer currentStatus) {
+ public static boolean isActionValid(Integer action, LicenseStatus currentStatus) {
List<Integer> validStatuses = transitions.get(currentStatus);
return validStatuses != null && validStatuses.contains(currentStatus);
--
Gitblit v1.3.2