-
Notifications
You must be signed in to change notification settings - Fork 11.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add attribute for SubscriptionGroupConfig (#6891)
- Loading branch information
Showing
8 changed files
with
312 additions
and
115 deletions.
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
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
77 changes: 77 additions & 0 deletions
77
...r/src/test/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManagerTest.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,77 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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 org.apache.rocketmq.broker.subscription; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import java.util.Map; | ||
| import org.apache.rocketmq.broker.BrokerController; | ||
| import org.apache.rocketmq.common.SubscriptionGroupAttributes; | ||
| import org.apache.rocketmq.common.attribute.BooleanAttribute; | ||
| import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
| import static org.mockito.Mockito.doNothing; | ||
| import static org.mockito.Mockito.spy; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class SubscriptionGroupManagerTest { | ||
| private String group = "group"; | ||
| @Mock | ||
| private BrokerController brokerControllerMock; | ||
| private SubscriptionGroupManager subscriptionGroupManager; | ||
|
|
||
| @Before | ||
| public void before() { | ||
| SubscriptionGroupAttributes.ALL.put("test", new BooleanAttribute( | ||
| "test", | ||
| false, | ||
| false | ||
| )); | ||
| subscriptionGroupManager = spy(new SubscriptionGroupManager(brokerControllerMock)); | ||
| when(brokerControllerMock.getMessageStore()).thenReturn(null); | ||
| doNothing().when(subscriptionGroupManager).persist(); | ||
| } | ||
|
|
||
| @Test | ||
| public void updateSubscriptionGroupConfig() { | ||
| SubscriptionGroupConfig subscriptionGroupConfig = new SubscriptionGroupConfig(); | ||
| subscriptionGroupConfig.setGroupName(group); | ||
| Map<String, String> attr = ImmutableMap.of("+test", "true"); | ||
| subscriptionGroupConfig.setAttributes(attr); | ||
| subscriptionGroupManager.updateSubscriptionGroupConfig(subscriptionGroupConfig); | ||
| SubscriptionGroupConfig result = subscriptionGroupManager.getSubscriptionGroupTable().get(group); | ||
| assertThat(result).isNotNull(); | ||
| assertThat(result.getGroupName()).isEqualTo(group); | ||
| assertThat(result.getAttributes().get("test")).isEqualTo("true"); | ||
|
|
||
|
|
||
| SubscriptionGroupConfig subscriptionGroupConfig1 = new SubscriptionGroupConfig(); | ||
| subscriptionGroupConfig1.setGroupName(group); | ||
| Map<String, String> attrRemove = ImmutableMap.of("-test", ""); | ||
| subscriptionGroupConfig1.setAttributes(attrRemove); | ||
| assertThatThrownBy(() -> subscriptionGroupManager.updateSubscriptionGroupConfig(subscriptionGroupConfig1)) | ||
| .isInstanceOf(RuntimeException.class).hasMessage("attempt to update an unchangeable attribute. key: test"); | ||
| } | ||
| } |
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
29 changes: 29 additions & 0 deletions
29
common/src/main/java/org/apache/rocketmq/common/SubscriptionGroupAttributes.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,29 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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 org.apache.rocketmq.common; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import org.apache.rocketmq.common.attribute.Attribute; | ||
|
|
||
| public class SubscriptionGroupAttributes { | ||
| public static final Map<String, Attribute> ALL; | ||
|
|
||
| static { | ||
| ALL = new HashMap<>(); | ||
| } | ||
| } |
Oops, something went wrong.