Adds name to EnumGroup and updates toString for EnumValue and EnumGro…

…up (#5) Signed-off-by: Sean Sundberg <[email protected]>
ibm-ecosystem-engineering · Jun 2, 2024 · a469527 · a469527
1 parent dc6f362
commit a469527
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 19 deletions.
diff --git a/src/main/java/com/ibm/openpages/support/models/EnumGroup.java b/src/main/java/com/ibm/openpages/support/models/EnumGroup.java
@@ -9,8 +9,15 @@
 
 public class EnumGroup implements IEnumGroup {
     private final List<EnumValue> values;
+    private final String name;
 
+    @Deprecated
     public EnumGroup() {
+        this("<Unknown>");
+    }
+
+    public EnumGroup(String name) {
+        this.name = name;
         this.values = new ArrayList<EnumValue>();
     }
 
@@ -30,6 +37,11 @@ public EnumValue addEnumValue(String value, String label) {
         return enumValue;
     }
 
+    @Override
+    public String name() {
+        return name;
+    }
+
     @Override
     public List<EnumValue> values() {
         return Collections.unmodifiableList(values);
@@ -45,4 +57,8 @@ public EnumValue[] valuesArray() {
     public Optional<EnumValue> lookup(String value) {
         return EnumUtil.lookup(valuesArray(), value);
     }
+
+    public String toString() {
+        return "[EnumGroup: " + name + "]";
+    }
 }
diff --git a/src/main/java/com/ibm/openpages/support/models/EnumValue.java b/src/main/java/com/ibm/openpages/support/models/EnumValue.java
@@ -27,4 +27,8 @@ public String value() {
     public IEnumGroup enumGroup() {
         return enumGroup;
     }
+
+    public String toString() {
+        return "[EnumValue: " + enumGroup + "." + value + " (" + label + ")]";
+    }
 }
diff --git a/src/main/java/com/ibm/openpages/support/models/IEnumGroup.java b/src/main/java/com/ibm/openpages/support/models/IEnumGroup.java
@@ -4,6 +4,8 @@
 import java.util.Optional;
 
 public interface IEnumGroup {
+    String name();
+
     List<EnumValue> values();
 
     EnumValue[] valuesArray();

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/Integration_Application.java b/src/main/java/com/ibm/openpages/support/models/enum_value/Integration_Application.java
@@ -9,7 +9,7 @@
 import java.util.Optional;
 
 public class Integration_Application {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("Application");
 
     public static final EnumValue QRadar = eg.addEnumValue("QRadar");
     public static final EnumValue WatsonKnowledgeCatalog = eg.addEnumValue("Watson Knowledge Catalog");

diff --git a/...in/java/com/ibm/openpages/support/models/enum_value/MRGAIFactsModelUseCase_RiskLevel.java b/...in/java/com/ibm/openpages/support/models/enum_value/MRGAIFactsModelUseCase_RiskLevel.java
@@ -9,7 +9,7 @@
 import java.util.Optional;
 
 public class MRGAIFactsModelUseCase_RiskLevel {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("RiskLevel");
 
     public static final EnumValue High = eg.addEnumValue("High");
     public static final EnumValue Medium = eg.addEnumValue("Medium");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGAIFactsModelUseCase_Status.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGAIFactsModelUseCase_Status.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGAIFactsModelUseCase_Status {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("Status");
 
     public static final EnumValue Proposed = eg.addEnumValue("Proposed");
     public static final EnumValue AwaitingApproval = eg.addEnumValue("Awaiting Approval");

diff --git a/...in/java/com/ibm/openpages/support/models/enum_value/MRGModelUseCase_ExternallyFacing.java b/...in/java/com/ibm/openpages/support/models/enum_value/MRGModelUseCase_ExternallyFacing.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModelUseCase_ExternallyFacing {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("ExternallyFacing");
 
     public static final EnumValue Yes = eg.addEnumValue("Yes");
     public static final EnumValue No = eg.addEnumValue("No");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModelUseCase_UseCaseType.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModelUseCase_UseCaseType.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModelUseCase_UseCaseType {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("UseCaseType");
 
     public static final EnumValue AI = eg.addEnumValue("AI");
     public static final EnumValue NonAI = eg.addEnumValue("Non-AI");

diff --git a/...ava/com/ibm/openpages/support/models/enum_value/MRGModelUseCase_UsesFoundationModels.java b/...ava/com/ibm/openpages/support/models/enum_value/MRGModelUseCase_UsesFoundationModels.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModelUseCase_UsesFoundationModels {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("UsesFoundationModels");
 
     public static final EnumValue Yes = eg.addEnumValue("Yes");
     public static final EnumValue No = eg.addEnumValue("No");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_ApprovedTasks.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_ApprovedTasks.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModel_ApprovedTasks {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("ApprovedTasks");
 
     public static final EnumValue Summarization = eg.addEnumValue("Summarization");
     public static final EnumValue Classification = eg.addEnumValue("Classification");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_BaselModel.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_BaselModel.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModel_BaselModel {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("BaselModel");
 
     public static final EnumValue Yes = eg.addEnumValue("Yes");
     public static final EnumValue No = eg.addEnumValue("No");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_CandidateStatus.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_CandidateStatus.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModel_CandidateStatus {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("CandidateStatus");
 
     public static final EnumValue ModelCandidate = eg.addEnumValue("Model Candidate");
     public static final EnumValue CandidateAwaitingConfirmation = eg.addEnumValue("Candidate- Awaiting Confirmation");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_ComplianceStatus.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_ComplianceStatus.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModel_ComplianceStatus {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("ComplianceStatus");
 
     public static final EnumValue Compliant = eg.addEnumValue("Compliant");
     public static final EnumValue PartiallyCompliant = eg.addEnumValue("Partially Compliant");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_ExternalModel.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_ExternalModel.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModel_ExternalModel {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("ExternalModel");
 
     public static final EnumValue External = eg.addEnumValue("External (Yes)");
     public static final EnumValue Internal = eg.addEnumValue("Internal (No)");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_MachineLearningModel.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_MachineLearningModel.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModel_MachineLearningModel {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("MachineLearningModel");
 
     public static final EnumValue Yes = eg.addEnumValue("Yes");
     public static final EnumValue No = eg.addEnumValue("No");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_MeasurementType.java b/src/main/java/com/ibm/openpages/support/models/enum_value/MRGModel_MeasurementType.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class MRGModel_MeasurementType {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("MeasurementType");
 
     public static final EnumValue EconomicCapital = eg.addEnumValue("Economic Capital");
     public static final EnumValue ProbabilityOfDefault = eg.addEnumValue("Probability of Default");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCName.java b/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCName.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class OPLCQAssessment_LCName {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("LCName");
 
     public static final EnumValue TwoStage = eg.addEnumValue("2Stage", "2 Stage Lifecycle (no review)");
     public static final EnumValue ThreeStage = eg.addEnumValue("3Stage", "3 Stage Lifecycle (with review)");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCStage.java b/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCStage.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class OPLCQAssessment_LCStage {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("LCStage");
 
     public static final EnumValue TwoStageInfo = eg.addEnumValue("2Stage-Info", "Information Gathering");
     public static final EnumValue TwoStageClose = eg.addEnumValue("2Stage-Close", "Close");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCStatus.java b/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCStatus.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class OPLCQAssessment_LCStatus {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("LCStatus");
 
     public static final EnumValue Complete = eg.addEnumValue("Complete");
     public static final EnumValue InReview = eg.addEnumValue("InReview");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCTransition.java b/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCQAssessment_LCTransition.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class OPLCQAssessment_LCTransition {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("LCTransition");
 
     public static final EnumValue TwoStageInfoSubmit = eg.addEnumValue("2Stage-Info-Submit", "Submit and Close");
     public static final EnumValue ThreeStageInfoSubmit = eg.addEnumValue("3Stage-Info-Submit", "Submit");

diff --git a/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCStd_LCUpdateAssignee.java b/src/main/java/com/ibm/openpages/support/models/enum_value/OPLCStd_LCUpdateAssignee.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class OPLCStd_LCUpdateAssignee {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("LCUpdateAssignee");
 
     public static final EnumValue Yes = eg.addEnumValue("Yes");
 

diff --git a/...java/com/ibm/openpages/support/models/enum_value/WatsonxQAssessment_AIAssessmentType.java b/...java/com/ibm/openpages/support/models/enum_value/WatsonxQAssessment_AIAssessmentType.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class WatsonxQAssessment_AIAssessmentType {
-    protected static final EnumGroup eg = new EnumGroup();
+    protected static final EnumGroup eg = new EnumGroup("AIAssessmentType");
 
     public static final EnumValue NotDetermined = eg.addEnumValue("Not Determined");
     public static final EnumValue DataGathering = eg.addEnumValue("Data Gathering");