Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
e03fe094
Commit
e03fe094
authored
Mar 12, 2018
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed prints
parent
4e3f7474
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
28 deletions
+2
-28
DeployService.java
.../main/java/nl/uva/sne/drip/api/service/DeployService.java
+1
-2
ProvisionService.java
...in/java/nl/uva/sne/drip/api/service/ProvisionService.java
+0
-3
RootController.java
...main/java/nl/uva/sne/drip/api/v1/rest/RootController.java
+1
-6
TestCloudCredentialsController.java
.../sne/drip/api/v1/rest/TestCloudCredentialsController.java
+0
-17
No files found.
drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
View file @
e03fe094
...
@@ -398,7 +398,7 @@ public class DeployService {
...
@@ -398,7 +398,7 @@ public class DeployService {
mapper
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
false
);
mapper
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
false
);
value
=
parseValue
(
value
);
value
=
parseValue
(
value
);
System
.
err
.
println
(
value
);
List
<
AnsibleOutput
>
outputList
=
mapper
.
readValue
(
value
,
new
TypeReference
<
List
<
AnsibleOutput
>>()
{
List
<
AnsibleOutput
>
outputList
=
mapper
.
readValue
(
value
,
new
TypeReference
<
List
<
AnsibleOutput
>>()
{
});
});
...
@@ -640,7 +640,6 @@ public class DeployService {
...
@@ -640,7 +640,6 @@ public class DeployService {
Map
<
String
,
Object
>
info
=
new
HashMap
();
Map
<
String
,
Object
>
info
=
new
HashMap
();
for
(
MessageParameter
param
:
params
)
{
for
(
MessageParameter
param
:
params
)
{
String
jsonResp
=
param
.
getValue
().
replaceAll
(
"^\"|\"$"
,
""
);
String
jsonResp
=
param
.
getValue
().
replaceAll
(
"^\"|\"$"
,
""
);
// System.err.println(jsonResp);
Map
<
String
,
Object
>
kv
=
Converter
.
jsonString2Map
(
jsonResp
);
Map
<
String
,
Object
>
kv
=
Converter
.
jsonString2Map
(
jsonResp
);
info
.
putAll
(
kv
);
info
.
putAll
(
kv
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
View file @
e03fe094
...
@@ -830,8 +830,5 @@ public class ProvisionService {
...
@@ -830,8 +830,5 @@ public class ProvisionService {
}
}
private
void
parseDeleteResourcesResponse
(
List
<
MessageParameter
>
parameters
,
ProvisionResponse
provisionInfo
)
{
private
void
parseDeleteResourcesResponse
(
List
<
MessageParameter
>
parameters
,
ProvisionResponse
provisionInfo
)
{
// for (MessageParameter p : parameters) {
// System.err.println(p.getName() + " : " + p.getValue());
// }
}
}
}
}
drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/RootController.java
View file @
e03fe094
...
@@ -76,7 +76,6 @@ public class RootController {
...
@@ -76,7 +76,6 @@ public class RootController {
while
(
headerNames
.
hasMoreElements
())
{
while
(
headerNames
.
hasMoreElements
())
{
String
key
=
(
String
)
headerNames
.
nextElement
();
String
key
=
(
String
)
headerNames
.
nextElement
();
String
value
=
request
.
getHeader
(
key
);
String
value
=
request
.
getHeader
(
key
);
System
.
err
.
println
(
key
+
" : "
+
value
);
}
}
Application
result
=
new
Application
();
Application
result
=
new
Application
();
...
@@ -92,12 +91,8 @@ public class RootController {
...
@@ -92,12 +91,8 @@ public class RootController {
HandlerMethod
handlerMethod
=
entry
.
getValue
();
HandlerMethod
handlerMethod
=
entry
.
getValue
();
Object
object
=
handlerMethod
.
getBean
();
Object
object
=
handlerMethod
.
getBean
();
// System.err.println(object);
// System.err.println(object.getClass().getName());
// System.err.println(object.toString());
Object
bean
=
webApplicationContext
.
getBean
(
object
.
toString
());
Object
bean
=
webApplicationContext
.
getBean
(
object
.
toString
());
// System.err.println(bean.getClass().getName());
boolean
isRestContoller
=
bean
.
getClass
().
isAnnotationPresent
(
RestController
.
class
);
boolean
isRestContoller
=
bean
.
getClass
().
isAnnotationPresent
(
RestController
.
class
);
if
(
bean
.
getClass
().
getName
().
contains
(
"nl.uva.sne.drip.api.v1.rest"
))
{
if
(
bean
.
getClass
().
getName
().
contains
(
"nl.uva.sne.drip.api.v1.rest"
))
{
isRestContoller
=
true
;
isRestContoller
=
true
;
...
...
drip-api/src/test/java/nl/uva/sne/drip/api/v1/rest/TestCloudCredentialsController.java
View file @
e03fe094
...
@@ -68,21 +68,4 @@ public class TestCloudCredentialsController {
...
@@ -68,21 +68,4 @@ public class TestCloudCredentialsController {
public
void
testPostCredentials
()
throws
IOException
{
public
void
testPostCredentials
()
throws
IOException
{
}
}
// @Test
// public void testUpload() throws IOException {
// HttpClient client = HttpClientBuilder.create().build();
// HttpPost post = new HttpPost(url);
// MultipartEntityBuilder builder = MultipartEntityBuilder.create();
// builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
//
// FileBody fileBody = new FileBody(toscaFile);
// builder.addPart("file", fileBody);
// HttpEntity entity = builder.build();
// post.setEntity(entity);
//
// HttpResponse status = client.execute(post);
// System.err.println(status.getStatusLine());
// assertEquals(200, status.getStatusLine().getStatusCode());
////
// }
}
}
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