Skip to content

Commit 4970203

Browse files
author
张立志
committed
1.0.4-RELEASE
1 parent 501796e commit 4970203

File tree

114 files changed

+279
-5703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+279
-5703
lines changed

Diff for: ‎pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
<module>sparrow-json</module>
4040
<module>sparrow-log</module>
4141
<module>sparrow-rocketmq-client</module>
42-
<module>sparrow-jedis</module>
43-
<module>sparrow-jedis-cluster</module>
4442
<module>sparrow-markdown</module>
4543
<module>sparrow-registry</module>
4644
<module>sparrow-aop</module>
@@ -50,9 +48,7 @@
5048
<module>sparrow-test</module>
5149
<module>sparrow-protocol-dao</module>
5250
<module>sparrow-protocol-mq</module>
53-
<module>sparrow-protocol-redis</module>
5451
<module>sparrow-mvc-thymeleaf</module>
55-
<!--<module>sparrow-lettuce-cluster</module>-->
5652
</modules>
5753

5854
<build>

Diff for: ‎sparrow-aop/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.3.1-RELEASE</version>
8+
<version>1.0.4-RELEASE</version>
99
<relativePath/>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
12-
<version>1.0.3.1-RELEASE</version>
12+
<version>1.0.4-RELEASE</version>
1313
<artifactId>sparrow-aop</artifactId>
1414
<properties>
1515
<curator.version>2.10.0</curator.version>

Diff for: ‎sparrow-container/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.3.1-RELEASE</version>
25+
<version>1.0.4-RELEASE</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929
<artifactId>sparrow-container</artifactId>
30-
<version>1.0.3.1-RELEASE</version>
30+
<version>1.0.4-RELEASE</version>
3131
<dependencies>
3232
<dependency>
3333
<groupId>com.sparrowzoo</groupId>
@@ -37,7 +37,6 @@
3737
<groupId>javax.inject</groupId>
3838
<artifactId>javax.inject</artifactId>
3939
</dependency>
40-
4140
</dependencies>
4241
<build>
4342
<finalName>${project.artifactId}</finalName>

Diff for: ‎sparrow-container/src/main/java/com/sparrow/container/impl/SparrowContainer.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package com.sparrow.container.impl;
1818

19-
import com.sparrow.cache.exception.CacheNotFoundException;
2019
import com.sparrow.constant.Config;
2120
import com.sparrow.constant.SysObjectName;
2221
import com.sparrow.container.AbstractContainer;
@@ -36,7 +35,9 @@
3635
import com.sparrow.support.Initializer;
3736
import com.sparrow.utility.ConfigUtility;
3837
import com.sparrow.utility.StringUtility;
38+
3939
import java.util.Iterator;
40+
4041
import org.slf4j.Logger;
4142
import org.slf4j.LoggerFactory;
4243

@@ -121,7 +122,7 @@ public void init(ContainerBuilder builder) {
121122
logger.info("-------------init initializer ...--------------------------");
122123
if (builder.isInitSingletonBean()) {
123124
Initializer initializer = this.getBean(
124-
SysObjectName.INITIALIZER);
125+
SysObjectName.INITIALIZER);
125126

126127
if (initializer != null) {
127128
initializer.init(this);
@@ -169,23 +170,23 @@ private void initSingletonBeans(SimpleBeanDefinitionRegistry registry) {
169170
}
170171
}
171172

172-
private void initSystemConfig() throws CacheNotFoundException {
173+
private void initSystemConfig() {
173174
if (StringUtility.isNullOrEmpty(this.builder.getConfigLocation())) {
174175
return;
175176
}
176177
ConfigUtility.initSystem(this.builder.getConfigLocation());
177178
String internationalization = ConfigUtility
178-
.getValue(Config.INTERNATIONALIZATION);
179+
.getValue(Config.INTERNATIONALIZATION);
179180

180181
if (StringUtility.isNullOrEmpty(internationalization)) {
181182
internationalization = ConfigUtility
182-
.getValue(Config.LANGUAGE);
183+
.getValue(Config.LANGUAGE);
183184
}
184185
if (StringUtility.isNullOrEmpty(internationalization)) {
185186
internationalization = Constant.DEFAULT_LANGUAGE;
186187
}
187188
String[] internationalizationArray = internationalization
188-
.split(Symbol.COMMA);
189+
.split(Symbol.COMMA);
189190
for (String i18n : internationalizationArray) {
190191
ConfigUtility.initInternationalization(i18n);
191192
}

Diff for: ‎sparrow-data-source/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.3.1-RELEASE</version>
25+
<version>1.0.4-RELEASE</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
29-
<version>1.0.3.1-RELEASE</version>
29+
<version>1.0.4-RELEASE</version>
3030
<artifactId>sparrow-data-source</artifactId>
3131

3232
<dependencies>

Diff for: ‎sparrow-distribution-config/.gitignore

-6
This file was deleted.

Diff for: ‎sparrow-distribution-config/README.md

-1
This file was deleted.

Diff for: ‎sparrow-distribution-config/distribution-config-client-file-repository/.gitignore

-6
This file was deleted.

Diff for: ‎sparrow-distribution-config/distribution-config-client-file-repository/pom.xml

-38
This file was deleted.

Diff for: ‎sparrow-distribution-config/distribution-config-client-file-repository/src/main/java/com/sparrow/distribution/config/repository/local/file/FilePropertiesContainer.java

-54
This file was deleted.

Diff for: ‎sparrow-distribution-config/distribution-config-client-file-repository/src/main/java/com/sparrow/distribution/config/repository/local/file/FileRepository.java

-81
This file was deleted.

Diff for: ‎sparrow-distribution-config/distribution-config-client/.gitignore

-6
This file was deleted.

Diff for: ‎sparrow-distribution-config/distribution-config-client/pom.xml

-44
This file was deleted.

0 commit comments

Comments
 (0)