This is the codeAbility Sharing Platform! Learn more about the
codeAbility Sharing Platform
.
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
codeAbility Sharing Platform
Manage
Activity
Members
Labels
Plan
Issues
43
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
development
sharing
codeAbility Sharing Platform
Commits
e11f0056
Commit
e11f0056
authored
2 years ago
by
Eduard Frankford
Browse files
Options
Downloads
Patches
Plain Diff
bug_fix of gitlab api exception
parent
25cbbe62
2 merge requests
!149
Bring development to master level after bug fix
,
!146
Put the sonar-analyze job into a separate stage
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
+36
-33
36 additions, 33 deletions
...main/java/at/ac/uibk/gitsearch/service/SearchService.java
with
36 additions
and
33 deletions
src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
+
36
−
33
View file @
e11f0056
package
at.ac.uibk.gitsearch.service
;
import
at.ac.uibk.gitsearch.domain.util.TreeNode
;
import
at.ac.uibk.gitsearch.repository.gitlab.GitLabRepository
;
import
at.ac.uibk.gitsearch.repository.search.MetaDataRepository
;
import
at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum
;
import
at.ac.uibk.gitsearch.security.jwt.TokenProvider
;
import
at.ac.uibk.gitsearch.security.jwt.TokenProvider.GitLabAccessInfo
;
import
at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileOutputStream
;
...
...
@@ -19,7 +26,6 @@ import java.util.stream.Stream;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipInputStream
;
import
java.util.zip.ZipOutputStream
;
import
org.apache.commons.lang3.StringUtils
;
import
org.codeability.sharing.plugins.api.search.SearchInputDTO
;
import
org.codeability.sharing.plugins.api.search.SearchInputMetadataDTO
;
...
...
@@ -35,14 +41,6 @@ import org.springframework.security.core.userdetails.User;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.servlet.support.ServletUriComponentsBuilder
;
import
at.ac.uibk.gitsearch.domain.util.TreeNode
;
import
at.ac.uibk.gitsearch.repository.gitlab.GitLabRepository
;
import
at.ac.uibk.gitsearch.repository.search.MetaDataRepository
;
import
at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum
;
import
at.ac.uibk.gitsearch.security.jwt.TokenProvider
;
import
at.ac.uibk.gitsearch.security.jwt.TokenProvider.GitLabAccessInfo
;
import
at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry
;
/**
* Service for exercise/course search results
* <p>
...
...
@@ -53,27 +51,33 @@ public class SearchService {
private
final
Logger
log
=
LoggerFactory
.
getLogger
(
SearchService
.
class
);
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
MetaDataRepository
metaDataRepository
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
TokenProvider
tokenProvider
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
GitLabRepository
gitLabRepository
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
GitlabService
gitlabService
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
PluginManagementService
pluginManagementService
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
ShoppingBasketService
shoppingBasketService
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
private
ZipRepackagingService
zipRepackagingService
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
MetaDataRepository
metaDataRepository
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
TokenProvider
tokenProvider
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
GitLabRepository
gitLabRepository
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
GitlabService
gitlabService
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
PluginManagementService
pluginManagementService
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
protected
ShoppingBasketService
shoppingBasketService
;
@Autowired
@SuppressWarnings
(
"PMD.ImmutableField"
)
private
ZipRepackagingService
zipRepackagingService
;
/**
* returns all keyword autocompletes for keyWord
...
...
@@ -337,8 +341,7 @@ public class SearchService {
filter
=
Optional
.
of
(
exerciseTree
);
}
}
InputStream
project
=
zipRepackagingService
.
rePackageGitLabProjectZip
(
InputStream
project
=
zipRepackagingService
.
rePackageGitLabProjectZip
(
new
ZipInputStream
(
repositoryArchive
),
"from project "
+
exerciseId
.
getProjectId
(),
filter
,
...
...
@@ -490,7 +493,7 @@ public class SearchService {
try
{
final
Optional
<
GitLabAccessInfo
>
gitLabAccessInfo
=
tokenProvider
.
getGitLabAccessInfo
();
GitLabApi
gitLabApi
=
gitLabRepository
.
getGitLabApi
(
gitLabAccessInfo
);
gitLabApi
.
getRepositoryApi
().
getRepositoryArchive
(
result
.
getProject
().
getProject_id
(),
"HEAD"
,
"zip"
);
gitLabApi
.
getRepositoryApi
().
getRepositoryArchive
(
Integer
.
toString
(
result
.
getProject
().
getProject_id
()
)
,
"HEAD"
,
"zip"
);
}
catch
(
GitLabApiException
|
NullPointerException
e
)
{
// TODO NullPointerException thrown if gitLabAccessInfo.isEmpty(): make it more elegant
// We expect permissions missing
result
.
setSupportedActions
(
...
...
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