-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
120 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,12 @@ | |
|
||
更新日志文档,版本顺序从新到旧,最新版本在最前(上)面。 | ||
|
||
# 0.15.11 | ||
|
||
## 插件支持 | ||
|
||
- 添加`MetaOperate`以支持插件调用三方元数据插件条目查寻 | ||
|
||
# 0.15.10 | ||
|
||
## 问题修复 | ||
|
9 changes: 9 additions & 0 deletions
9
api/src/main/java/run/ikaros/api/core/meta/DelegateMetaService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package run.ikaros.api.core.meta; | ||
|
||
import org.pf4j.ExtensionPoint; | ||
import reactor.core.publisher.Flux; | ||
import run.ikaros.api.core.subject.SubjectMeta; | ||
|
||
public interface DelegateMetaService extends ExtensionPoint { | ||
Flux<SubjectMeta> findAll(String keyword); | ||
} |
12 changes: 12 additions & 0 deletions
12
api/src/main/java/run/ikaros/api/core/meta/MetaOperate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package run.ikaros.api.core.meta; | ||
|
||
import reactor.core.publisher.Flux; | ||
import reactor.core.publisher.Mono; | ||
import run.ikaros.api.core.subject.SubjectMeta; | ||
import run.ikaros.api.plugin.AllowPluginOperate; | ||
|
||
public interface MetaOperate extends AllowPluginOperate { | ||
Mono<SubjectMeta> findOne(String keyword); | ||
|
||
Flux<SubjectMeta> findAll(String keyword); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
version=0.15.10 | ||
version=0.15.11 |
50 changes: 50 additions & 0 deletions
50
server/src/main/java/run/ikaros/server/core/meta/DefaultMetaService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
package run.ikaros.server.core.meta; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.stereotype.Service; | ||
import reactor.core.publisher.Flux; | ||
import reactor.core.publisher.Mono; | ||
import run.ikaros.api.core.meta.DelegateMetaService; | ||
import run.ikaros.api.core.subject.SubjectMeta; | ||
import run.ikaros.api.infra.utils.AssertUtils; | ||
import run.ikaros.server.plugin.ExtensionComponentsFinder; | ||
|
||
@Slf4j | ||
@Service | ||
public class DefaultMetaService implements MetaService { | ||
|
||
private final ExtensionComponentsFinder extensionComponentsFinder; | ||
|
||
public DefaultMetaService(ExtensionComponentsFinder extensionComponentsFinder) { | ||
this.extensionComponentsFinder = extensionComponentsFinder; | ||
} | ||
|
||
@Override | ||
public Mono<SubjectMeta> findOne(String keyword) { | ||
AssertUtils.notBlank(keyword, "'keyword' has not blank."); | ||
return findAll(keyword) | ||
.collectList() | ||
.filter(list -> !list.isEmpty()) | ||
.flatMap(list -> Mono.justOrEmpty(list.get(0))); | ||
} | ||
|
||
@Override | ||
public Flux<SubjectMeta> findAll(String keyword) { | ||
AssertUtils.notBlank(keyword, "'keyword' has not blank."); | ||
List<DelegateMetaService> metaService = | ||
extensionComponentsFinder.getExtensions(DelegateMetaService.class); | ||
return Flux.fromStream(metaService.stream()) | ||
.flatMap(service -> service.findAll(keyword).collectList()) | ||
.collectList() | ||
.map(list -> { | ||
List<SubjectMeta> subjectMetas = new ArrayList<>(); | ||
for (List<SubjectMeta> metas : list) { | ||
subjectMetas.addAll(metas); | ||
} | ||
return subjectMetas; | ||
}) | ||
.flatMapMany(Flux::fromIterable); | ||
} | ||
} |
28 changes: 28 additions & 0 deletions
28
server/src/main/java/run/ikaros/server/core/meta/MetaOperator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package run.ikaros.server.core.meta; | ||
|
||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.stereotype.Component; | ||
import reactor.core.publisher.Flux; | ||
import reactor.core.publisher.Mono; | ||
import run.ikaros.api.core.meta.MetaOperate; | ||
import run.ikaros.api.core.subject.SubjectMeta; | ||
|
||
@Slf4j | ||
@Component | ||
public class MetaOperator implements MetaOperate { | ||
private final MetaService metaService; | ||
|
||
public MetaOperator(MetaService metaService) { | ||
this.metaService = metaService; | ||
} | ||
|
||
@Override | ||
public Mono<SubjectMeta> findOne(String keyword) { | ||
return metaService.findOne(keyword); | ||
} | ||
|
||
@Override | ||
public Flux<SubjectMeta> findAll(String keyword) { | ||
return metaService.findAll(keyword); | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
server/src/main/java/run/ikaros/server/core/meta/MetaService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package run.ikaros.server.core.meta; | ||
|
||
import reactor.core.publisher.Flux; | ||
import reactor.core.publisher.Mono; | ||
import run.ikaros.api.core.subject.SubjectMeta; | ||
|
||
/** | ||
* Meta service. | ||
*/ | ||
public interface MetaService { | ||
Mono<SubjectMeta> findOne(String keyword); | ||
|
||
Flux<SubjectMeta> findAll(String keyword); | ||
} |