@@ -117,13 +117,11 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
117117 validateUser (user );
118118
119119 if (key == null || key .equals ("" )) {
120- ErrorResponse errorResponse = new ErrorResponse (500 , "Missing parameter: key" , null );
121- throw new IllegalArgumentException ("Missing parameter: key" );
120+ throw new IllegalArgumentException (ErrorResponse .ErrorMessage .MISSING_PARAMETER .getMessage ("key" ));
122121 }
123122
124123 if (defaultValue == null ) {
125- ErrorResponse errorResponse = new ErrorResponse (500 , "Missing parameter: defaultValue" , null );
126- throw new IllegalArgumentException ("Missing parameter: defaultValue" );
124+ throw new IllegalArgumentException (ErrorResponse .ErrorMessage .MISSING_PARAMETER .getMessage ("defaultValue" ));
127125 }
128126
129127 TypeEnum variableType = TypeEnum .fromClass (defaultValue .getClass ());
@@ -145,7 +143,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
145143 Call <Variable > response = api .getVariableByKey (user , key , dvcOptions .getEnableEdgeDB ());
146144 variable = getResponseWithRetries (response , 5 );
147145 if (variable .getType () != variableType ) {
148- throw new IllegalArgumentException ("Variable type mismatch, returning default value" );
146+ throw new IllegalArgumentException (ErrorResponse . ErrorMessage . VARIABLE_TYPE_MISMATCH . getMessage () );
149147 }
150148 if (beforeError != null ) {
151149 throw beforeError ;
@@ -163,7 +161,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
163161 .isDefaulted (true )
164162 .build ();
165163
166- if (exception .getMessage ().equals ("Variable type mismatch, returning default value" )) {
164+ if (exception .getMessage ().equals (ErrorResponse . ErrorMessage . VARIABLE_TYPE_MISMATCH . getMessage () )) {
167165 variable .setEval (EvalReason .defaultReason (EvalReason .DefaultReasonDetailsEnum .VARIABLE_TYPE_MISMATCH ));
168166 } else {
169167 variable .setEval (EvalReason .defaultReason (EvalReason .DefaultReasonDetailsEnum .ERROR ));
@@ -227,7 +225,7 @@ public void track(DevCycleUser user, DevCycleEvent event) throws DevCycleExcepti
227225 validateUser (user );
228226
229227 if (event == null || event .getType () == null || event .getType ().equals ("" )) {
230- throw new IllegalArgumentException ("Invalid DevCycleEvent" );
228+ throw new IllegalArgumentException (ErrorResponse . ErrorMessage . INVALID_EVENT . getMessage () );
231229 }
232230
233231 DevCycleUserAndEvents userAndEvents = DevCycleUserAndEvents .builder ()
@@ -338,10 +336,10 @@ private boolean isValidServerKey(String serverKey) {
338336
339337 private void validateUser (DevCycleUser user ) {
340338 if (user == null ) {
341- throw new IllegalArgumentException ("DevCycleUser cannot be null" );
339+ throw new IllegalArgumentException (ErrorResponse . ErrorMessage . NULL_USER . getMessage () );
342340 }
343341 if (user .getUserId ().equals ("" )) {
344- throw new IllegalArgumentException ("userId cannot be empty" );
342+ throw new IllegalArgumentException (ErrorResponse . ErrorMessage . USER_ID_MISSING . getMessage () );
345343 }
346344 }
347345}
0 commit comments