Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
synergy-api-util
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Raimbek Egemberdiev
synergy-api-util
Commits
e480a340
Commit
e480a340
authored
Nov 25, 2016
by
Raimbek Egemberdiev
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.lan.arta.kz:raimbek/synergy-api-util
parents
88291365
7474b9c8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
src/main/java/kz/arta/synergy/api/pojo/Attachment.java
src/main/java/kz/arta/synergy/api/pojo/Attachment.java
+1
-1
src/main/java/kz/arta/synergy/api/pojo/AttachmentList.java
src/main/java/kz/arta/synergy/api/pojo/AttachmentList.java
+1
-1
src/main/java/kz/arta/synergy/api/services/StorageService.java
...ain/java/kz/arta/synergy/api/services/StorageService.java
+2
-2
src/test/java/kz/arta/synergy/api/services/StorageServiceTest.java
...java/kz/arta/synergy/api/services/StorageServiceTest.java
+2
-2
No files found.
src/main/java/kz/arta/synergy/api/
services/storage
/Attachment.java
→
src/main/java/kz/arta/synergy/api/
pojo
/Attachment.java
View file @
e480a340
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
;
...
...
src/main/java/kz/arta/synergy/api/
services/storage
/AttachmentList.java
→
src/main/java/kz/arta/synergy/api/
pojo
/AttachmentList.java
View file @
e480a340
package
kz.arta.synergy.api.
services.storage
;
package
kz.arta.synergy.api.
pojo
;
import
java.util.ArrayList
;
...
...
src/main/java/kz/arta/synergy/api/services/StorageService.java
View file @
e480a340
...
...
@@ -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
;
...
...
src/test/java/kz/arta/synergy/api/services/StorageServiceTest.java
View file @
e480a340
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment