Commit e480a340 authored by Raimbek Egemberdiev's avatar Raimbek Egemberdiev

Merge branch 'master' of gitlab.lan.arta.kz:raimbek/synergy-api-util

parents 88291365 7474b9c8
package kz.arta.synergy.api.services.storage;
package kz.arta.synergy.api.pojo;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
......
package kz.arta.synergy.api.services.storage;
package kz.arta.synergy.api.pojo;
import java.util.ArrayList;
......
......@@ -5,8 +5,8 @@ import kz.arta.synergy.api.Query;
import kz.arta.synergy.api.QueryContext;
import kz.arta.synergy.api.RestHttpQuery;
import kz.arta.synergy.api.pojo.SynergyFile;
import kz.arta.synergy.api.services.storage.Attachment;
import kz.arta.synergy.api.services.storage.AttachmentList;
import kz.arta.synergy.api.pojo.Attachment;
import kz.arta.synergy.api.pojo.AttachmentList;
import org.codehaus.jackson.type.TypeReference;
import java.io.IOException;
......
package kz.arta.synergy.api.services;
import kz.arta.synergy.api.QueryContext;
import kz.arta.synergy.api.services.storage.Attachment;
import kz.arta.synergy.api.services.storage.AttachmentList;
import kz.arta.synergy.api.pojo.Attachment;
import kz.arta.synergy.api.pojo.AttachmentList;
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment