Skip to content

Commit 474d1f3

Browse files
removed deprecated methods
1 parent 8aef667 commit 474d1f3

File tree

5 files changed

+0
-38
lines changed

5 files changed

+0
-38
lines changed

application/src/main/java/org/thingsboard/mqtt/broker/controller/AdminController.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,6 @@ public User getAdminById(@PathVariable(USER_ID) String strUserId) throws Thingsb
165165
return filterSensitiveUserData(checkUserId(userId));
166166
}
167167

168-
@PreAuthorize("hasAuthority('SYS_ADMIN')")
169-
@PostMapping(value = "/user")
170-
@Deprecated(since = "2.2.0", forRemoval = true)
171-
public User saveAdminUser(@RequestBody User user) throws ThingsboardException {
172-
return filterSensitiveUserData(checkNotNull(userService.saveUser(user)));
173-
}
174-
175168
@PreAuthorize("hasAuthority('SYS_ADMIN')")
176169
@PostMapping(value = "/securitySettings")
177170
public SecuritySettings saveSecuritySettings(@RequestBody SecuritySettings securitySettings) throws ThingsboardException {

common/dao-api/src/main/java/org/thingsboard/mqtt/broker/dao/client/MqttClientCredentialsService.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ public interface MqttClientCredentialsService {
4343

4444
PageData<ShortMqttClientCredentials> getCredentials(PageLink pageLink);
4545

46-
@Deprecated(since = "2.2.0", forRemoval = true)
47-
PageData<MqttClientCredentials> getFullCredentials(PageLink pageLink);
48-
4946
PageData<ShortMqttClientCredentials> getCredentialsV2(ClientCredentialsQuery query);
5047

5148
Optional<MqttClientCredentials> getCredentialsById(UUID id);

common/queue/src/main/java/org/thingsboard/mqtt/broker/queue/TbQueueAdmin.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.thingsboard.mqtt.broker.common.data.queue.KafkaTopic;
2626

2727
import java.util.Collection;
28-
import java.util.List;
2928
import java.util.Map;
3029
import java.util.concurrent.ExecutionException;
3130

@@ -49,9 +48,6 @@ public interface TbQueueAdmin {
4948

5049
PageData<KafkaTopic> getTopics(PageLink pageLink);
5150

52-
@Deprecated(since = "2.2.0", forRemoval = true)
53-
List<String> getBrokerServiceIds();
54-
5551
PageData<KafkaConsumerGroup> getConsumerGroups(PageLink pageLink);
5652

5753
void deleteOldConsumerGroups(String consumerGroupPrefix, String serviceId, long currentCgSuffix);

common/queue/src/main/java/org/thingsboard/mqtt/broker/queue/kafka/TbKafkaAdmin.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ public class TbKafkaAdmin implements TbQueueAdmin {
7878
private boolean enableTopicDeletion;
7979
@Value("${queue.kafka.kafka-prefix:}")
8080
private String kafkaPrefix;
81-
@Value("${queue.kafka.client-session-event-response.topic-prefix:tbmq.client.session.event.response}")
82-
private String clientSessionEventRespTopicPrefix;
8381
@Value("${queue.kafka.admin.command-timeout:30}")
8482
private int kafkaAdminCommandTimeout;
8583

@@ -298,21 +296,6 @@ public PageData<KafkaTopic> getTopics(PageLink pageLink) {
298296
}
299297
}
300298

301-
@Override
302-
public List<String> getBrokerServiceIds() {
303-
try {
304-
Set<String> topics = client.listTopics().names().get();
305-
return topics
306-
.stream()
307-
.filter(topic -> topic.startsWith(kafkaPrefix + clientSessionEventRespTopicPrefix))
308-
.map(topic -> topic.replace(kafkaPrefix + clientSessionEventRespTopicPrefix + ".", ""))
309-
.collect(Collectors.toList());
310-
} catch (InterruptedException | ExecutionException e) {
311-
log.warn("Failed to get broker names", e);
312-
throw new RuntimeException(e);
313-
}
314-
}
315-
316299
@Override
317300
public PageData<KafkaConsumerGroup> getConsumerGroups(PageLink pageLink) {
318301
try {

dao/src/main/java/org/thingsboard/mqtt/broker/dao/client/MqttClientCredentialsServiceImpl.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,6 @@ public PageData<ShortMqttClientCredentials> getCredentials(PageLink pageLink) {
163163
return toShortMqttClientCredentialsPageData(mqttClientCredentialsDao.findAll(pageLink));
164164
}
165165

166-
@Override
167-
public PageData<MqttClientCredentials> getFullCredentials(PageLink pageLink) {
168-
log.trace("Executing getFullCredentials, pageLink [{}]", pageLink);
169-
validatePageLink(pageLink);
170-
return mqttClientCredentialsDao.findAll(pageLink);
171-
}
172-
173166
@Override
174167
public PageData<ShortMqttClientCredentials> getCredentialsV2(ClientCredentialsQuery query) {
175168
log.trace("Executing getCredentialsV2, query [{}]", query);

0 commit comments

Comments
 (0)