Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
b0ae20b2
Commit
b0ae20b2
authored
Jun 26, 2020
by
Piotr Gawron
Browse files
dapi connection must go over https
parent
b14c93d6
Pipeline
#28994
passed with stage
in 20 minutes and 32 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
b0ae20b2
minerva
(
15.0.1
)
stable
;
urgency
=
medium
*
Bug
fix
:
when
there
was
problem
with
DAPI
minerva
threw
unexpected
error
(#
1316
)
*
Bug
fix
:
DAPI
connection
must
go
over
HTTPS
(#
1316
)
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Fri
,
26
Jun
2020
11
:
00
:
00
+
0200
...
...
annotation/src/main/java/lcsb/mapviewer/annotation/services/dapi/DapiConnectorImpl.java
View file @
b0ae20b2
...
...
@@ -26,7 +26,7 @@ public class DapiConnectorImpl extends CachableInterface implements DapiConnecto
private
static
Logger
logger
=
LogManager
.
getLogger
();
private
static
final
String
DAPI_DOMAIN
=
"dapi.lcsb.uni.lu"
;
private
static
final
String
DAPI_BASE_URL
=
"http://"
+
DAPI_DOMAIN
+
"/api/"
;
private
static
final
String
DAPI_BASE_URL
=
"http
s
://"
+
DAPI_DOMAIN
+
"/api/"
;
private
ConfigurationDao
configurationDao
;
...
...
annotation/src/test/java/lcsb/mapviewer/annotation/services/dapi/CtdDapiConfiguration.java
View file @
b0ae20b2
...
...
@@ -26,7 +26,7 @@ public class CtdDapiConfiguration {
public
DapiConnector
dapiConnector
()
throws
DapiConnectionException
{
DapiConnectorImpl
mock
=
(
DapiConnectorImpl
)
Mockito
.
spy
(
dapiConnector
);
Mockito
.
doReturn
(
"http://dapi.lcsb.uni.lu/api/database/CTD/releases/2019.02/"
).
when
(
mock
)
Mockito
.
doReturn
(
"http
s
://dapi.lcsb.uni.lu/api/database/CTD/releases/2019.02/"
).
when
(
mock
)
.
getLatestReleaseUrl
(
"CTD"
);
Mockito
.
doReturn
(
true
).
when
(
mock
).
isValidConnection
();
...
...
annotation/src/test/java/lcsb/mapviewer/annotation/services/dapi/DrugBankDapiConfiguration.java
View file @
b0ae20b2
...
...
@@ -26,7 +26,7 @@ public class DrugBankDapiConfiguration {
public
DapiConnector
dapiConnector
()
throws
DapiConnectionException
{
DapiConnectorImpl
mock
=
(
DapiConnectorImpl
)
Mockito
.
spy
(
dapiConnector
);
Mockito
.
doReturn
(
"http://dapi.lcsb.uni.lu/api/database/DrugBank/releases/5.1/"
).
when
(
mock
)
Mockito
.
doReturn
(
"http
s
://dapi.lcsb.uni.lu/api/database/DrugBank/releases/5.1/"
).
when
(
mock
)
.
getLatestReleaseUrl
(
"DrugBank"
);
Mockito
.
doReturn
(
true
).
when
(
mock
).
isValidConnection
();
...
...
service/src/test/java/lcsb/mapviewer/services/search/chemical/CtdDapiConfiguration.java
View file @
b0ae20b2
...
...
@@ -28,7 +28,7 @@ public class CtdDapiConfiguration {
public
DapiConnector
dapiConnector
()
throws
DapiConnectionException
{
DapiConnectorImpl
mock
=
(
DapiConnectorImpl
)
Mockito
.
spy
(
dapiConnector
);
Mockito
.
doReturn
(
"http://dapi.lcsb.uni.lu/api/database/CTD/releases/2019.02/"
).
when
(
mock
)
Mockito
.
doReturn
(
"http
s
://dapi.lcsb.uni.lu/api/database/CTD/releases/2019.02/"
).
when
(
mock
)
.
getLatestReleaseUrl
(
anyString
());
Mockito
.
doReturn
(
true
).
when
(
mock
).
isValidConnection
();
...
...
service/src/test/java/lcsb/mapviewer/services/search/drug/DrugBankDapiConfiguration.java
View file @
b0ae20b2
...
...
@@ -26,7 +26,7 @@ public class DrugBankDapiConfiguration {
public
DapiConnector
dapiConnector
()
throws
DapiConnectionException
{
DapiConnectorImpl
mock
=
(
DapiConnectorImpl
)
Mockito
.
spy
(
dapiConnector
);
Mockito
.
doReturn
(
"http://dapi.lcsb.uni.lu/api/database/DrugBank/releases/5.1/"
).
when
(
mock
)
Mockito
.
doReturn
(
"http
s
://dapi.lcsb.uni.lu/api/database/DrugBank/releases/5.1/"
).
when
(
mock
)
.
getLatestReleaseUrl
(
"DrugBank"
);
Mockito
.
doReturn
(
true
).
when
(
mock
).
isValidConnection
();
...
...
Write
Preview
Supports
Markdown
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!
Cancel
Please
register
or
sign in
to comment