Skip to content

Commit

Permalink
PB-7555. Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
john committed Jan 15, 2018
1 parent 7a50677 commit 554f42e
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.silanis.esl.api.model.Package;
import com.silanis.esl.api.model.Role;
import com.silanis.esl.sdk.Document;
import com.silanis.esl.sdk.ExtractionType;
import com.silanis.esl.sdk.Field;
import com.silanis.esl.sdk.FieldStyle;
import com.silanis.esl.sdk.GroupId;
Expand Down Expand Up @@ -151,6 +152,7 @@ public com.silanis.esl.api.model.Document toAPIDocumentMetadata(){
com.silanis.esl.api.model.Document result = new com.silanis.esl.api.model.Document()
.safeSetIndex(sdkDocument.getIndex())
.safeSetExtract(sdkDocument.isExtract())
.safeSetExtractionTypes(sdkDocument.getExtractionTypes())
.safeSetName(sdkDocument.getName())
.safeSetExternal(new ExternalConverter(sdkDocument.getExternal()).toAPIExternal())
.safeSetDescription(sdkDocument.getDescription());
Expand Down

0 comments on commit 554f42e

Please sign in to comment.