Skip to content

Commit f55dfbf

Browse files
wuayeewuayee
andauthored
[fel] 更新 ToolInfo 对象中 uniqueName 的获取逻辑,并迁移一部分内部接口 (#122)
Co-authored-by: wuayee <[email protected]>
1 parent e74eb46 commit f55dfbf

File tree

29 files changed

+35
-451
lines changed

29 files changed

+35
-451
lines changed

framework/fel/java/components/pom.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

framework/fel/java/plugins/tool-discoverer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<artifactId>fit-build-maven-plugin</artifactId>
5959
<version>${fit.version}</version>
6060
<configuration>
61-
<category>system</category>
62-
<level>5</level>
61+
<category>user</category>
62+
<level>2</level>
6363
</configuration>
6464
<executions>
6565
<execution>

framework/fel/java/plugins/tool-executor/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<artifactId>fit-build-maven-plugin</artifactId>
5959
<version>${fit.version}</version>
6060
<configuration>
61-
<category>system</category>
62-
<level>6</level>
61+
<category>user</category>
62+
<level>2</level>
6363
</configuration>
6464
<executions>
6565
<execution>

framework/fel/java/plugins/tool-factory-repository/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<artifactId>fit-build-maven-plugin</artifactId>
3737
<version>${fit.version}</version>
3838
<configuration>
39-
<category>system</category>
40-
<level>4</level>
39+
<category>user</category>
40+
<level>2</level>
4141
</configuration>
4242
<executions>
4343
<execution>

framework/fel/java/plugins/tool-factory-repository/src/main/java/modelengine/fel/tool/support/DefaultToolFactoryRepository.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import modelengine.fel.tool.ToolFactoryRepository;
1111
import modelengine.fitframework.annotation.Component;
1212
import modelengine.fitframework.log.Logger;
13+
import modelengine.fitframework.util.StringUtils;
1314

1415
import java.util.Map;
1516
import java.util.Optional;
@@ -33,7 +34,7 @@ public void register(ToolFactory factory) {
3334
if (factory == null) {
3435
return;
3536
}
36-
this.factoryCache.put(factory.type(), factory);
37+
this.factoryCache.put(StringUtils.toUpperCase(factory.type()), factory);
3738
log.info("Register factory[type={}] success.", factory.type());
3839
}
3940

@@ -42,12 +43,16 @@ public void unregister(ToolFactory factory) {
4243
if (factory == null) {
4344
return;
4445
}
45-
this.factoryCache.remove(factory.type());
46+
this.factoryCache.remove(StringUtils.toUpperCase(factory.type()));
4647
log.info("Unregister factory[type={}] success.", factory.type());
4748
}
4849

4950
@Override
5051
public Optional<ToolFactory> match(Set<String> runnables) {
51-
return runnables.stream().filter(this.factoryCache::containsKey).map(this.factoryCache::get).findFirst();
52+
return runnables.stream()
53+
.map(StringUtils::toUpperCase)
54+
.filter(this.factoryCache::containsKey)
55+
.map(this.factoryCache::get)
56+
.findFirst();
5257
}
5358
}

framework/fel/java/plugins/tool-repository-simple/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<artifactId>fit-build-maven-plugin</artifactId>
4242
<version>${fit.version}</version>
4343
<configuration>
44-
<category>system</category>
45-
<level>4</level>
44+
<category>user</category>
45+
<level>1</level>
4646
</configuration>
4747
<executions>
4848
<execution>

framework/fel/java/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
</scm>
3737

3838
<modules>
39-
<module>components</module>
4039
<module>fel-community</module>
4140
<module>fel-core</module>
4241
<module>fel-flow</module>

framework/fel/java/services/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<packaging>pom</packaging>
1414

1515
<modules>
16+
<module>tool-info</module>
1617
<module>tool-service</module>
1718
</modules>
1819

framework/fel/java/components/tool-info/pom.xml renamed to framework/fel/java/services/tool-info/pom.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<parent>
77
<groupId>org.fitframework.fel</groupId>
8-
<artifactId>fel-component-parent</artifactId>
8+
<artifactId>fel-parent</artifactId>
99
<version>3.5.0-SNAPSHOT</version>
1010
</parent>
1111

@@ -20,6 +20,19 @@
2020

2121
<build>
2222
<plugins>
23+
<plugin>
24+
<groupId>org.fitframework</groupId>
25+
<artifactId>fit-build-maven-plugin</artifactId>
26+
<version>${fit.version}</version>
27+
<executions>
28+
<execution>
29+
<id>build-service</id>
30+
<goals>
31+
<goal>build-service</goal>
32+
</goals>
33+
</execution>
34+
</executions>
35+
</plugin>
2336
<plugin>
2437
<groupId>org.fitframework</groupId>
2538
<artifactId>fit-dependency-maven-plugin</artifactId>

framework/fel/java/components/tool-info/src/main/java/modelengine/fel/tool/info/entity/DefinitionEntity.java renamed to framework/fel/java/services/tool-info/src/main/java/modelengine/fel/tool/info/entity/DefinitionEntity.java

File renamed without changes.

0 commit comments

Comments
 (0)