@ -51,6 +51,7 @@ import org.thingsboard.server.dao.widget.WidgetTypeService;
import org.thingsboard.server.dao.widget.WidgetsBundleService ; import org.thingsboard.server.dao.widget.WidgetsBundleService ;
import java.io.IOException ; import java.io.IOException ;
import java.nio.file.DirectoryStream ;
import java.nio.file.Files ; import java.nio.file.Files ;
import java.nio.file.Path ; import java.nio.file.Path ;
import java.nio.file.Paths ; import java.nio.file.Paths ;
@ -138,7 +139,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
node . put ( "timeout" , "10000" ) ; node . put ( "timeout" , "10000" ) ;
node . put ( "enableTls" , "false" ) ; node . put ( "enableTls" , "false" ) ;
node . put ( "username" , "" ) ; node . put ( "username" , "" ) ;
node . put ( "password" , "" ) ; node . put ( "password" , "" ) ; //NOSONAR, key used to identify password field (not password value itself)
mailSettings . setJsonValue ( node ) ; mailSettings . setJsonValue ( node ) ;
adminSettingsService . saveAdminSettings ( mailSettings ) ; adminSettingsService . saveAdminSettings ( mailSettings ) ;
} }
@ -146,33 +147,34 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
@Override @Override
public void loadSystemWidgets ( ) throws Exception { public void loadSystemWidgets ( ) throws Exception {
Path widgetBundlesDir = Paths . get ( dataDir , JSON_DIR , SYSTEM_DIR , WIDGET_BUNDLES_DIR ) ; Path widgetBundlesDir = Paths . get ( dataDir , JSON_DIR , SYSTEM_DIR , WIDGET_BUNDLES_DIR ) ;
Files . newDirectoryStream ( widgetBundlesDir , path - > path . toString ( ) . endsWith ( ".json" ) ) try ( DirectoryStream < Path > dirStream = Files . newDirectoryStream ( widgetBundlesDir , path - > path . toString ( ) . endsWith ( ".json" ) ) ) {
. forEach ( dirStream . forEach (
path - > { path - > {
try { try {
JsonNode widgetsBundleDescriptorJson = objectMapper . readTree ( path . toFile ( ) ) ; JsonNode widgetsBundleDescriptorJson = objectMapper . readTree ( path . toFile ( ) ) ;
JsonNode widgetsBundleJson = widgetsBundleDescriptorJson . get ( "widgetsBundle" ) ; JsonNode widgetsBundleJson = widgetsBundleDescriptorJson . get ( "widgetsBundle" ) ;
WidgetsBundle widgetsBundle = objectMapper . treeToValue ( widgetsBundleJson , WidgetsBundle . class ) ; WidgetsBundle widgetsBundle = objectMapper . treeToValue ( widgetsBundleJson , WidgetsBundle . class ) ;
WidgetsBundle savedWidgetsBundle = widgetsBundleService . saveWidgetsBundle ( widgetsBundle ) ; WidgetsBundle savedWidgetsBundle = widgetsBundleService . saveWidgetsBundle ( widgetsBundle ) ;
JsonNode widgetTypesArrayJson = widgetsBundleDescriptorJson . get ( "widgetTypes" ) ; JsonNode widgetTypesArrayJson = widgetsBundleDescriptorJson . get ( "widgetTypes" ) ;
widgetTypesArrayJson . forEach ( widgetTypesArrayJson . forEach (
widgetTypeJson - > { widgetTypeJson - > {
try { try {
WidgetType widgetType = objectMapper . treeToValue ( widgetTypeJson , WidgetType . class ) ; WidgetType widgetType = objectMapper . treeToValue ( widgetTypeJson , WidgetType . class ) ;
widgetType . setBundleAlias ( savedWidgetsBundle . getAlias ( ) ) ; widgetType . setBundleAlias ( savedWidgetsBundle . getAlias ( ) ) ;
widgetTypeService . saveWidgetType ( widgetType ) ; widgetTypeService . saveWidgetType ( widgetType ) ;
} catch ( Exception e ) { } catch ( Exception e ) {
log . error ( "Unable to load widget type from json: [{}]" , path . toString ( ) ) ; log . error ( "Unable to load widget type from json: [{}]" , path . toString ( ) ) ;
throw new RuntimeException ( "Unable to load widget type from json" , e ) ; throw new RuntimeException ( "Unable to load widget type from json" , e ) ;
}
} }
) ; }
} catch ( Exception e ) { ) ;
log . error ( "Unable to load widgets bundle from json: [{}]" , path . toString ( ) ) ; } catch ( Exception e ) {
throw new RuntimeException ( "Unable to load widgets bundle from json" , e ) ; log . error ( "Unable to load widgets bundle from json: [{}] " , path . toString ( ) ) ;
} throw new RuntimeException ( "Unable to load widgets bundle from json" , e ) ;
} }
) ; }
) ;
}
} }
@Override @Override
@ -279,67 +281,69 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
} }
private void loadPlugins ( Path pluginsDir , TenantId tenantId ) throws Exception { private void loadPlugins ( Path pluginsDir , TenantId tenantId ) throws Exception {
Files . newDirectoryStream ( pluginsDir , path - > path . toString ( ) . endsWith ( ".json" ) ) try ( DirectoryStream < Path > dirStream = Files . newDirectoryStream ( pluginsDir , path - > path . toString ( ) . endsWith ( ".json" ) ) ) {
. forEach ( dirStream . forEach (
path - > { path - > {
try { try {
JsonNode pluginJson = objectMapper . readTree ( path . toFile ( ) ) ; JsonNode pluginJson = objectMapper . readTree ( path . toFile ( ) ) ;
PluginMetaData plugin = objectMapper . treeToValue ( pluginJson , PluginMetaData . class ) ; PluginMetaData plugin = objectMapper . treeToValue ( pluginJson , PluginMetaData . class ) ;
plugin . setTenantId ( tenantId ) ; plugin . setTenantId ( tenantId ) ;
if ( plugin . getState ( ) = = ComponentLifecycleState . ACTIVE ) { if ( plugin . getState ( ) = = ComponentLifecycleState . ACTIVE ) {
plugin . setState ( ComponentLifecycleState . SUSPENDED ) ; plugin . setState ( ComponentLifecycleState . SUSPENDED ) ;
PluginMetaData savedPlugin = pluginService . savePlugin ( plugin ) ; PluginMetaData savedPlugin = pluginService . savePlugin ( plugin ) ;
pluginService . activatePluginById ( savedPlugin . getId ( ) ) ; pluginService . activatePluginById ( savedPlugin . getId ( ) ) ;
} else { } else {
pluginService . savePlugin ( plugin ) ; pluginService . savePlugin ( plugin ) ;
}
} catch ( Exception e ) {
log . error ( "Unable to load plugin from json: [{}]" , path . toString ( ) ) ;
throw new RuntimeException ( "Unable to load plugin from json" , e ) ;
} }
} catch ( Exception e ) {
log . error ( "Unable to load plugin from json: [{}]" , path . toString ( ) ) ;
throw new RuntimeException ( "Unable to load plugin from json" , e ) ;
} }
) ; }
) ;
}
} }
private void loadRules ( Path rulesDir , TenantId tenantId ) throws Exception { private void loadRules ( Path rulesDir , TenantId tenantId ) throws Exception {
Files . newDirectoryStream ( rulesDir , path - > path . toString ( ) . endsWith ( ".json" ) ) try ( DirectoryStream < Path > dirStream = Files . newDirectoryStream ( rulesDir , path - > path . toString ( ) . endsWith ( ".json" ) ) ) {
. forEach ( dirStream . forEach (
path - > { path - > {
try { try {
JsonNode ruleJson = objectMapper . readTree ( path . toFile ( ) ) ; JsonNode ruleJson = objectMapper . readTree ( path . toFile ( ) ) ;
RuleMetaData rule = objectMapper . treeToValue ( ruleJson , RuleMetaData . class ) ; RuleMetaData rule = objectMapper . treeToValue ( ruleJson , RuleMetaData . class ) ;
rule . setTenantId ( tenantId ) ; rule . setTenantId ( tenantId ) ;
if ( rule . getState ( ) = = ComponentLifecycleState . ACTIVE ) { if ( rule . getState ( ) = = ComponentLifecycleState . ACTIVE ) {
rule . setState ( ComponentLifecycleState . SUSPENDED ) ; rule . setState ( ComponentLifecycleState . SUSPENDED ) ;
RuleMetaData savedRule = ruleService . saveRule ( rule ) ; RuleMetaData savedRule = ruleService . saveRule ( rule ) ;
ruleService . activateRuleById ( savedRule . getId ( ) ) ; ruleService . activateRuleById ( savedRule . getId ( ) ) ;
} else { } else {
ruleService . saveRule ( rule ) ; ruleService . saveRule ( rule ) ;
}
} catch ( Exception e ) {
log . error ( "Unable to load rule from json: [{}]" , path . toString ( ) ) ;
throw new RuntimeException ( "Unable to load rule from json" , e ) ;
} }
} catch ( Exception e ) {
log . error ( "Unable to load rule from json: [{}]" , path . toString ( ) ) ;
throw new RuntimeException ( "Unable to load rule from json" , e ) ;
} }
) ; }
) ;
}
} }
private void loadDashboards ( Path dashboardsDir , TenantId tenantId , CustomerId customerId ) throws Exception { private void loadDashboards ( Path dashboardsDir , TenantId tenantId , CustomerId customerId ) throws Exception {
Files . newDirectoryStream ( dashboardsDir , path - > path . toString ( ) . endsWith ( ".json" ) ) try ( DirectoryStream < Path > dirStream = Files . newDirectoryStream ( dashboardsDir , path - > path . toString ( ) . endsWith ( ".json" ) ) ) {
. forEach ( dirStream . forEach (
path - > { path - > {
try { try {
JsonNode dashboardJson = objectMapper . readTree ( path . toFile ( ) ) ; JsonNode dashboardJson = objectMapper . readTree ( path . toFile ( ) ) ;
Dashboard dashboard = objectMapper . treeToValue ( dashboardJson , Dashboard . class ) ; Dashboard dashboard = objectMapper . treeToValue ( dashboardJson , Dashboard . class ) ;
dashboard . setTenantId ( tenantId ) ; dashboard . setTenantId ( tenantId ) ;
dashboard . setCustomerId ( customerId ) ; dashboard . setCustomerId ( customerId ) ;
dashboardService . saveDashboard ( dashboard ) ; dashboardService . saveDashboard ( dashboard ) ;
} catch ( Exception e ) { } catch ( Exception e ) {
log . error ( "Unable to load dashboard from json: [{}]" , path . toString ( ) ) ; log . error ( "Unable to load dashboard from json: [{}]" , path . toString ( ) ) ;
throw new RuntimeException ( "Unable to load dashboard from json" , e ) ; throw new RuntimeException ( "Unable to load dashboard from json" , e ) ;
}
} }
) ; }
) ;
}
} }
} }
Igor Kulikov
9 years ago