Skip to content

Commit

Permalink
PS-42243: fix for BTE Time & Labor entities (#457)
Browse files Browse the repository at this point in the history
  • Loading branch information
ALNAUA authored Feb 28, 2024
1 parent 6f297ab commit 42a9126
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.bullhorn</groupId>
<artifactId>sdk-rest</artifactId>
<version>2.3.7</version>
<version>2.3.8</version>
<packaging>jar</packaging>

<name>Bullhorn REST SDK</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.bullhornsdk.data.model.entity.core.bte.rules;

import com.bullhornsdk.data.api.helper.RestOneToManySerializer;
import com.bullhornsdk.data.api.helper.json.DynamicNullValueFilter;
import com.bullhornsdk.data.model.entity.core.standard.ClientCorporation;
import com.bullhornsdk.data.model.entity.core.standard.CorporateUser;
import com.bullhornsdk.data.model.entity.core.type.*;
import com.bullhornsdk.data.model.entity.embedded.OneToMany;
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.joda.time.DateTime;
Expand All @@ -24,7 +22,6 @@ public class ClientCorporationBillRuleset extends AbstractEntity implements Quer
String effectiveEndDate;
Boolean isDeleted;
CorporateUser owner;
@JsonSerialize(using = RestOneToManySerializer.class)
OneToMany<TimeLaborEvalRule> timeLaborEvalRules;
Integer versionID;
OneToMany<ClientCorporationBillRulesetVersion> versions;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.bullhornsdk.data.model.entity.core.bte.rules;

import com.bullhornsdk.data.api.helper.RestOneToManySerializer;
import com.bullhornsdk.data.api.helper.json.DynamicNullValueFilter;
import com.bullhornsdk.data.model.entity.core.standard.ClientCorporation;
import com.bullhornsdk.data.model.entity.core.type.*;
import com.bullhornsdk.data.model.entity.embedded.OneToMany;
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.joda.time.DateTime;
Expand All @@ -22,6 +20,5 @@ public class ClientCorporationBillRulesetVersion extends AbstractEntity implemen
String effectiveDate;
String effectiveEndDate;
Boolean isFirst;
@JsonSerialize(using = RestOneToManySerializer.class)
OneToMany<TimeLaborEvalRule> timeLaborEvalRules;
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.bullhornsdk.data.model.entity.core.bte.rules;

import com.bullhornsdk.data.api.helper.RestOneToManySerializer;
import com.bullhornsdk.data.api.helper.json.DynamicNullValueFilter;
import com.bullhornsdk.data.model.entity.core.standard.ClientCorporation;
import com.bullhornsdk.data.model.entity.core.standard.CorporateUser;
import com.bullhornsdk.data.model.entity.core.type.*;
import com.bullhornsdk.data.model.entity.embedded.OneToMany;
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.joda.time.DateTime;
Expand All @@ -24,7 +22,6 @@ public class ClientCorporationPayRuleset extends AbstractEntity implements Query
String effectiveEndDate;
Boolean isDeleted;
CorporateUser owner;
@JsonSerialize(using = RestOneToManySerializer.class)
OneToMany<TimeLaborEvalRule> timeLaborEvalRules;
Integer versionID;
OneToMany<ClientCorporationPayRulesetVersion> versions;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.bullhornsdk.data.model.entity.core.bte.rules;

import com.bullhornsdk.data.api.helper.RestOneToManySerializer;
import com.bullhornsdk.data.api.helper.json.DynamicNullValueFilter;
import com.bullhornsdk.data.model.entity.core.standard.ClientCorporation;
import com.bullhornsdk.data.model.entity.core.type.*;
import com.bullhornsdk.data.model.entity.embedded.OneToMany;
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.joda.time.DateTime;
Expand All @@ -22,6 +20,5 @@ public class ClientCorporationPayRulesetVersion extends AbstractEntity implement
String effectiveDate;
String effectiveEndDate;
Boolean isFirst;
@JsonSerialize(using = RestOneToManySerializer.class)
OneToMany<TimeLaborEvalRule> timeLaborEvalRules;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.bullhornsdk.data.model.entity.core.bte.rules;

import com.bullhornsdk.data.api.helper.RestOneToManySerializer;
import com.bullhornsdk.data.api.helper.json.DynamicNullValueFilter;
import com.bullhornsdk.data.model.entity.core.bte.Holiday;
import com.bullhornsdk.data.model.entity.core.paybill.optionslookup.SimplifiedOptionsLookup;
Expand All @@ -9,7 +8,6 @@
import com.bullhornsdk.data.model.entity.core.type.*;
import com.bullhornsdk.data.model.entity.embedded.OneToMany;
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.joda.time.DateTime;
Expand All @@ -24,14 +22,12 @@ public class TimeLaborEvalRule extends AbstractEntity implements QueryEntity, Up
DateTime addedAtUtc;
CorporateUser addedByUser;
String description;
@JsonSerialize(using = RestOneToManySerializer.class)
OneToMany<Holiday> holidays;
Boolean isRun;
DateTime lastModifiedAtUtc;
CorporateUser modifyingUser;
String name;
Map<String, Object> parameters;
@JsonSerialize(using = RestOneToManySerializer.class)
OneToMany<State> states;
SimplifiedOptionsLookup timeLaborCalcTypeLookup;
SimplifiedOptionsLookup timeLaborEvalRuleCategoryLookup;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.bullhornsdk.data.model.entity.core.bte.rules;

import com.bullhornsdk.data.api.helper.RestOneToManySerializer;
import com.bullhornsdk.data.api.helper.json.DynamicNullValueFilter;
import com.bullhornsdk.data.model.entity.core.paybill.optionslookup.SimplifiedOptionsLookup;
import com.bullhornsdk.data.model.entity.core.standard.CorporateUser;
import com.bullhornsdk.data.model.entity.core.type.*;
import com.bullhornsdk.data.model.entity.embedded.OneToMany;
import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.joda.time.DateTime;
Expand All @@ -24,7 +22,6 @@ public class TimeLaborEvalRuleTemplate extends AbstractEntity implements QueryEn
DateTime lastModifiedAtUtc;
CorporateUser modifyingUser;
String name;
@JsonSerialize(using = RestOneToManySerializer.class)
OneToMany<TimeLaborEvalRule> timeLaborEvalRules;
OneToMany<SimplifiedOptionsLookup> timeLaborEvalRulesCalcTypes;
OneToMany<SimplifiedOptionsLookup> timeLaborEvalRulesCategories;
Expand Down

0 comments on commit 42a9126

Please sign in to comment.