Skip to content

Commit

Permalink
Compatibility with nexus 3.38
Browse files Browse the repository at this point in the history 
* upgrade gradle nexus dependencies
* fix java.lang.NoSuchMethodError: org.sonatype.nexus.repository.search.SearchService.searchUnrestricted exception by switching to SearchService.search method
* change data model to nexus 3.38 SearchService.search function model
  • Loading branch information
@kugacz
kugacz committed Apr 29, 2022
1 parent d4e3c47 commit e615e11
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 34 deletions.
6 changes: 3 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ repositories {

dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.29.2-02'
compileOnly group: 'org.sonatype.nexus', name: 'nexus-repository', version: '3.29.2-02'
compileOnly group: 'org.sonatype.nexus', name: 'nexus-rest', version: '3.29.2-02'
compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.38.1-01'
compileOnly group: 'org.sonatype.nexus', name: 'nexus-repository', version: '3.38.1-01'
compileOnly group: 'org.sonatype.nexus', name: 'nexus-rest', version: '3.38.1-01'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.18'
}

Expand Down
54 changes: 23 additions & 31 deletions src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,11 @@
package com.nongfenqi.nexus.plugin.rundeck;

import org.apache.http.client.utils.DateUtils;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.sort.FieldSortBuilder;
import org.elasticsearch.search.sort.SortOrder;
import org.sonatype.nexus.repository.search.*;
import org.sonatype.goodies.common.ComponentSupport;
import org.sonatype.nexus.blobstore.api.Blob;
import org.sonatype.nexus.repository.Repository;
import org.sonatype.nexus.repository.manager.RepositoryManager;
import org.sonatype.nexus.repository.search.SearchService;
import org.sonatype.nexus.repository.storage.Asset;
import org.sonatype.nexus.repository.storage.Bucket;
import org.sonatype.nexus.repository.storage.StorageFacet;
Expand All @@ -43,8 +38,6 @@
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
Expand All @@ -54,8 +47,6 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
import static org.sonatype.nexus.common.text.Strings2.isBlank;

@Named
Expand Down Expand Up @@ -158,34 +149,36 @@ public List<RundeckXO> version(

log.debug("param value, repository: {}, limit: {}, groupId: {}, artifactId: {}, classifier: {}, extension: {}", repository, limit, groupId, artifactId, classifier, extension);

BoolQueryBuilder query = boolQuery();
query.filter(termQuery("format", "maven2"));
SearchRequest.Builder searchRequestBuilder = SearchRequest.builder();
searchRequestBuilder.searchFilter("format", "maven2");

if (!isBlank(repository)) {
query.filter(termQuery("repository_name", repository));
searchRequestBuilder.searchFilter("repository_name", repository);
}
if (!isBlank(groupId)) {
query.filter(termQuery("attributes.maven2.groupId", groupId));
searchRequestBuilder.searchFilter("attributes.maven2.groupId", groupId);
}
if (!isBlank(artifactId)) {
query.filter(termQuery("attributes.maven2.artifactId", artifactId));
searchRequestBuilder.searchFilter("attributes.maven2.artifactId", artifactId);
}
if (!isBlank(classifier)) {
query.filter(termQuery("assets.attributes.maven2.classifier", classifier));
searchRequestBuilder.searchFilter("assets.attributes.maven2.classifier", classifier);
}
if (!isBlank(extension)) {
query.filter(termQuery("assets.attributes.maven2.extension", extension));
searchRequestBuilder.searchFilter("assets.attributes.maven2.extension", extension);
}

log.debug("rundeck maven version query: {}", query);
SearchResponse result = searchService.searchUnrestricted(
query,
Collections.singletonList(new FieldSortBuilder("assets.attributes.content.last_modified").order(SortOrder.DESC)),
0,
limit
);
return Arrays.stream(result.getHits().hits())
.map(this::his2RundeckXO)
searchRequestBuilder.offset(0)
.limit(limit)
.sortField("assets.attributes.content.last_modified")
.sortDirection(SortDirection.DESC);

SearchRequest searchRequest = searchRequestBuilder.build();
log.debug("rundeck maven version query: {}", searchRequest);

SearchResponse result = searchService.search(searchRequest);
return result.getSearchResults().stream()
.map(this::searchResults2RundeckXO)
.collect(Collectors.toList());
}

Expand All @@ -197,11 +190,10 @@ private String latestVersion(String repositoryName, String groupId, String artif
return null;
}

private RundeckXO his2RundeckXO(SearchHit hit) {
String version = (String) hit.getSource().get("version");

List<Map<String, Object>> assets = (List<Map<String, Object>>) hit.getSource().get("assets");
Map<String, Object> attributes = (Map<String, Object>) assets.get(0).get("attributes");
private RundeckXO searchResults2RundeckXO(ComponentSearchResult componentSearchResult) {
String version = componentSearchResult.getVersion();
List<AssetSearchResult> assets = componentSearchResult.getAssets();
Map<String, Object> attributes = assets.get(0).getAttributes();
Map<String, Object> content = (Map<String, Object>) attributes.get("content");
String lastModifiedTime = "null";
if (content != null && content.containsKey("last_modified")) {
Expand Down

0 comments on commit e615e11

Please sign in to comment.