dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary Admin settings validation

Browse Source
This commit is contained in:
Igor Kulikov 2020-03-04 15:56:12 +02:00
parent 244bcc7822
commit a9df9df99e
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java
View File

@ -92,19 +92,7 @@ public abstract class BaseAdminControllerTest extends AbstractControllerTest {
.andExpect(status().isBadRequest()) .andExpect(status().isBadRequest())
.andExpect(statusReason(containsString("is prohibited"))); .andExpect(statusReason(containsString("is prohibited")));
} }
@Test
public void testSaveAdminSettingsWithNewJsonStructure() throws Exception {
loginSysAdmin();
AdminSettings adminSettings = doGet("/api/admin/settings/mail", AdminSettings.class);
JsonNode json = adminSettings.getJsonValue();
((ObjectNode) json).put("newKey", "my new value");
adminSettings.setJsonValue(json);
doPost("/api/admin/settings", adminSettings)
.andExpect(status().isBadRequest())
.andExpect(statusReason(containsString("Provided json structure is different")));
}
@Test @Test
public void testSendTestMail() throws Exception { public void testSendTestMail() throws Exception {
loginSysAdmin(); loginSysAdmin();

3
dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
View File

@ -73,9 +73,6 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
if (!existentAdminSettings.getKey().equals(adminSettings.getKey())) { if (!existentAdminSettings.getKey().equals(adminSettings.getKey())) {
throw new DataValidationException("Changing key of admin settings entry is prohibited!"); throw new DataValidationException("Changing key of admin settings entry is prohibited!");
} }
if (adminSettings.getKey().equals("mail")) {
validateJsonStructure(existentAdminSettings.getJsonValue(), adminSettings.getJsonValue());
}
} }
} }

9
dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java
View File

@ -67,13 +67,4 @@ public abstract class BaseAdminSettingsServiceTest extends AbstractServiceTest {
adminSettings.setKey("newKey"); adminSettings.setKey("newKey");
adminSettingsService.saveAdminSettings(SYSTEM_TENANT_ID, adminSettings); adminSettingsService.saveAdminSettings(SYSTEM_TENANT_ID, adminSettings);
} }
@Test(expected = DataValidationException.class)
public void testSaveAdminSettingsWithNewJsonStructure() {
AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey(SYSTEM_TENANT_ID, "mail");
JsonNode json = adminSettings.getJsonValue();
((ObjectNode) json).put("newKey", "my new value");
adminSettings.setJsonValue(json);
adminSettingsService.saveAdminSettings(SYSTEM_TENANT_ID, adminSettings);
}
} }