Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
CTF
Project
Project
Details
Activity
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grzegorz
CTF
Commits
9bef56cd
Commit
9bef56cd
authored
Apr 01, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix url joiner
parent
35e9115f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
WebTask.java
.../com/telephoners/krakyournet/ctf/beans/tasks/WebTask.java
+2
-2
SolutionsResource.java
...ephoners/krakyournet/ctf/resources/SolutionsResource.java
+2
-2
TaskResource.java
...m/telephoners/krakyournet/ctf/resources/TaskResource.java
+0
-1
No files found.
service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/WebTask.java
View file @
9bef56cd
...
@@ -21,7 +21,7 @@ import java.util.List;
...
@@ -21,7 +21,7 @@ import java.util.List;
public
class
WebTask
extends
Task
public
class
WebTask
extends
Task
{
{
private
String
url
;
private
String
url
;
private
final
Joiner
urlJoiner
=
Joiner
.
on
(
"/"
);
private
static
final
Joiner
URL_JOINER
=
Joiner
.
on
(
"/"
);
public
WebTask
(
String
name
,
int
level
,
List
<
Flag
>
flags
,
String
url
)
public
WebTask
(
String
name
,
int
level
,
List
<
Flag
>
flags
,
String
url
)
{
{
...
@@ -35,7 +35,7 @@ public class WebTask extends Task
...
@@ -35,7 +35,7 @@ public class WebTask extends Task
public
String
getTextForUser
(
User
user
,
String
path
)
throws
IOException
public
String
getTextForUser
(
User
user
,
String
path
)
throws
IOException
{
{
String
url
=
urlJoiner
.
join
(
getUrl
(),
path
);
String
url
=
URL_JOINER
.
join
(
getUrl
(),
path
);
return
StreamUtils
.
readStream
(
proxyRequest
(
url
,
user
));
return
StreamUtils
.
readStream
(
proxyRequest
(
url
,
user
));
}
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/SolutionsResource.java
View file @
9bef56cd
...
@@ -70,7 +70,7 @@ public class SolutionsResource
...
@@ -70,7 +70,7 @@ public class SolutionsResource
.
stream
()
.
stream
()
.
collect
(
Collectors
.
toMap
(
.
collect
(
Collectors
.
toMap
(
Team:
:
getName
,
Team:
:
getName
,
team
->
solutionsRepository
.
getCompletedTasks
(
team
)
solutionsRepository:
:
getCompletedTasks
));
));
}
}
...
@@ -82,7 +82,7 @@ public class SolutionsResource
...
@@ -82,7 +82,7 @@ public class SolutionsResource
.
stream
()
.
stream
()
.
collect
(
Collectors
.
toMap
(
.
collect
(
Collectors
.
toMap
(
Team:
:
getName
,
Team:
:
getName
,
team
->
solutionsRepository
.
getTeamSolutions
(
team
)
solutionsRepository:
:
getTeamSolutions
));
));
}
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/TaskResource.java
View file @
9bef56cd
package
com
.
telephoners
.
krakyournet
.
ctf
.
resources
;
package
com
.
telephoners
.
krakyournet
.
ctf
.
resources
;
import
com.google.common.base.Joiner
;
import
com.telephoners.krakyournet.ctf.beans.User
;
import
com.telephoners.krakyournet.ctf.beans.User
;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.repositories.TasksRepository
;
import
com.telephoners.krakyournet.ctf.repositories.TasksRepository
;
...
...
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