Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fire-v3-core
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EGA
fire-v3-core
Commits
cf78c1ec
Commit
cf78c1ec
authored
4 years ago
by
Ashutosh Shimpi
Browse files
Options
Downloads
Patches
Plain Diff
- Updated spring-web version compatible with exisitng data-api
- Changed code accordingly
parent
fe62ea0c
No related branches found
No related tags found
No related merge requests found
Pipeline
#279314
passed with stage
in 43 seconds
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
src/main/java/uk/ac/ebi/ega/fire/service/FireService.java
+9
-3
9 additions, 3 deletions
src/main/java/uk/ac/ebi/ega/fire/service/FireService.java
with
10 additions
and
4 deletions
pom.xml
+
1
−
1
View file @
cf78c1ec
...
...
@@ -89,7 +89,7 @@
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-web
</artifactId>
<version>
5.2.7
.RELEASE
</version>
<version>
4.3.13
.RELEASE
</version>
</dependency>
</dependencies>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/uk/ac/ebi/ega/fire/service/FireService.java
+
9
−
3
View file @
cf78c1ec
...
...
@@ -29,6 +29,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
import
org.apache.http.util.EntityUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.web.util.UriComponentsBuilder
;
import
uk.ac.ebi.ega.fire.exceptions.ClientProtocolException
;
import
uk.ac.ebi.ega.fire.exceptions.FireServiceException
;
import
uk.ac.ebi.ega.fire.listener.ProgressListener
;
...
...
@@ -54,8 +55,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.Optional
;
import
static
java
.
nio
.
charset
.
Charset
.
defaultCharset
;
import
static
org
.
springframework
.
web
.
util
.
UriUtils
.
encodeFragment
;
import
static
uk
.
ac
.
ebi
.
ega
.
fire
.
utils
.
FireUtils
.
getObjectMapper
;
public
class
FireService
implements
IFireService
{
...
...
@@ -123,8 +122,15 @@ public class FireService implements IFireService {
firePath
=
firePath
.
substring
(
1
);
}
// build http request and assign multipart upload data
final
String
encodedFirePath
=
UriComponentsBuilder
.
newInstance
()
.
fragment
(
firePath
)
.
build
()
.
encode
()
.
getFragment
();
final
HttpUriRequest
request
=
RequestBuilder
.
get
(
fireURL
+
PATH_OBJECTS_QUERY_BY_PATH
+
encode
Fragment
(
firePath
,
defaultCharset
())
)
.
get
(
fireURL
+
PATH_OBJECTS_QUERY_BY_PATH
+
encode
dFirePath
)
.
build
();
try
(
final
CloseableHttpResponse
httpResponse
=
httpClient
.
execute
(
request
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment