Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature naming group #902

Merged
merged 125 commits into from
Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
f0a8ece
#502 Add new consistency package
nkorange Jan 7, 2019
82fd3df
Merge branch 'feature_multi_tenant' into feature_naming_ap
nkorange Jan 13, 2019
baa4b4c
#502 Update pom version
nkorange Jan 13, 2019
93f9446
#502 Refactor raft implementation
nkorange Jan 14, 2019
4cfae1b
#502 Clean code
nkorange Jan 14, 2019
d0bfc0e
Merge branch 'feature_multi_tenant' into feature_naming_ap
nkorange Jan 14, 2019
65408a6
Merge branch 'feature_subscription_by_query_optional' into feature_mu…
nkorange Jan 15, 2019
425a801
Merge branch 'feature_multi_tenant' into feature_naming_ap
nkorange Jan 15, 2019
b5f09f6
#502 make build pass
nkorange Jan 16, 2019
980e2a6
Merge branch 'feature_multi_tenant' into feature_naming_ap
nkorange Jan 16, 2019
7fa9c3a
#502 merge code
nkorange Jan 16, 2019
806e703
#502 Fix bean inject error
nkorange Jan 17, 2019
0e76f55
#502 Fix health check processor inject bean failed problem
nkorange Jan 17, 2019
cc1f664
#502 Fix error log print
nkorange Jan 17, 2019
38e84cf
#502 Fix PMD
nkorange Jan 17, 2019
d064fe3
Merge branch 'develop' into feature_naming_ap
nkorange Jan 18, 2019
bf80ff1
#650 Add ServerListManager
nkorange Jan 19, 2019
f2b43fb
#502 Update author information
nkorange Jan 19, 2019
330fc4e
#502 Partition consistency start coding
nkorange Jan 20, 2019
e9ddfd7
#502 Receive data sync
nkorange Jan 21, 2019
a72467e
Merge branch 'feature_multi_tenant' into feature_naming_ap
nkorange Jan 21, 2019
257f54a
#502 Refactor data model
nkorange Jan 21, 2019
cc9b6b5
Merge branch 'develop' into feature_naming_ap
nkorange Jan 22, 2019
bc4d4d3
#502 Partition Protocol develop finished
nkorange Jan 22, 2019
cd8f079
Merge branch 'develop' into feature_naming_ap
nkorange Jan 22, 2019
0eb0e17
Merge branch 'develop' into feature_naming_ap
nkorange Jan 22, 2019
58acdb1
#651 Remove APICommands
nkorange Jan 22, 2019
19b785b
Merge branch 'develop' into feature_naming_ap
nkorange Jan 23, 2019
6ebde67
#502 Reorganize parameter mapping.
nkorange Jan 23, 2019
a77076a
Merge branch 'master' into feature_naming_ap
nkorange Jan 23, 2019
0e0900b
#677 Add ephemeral instance implementation
nkorange Jan 24, 2019
41c60ab
#677 Add ephemeral instance implementation
nkorange Jan 24, 2019
4560b3c
Merge branch 'develop' into feature_naming_ap
nkorange Jan 25, 2019
8d0c5ad
#502 datum key refactor
nkorange Jan 26, 2019
e3440fe
#502 tuning Serializer
nkorange Jan 26, 2019
caf7213
#502 Fix serialize problem and do some refactoring for health check
nkorange Jan 27, 2019
d3a4834
#650 Server list manager detects healthy servers
nkorange Jan 30, 2019
4c03773
#502 Fix bug
nkorange Jan 30, 2019
98ab392
#502 Fix bug
nkorange Jan 31, 2019
e2e11ba
#502 Most of the functions test OK.
nkorange Feb 1, 2019
ab56211
#502 Fix HTTP 302 use GET problem.
nkorange Feb 1, 2019
026ec98
#502 Fix test case not pass problem
nkorange Feb 2, 2019
cba85f0
#502 Fix licence problem
nkorange Feb 2, 2019
58b8d16
#744 Add server status, #629 Add partition service warm up logic
nkorange Feb 9, 2019
3b051f0
#629 Raft service warm up
nkorange Feb 9, 2019
4fe7c3d
#631 Use protect threshold
nkorange Feb 9, 2019
194387b
#745 Support multiple server modes
nkorange Feb 11, 2019
78bf52f
#502 Add retry delay
nkorange Feb 11, 2019
81dd9fb
#745 Support service creation in AP mode
nkorange Feb 12, 2019
846c23c
#502 Fix write switch file error
nkorange Feb 12, 2019
9783240
#269 Support service group
nkorange Feb 13, 2019
d340f4b
#502 get ephemeral instance count
nkorange Feb 13, 2019
e24e836
#757 domain to service
nkorange Feb 14, 2019
3735142
#757 domain to service 90%
nkorange Feb 14, 2019
cd18124
Merge branch 'feature_validate_service_format' into feature_naming_ap
nkorange Feb 14, 2019
dd9db82
Merge develop
nkorange Feb 14, 2019
469d976
#502 Fix sync timestamp repeat bug
nkorange Feb 15, 2019
4e6efbd
#502 Use Record as data base type
nkorange Feb 17, 2019
9f5f8bb
#634 Add push switch
nkorange Feb 18, 2019
36b9b95
#634 Fix test case
nkorange Feb 18, 2019
ede55b0
Merge branch 'develop' into feature_naming_ap
nkorange Feb 18, 2019
9409ebf
Merge branch 'feature_naming_ap' into feature_naming_group
nkorange Feb 18, 2019
c541ad9
Make SwitchDomain fields private
nkorange Feb 18, 2019
ce610d4
Merge branch 'feature_naming_ap' into feature_naming_group
nkorange Feb 18, 2019
7af1b48
#269 Support service group
nkorange Feb 18, 2019
71af535
#502 Rename key
nkorange Feb 20, 2019
918dcf9
#502 Fix bug
nkorange Feb 20, 2019
091e2e0
#502 Add distro annotation
nkorange Feb 21, 2019
b8f4e86
#502 Add distro annotation
nkorange Feb 21, 2019
59c2765
Fix #809
nkorange Feb 22, 2019
862ff80
#502 Support update instance
nkorange Feb 22, 2019
8d762a5
#502 User server proxy instead of client proxy
nkorange Feb 22, 2019
871a482
#502 validate instead of valid
nkorange Feb 24, 2019
4937159
Merge branch 'develop' into feature_naming_group
nkorange Feb 26, 2019
ddf194e
Fix merge conflicts
nkorange Feb 27, 2019
eb4cd01
#839 rename update switch method
nkorange Feb 28, 2019
39f63f3
#502 fix method name error
nkorange Mar 4, 2019
616a803
Merge branch 'develop' into feature_naming_group
nkorange Mar 4, 2019
af26af7
#502 fix bug
nkorange Mar 4, 2019
8c23f34
#269 fix bug
nkorange Mar 4, 2019
f173292
#502 Add licence
nkorange Mar 5, 2019
9cb683e
#502 Fix filter bug
nkorange Mar 5, 2019
dd9866a
add group testcase
Mar 5, 2019
116e911
#269 fix send client beat bug
nkorange Mar 5, 2019
8e6fb90
add group test
Mar 5, 2019
8293662
Merge branch 'feature_naming_group' of https://github.com/alibaba/nac…
Mar 5, 2019
d067ab5
delete testcase info
Mar 5, 2019
7947fc2
#269 fix bug
nkorange Mar 5, 2019
42cd539
Merge remote-tracking branch 'origin/feature_naming_group' into featu…
nkorange Mar 5, 2019
a4155fd
#269 fix test case bug
nkorange Mar 5, 2019
349ea92
#502 fix bug
nkorange Mar 5, 2019
f186219
fix bug“
Mar 5, 2019
c9ab9e7
#269 fix bug
nkorange Mar 5, 2019
344b973
Merge remote-tracking branch 'origin/feature_naming_group' into featu…
nkorange Mar 5, 2019
160f4f8
#502 filter refactor
nkorange Mar 5, 2019
c4ad088
#869 Clarify exception message
nkorange Mar 6, 2019
d477bbc
#502 validate instance format
nkorange Mar 6, 2019
5f41f0a
增加group用例
Mar 6, 2019
79f83f3
#502 Refactor warm up
nkorange Mar 6, 2019
d741c02
Merge remote-tracking branch 'origin/feature_naming_group' into featu…
nkorange Mar 6, 2019
dd0bd51
Fix #866
nkorange Mar 6, 2019
bf2f611
Fix #865
nkorange Mar 6, 2019
82ec466
#629 refactor warm up
nkorange Mar 7, 2019
4704200
#839 Rest of methods refactored.
nkorange Mar 7, 2019
dae2809
Merge branch 'develop' into feature_naming_group
nkorange Mar 7, 2019
366d9f3
Fix merge conflict
nkorange Mar 7, 2019
a03d29a
add cp mode testcases
Mar 7, 2019
895431d
Merge branch 'feature_naming_group' of https://github.com/alibaba/nac…
Mar 7, 2019
fb8cf7d
Fix config name error
nkorange Mar 8, 2019
6ae100e
Fix http client error
nkorange Mar 8, 2019
4a2e1be
增加接口用例
Mar 8, 2019
8d28958
#629 Fix bug
nkorange Mar 8, 2019
b75ea9f
Merge remote-tracking branch 'origin/feature_naming_group' into featu…
nkorange Mar 8, 2019
ca4a303
add instance api
Mar 11, 2019
5f07ce9
Fix #869
nkorange Mar 11, 2019
3e43a5a
Merge remote-tracking branch 'origin/feature_naming_group' into featu…
nkorange Mar 11, 2019
ac67b95
Merge branch 'develop' into feature_naming_group
nkorange Mar 11, 2019
ecc52cd
#651 keep some methods
nkorange Mar 11, 2019
08159d8
#502 fix bug
nkorange Mar 12, 2019
9a0978a
delete intance before removeBeat in AP mode
Mar 13, 2019
e7171c0
Merge branch 'feature_naming_group' of https://github.com/alibaba/nac…
Mar 13, 2019
f0c71e6
#502 fix bug
nkorange Mar 13, 2019
902a77a
Merge branch 'develop' into feature_naming_group
nkorange Mar 13, 2019
6034bdb
#502 Compatible with 0.8.0
nkorange Mar 14, 2019
86b5241
Merge branch 'develop' into feature_naming_group
nkorange Mar 14, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.9.1</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.Map;

/**
* @author <a href="mailto:[email protected]">nkorange</a>
* @author nkorange
* @since 0.7.0
*/
public class Entity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package com.alibaba.nacos.api.cmdb.pojo;

/**
* @author <a href="mailto:[email protected]">nkorange</a>
* @author nkorange
* @since 0.7.0
*/
public class EntityEvent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package com.alibaba.nacos.api.cmdb.pojo;

/**
* @author <a href="mailto:[email protected]">nkorange</a>
* @author nkorange
* @since 0.7.0
*/
public enum EntityEventType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.Set;

/**
* @author <a href="mailto:[email protected]">nkorange</a>
* @author nkorange
* @since 0.7.0
*/
public class Label {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package com.alibaba.nacos.api.cmdb.pojo;

/**
* @author <a href="mailto:[email protected]">nkorange</a>
* @author nkorange
* @since 0.7.0
*/
public enum PreservedEntityTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* Service to visit CMDB store
*
* @author <a href="mailto:[email protected]">nkorange</a>
* @author nkorange
* @since 0.7.0
*/
public interface CmdbService {
Expand Down
16 changes: 8 additions & 8 deletions api/src/main/java/com/alibaba/nacos/api/common/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
*/
public class Constants {

public static final String CLIENT_VERSION_HEADER = "Client-Version";

public static final String CLIENT_VERSION = "3.0.0";

public static int DATA_IN_BODY_VERSION = 204;
Expand Down Expand Up @@ -121,11 +119,13 @@ public class Constants {
public static final int NAMING_INSTANCE_ID_SEG_COUNT = 4;
public static final String NAMING_HTTP_HEADER_SPILIER = "\\|";

public static final String NAMING_DEFAULT_CLUSTER_NAME = "DEFAULT";
public static final String DEFAULT_CLUSTER_NAME = "DEFAULT";

public static final String DEFAULT_NAMESPACE_ID = "public";

public static final int WRITE_REDIRECT_CODE = 307;

public static final String SERVICE_INFO_SPLITER = "@@";

public static final String REQUEST_PARAM_NAMESPACE_ID = "namespaceId";
public static final String REQUEST_PARAM_DEFAULT_NAMESPACE_ID = "public";
public static final String REQUEST_PARAM_SERVICE_NAME = "serviceName";
public static final String REQUEST_PARAM_GROUP = "group";
public static final String REQUEST_PARAM_DEFAULT_GROUP = "DEFAULT_GROUP";
public static final String NULL_STRING = "null";
}
34 changes: 34 additions & 0 deletions api/src/main/java/com/alibaba/nacos/api/naming/CommonParams.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.nacos.api.naming;

/**
* Common parameters for service discovery
*
* @author nkorange
* @since 1.0.0
*/
public class CommonParams {

public static final String SERVICE_NAME = "serviceName";

public static final String CLUSTER_NAME = "clusterName";

public static final String NAMESPACE_ID = "namespaceId";

public static final String GROUP_NAME = "groupName";

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* Naming Factory
*
* @author dungu.zpf
* @author nkorange
*/
public class NamingFactory {

Expand Down
Loading