Skip to content

Commit

Permalink
refactor console service
Browse files Browse the repository at this point in the history
  • Loading branch information
@terrymanu
terrymanu committed Apr 6, 2017
1 parent d938c4e commit e594a14
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 21 deletions.
17 changes: 9 additions & 8 deletions .../com/dangdang/ddframe/job/lite/console/restful/config/EventTraceDataSourceRestfulApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

import com.dangdang.ddframe.job.lite.console.domain.EventTraceDataSourceConfiguration;
import com.dangdang.ddframe.job.lite.console.domain.EventTraceDataSourceFactory;
import com.dangdang.ddframe.job.lite.console.service.impl.EventTraceDataSourceServiceImpl;
import com.dangdang.ddframe.job.lite.console.service.EventTraceDataSourceConfigurationService;
import com.dangdang.ddframe.job.lite.console.service.impl.EventTraceDataSourceConfigurationServiceImpl;
import com.dangdang.ddframe.job.lite.console.util.SessionEventTraceDataSourceConfiguration;
import com.google.common.base.Optional;

Expand All @@ -45,7 +46,7 @@ public final class EventTraceDataSourceRestfulApi {

public static final String DATA_SOURCE_CONFIG_KEY = "data_source_config_key";

private EventTraceDataSourceServiceImpl eventTraceDataSourceService = new EventTraceDataSourceServiceImpl();
private EventTraceDataSourceConfigurationService eventTraceDataSourceConfigurationService = new EventTraceDataSourceConfigurationServiceImpl();

/**
* 读取事件追踪数据源配置.
Expand All @@ -56,11 +57,11 @@ public final class EventTraceDataSourceRestfulApi {
@GET
@Produces(MediaType.APPLICATION_JSON)
public Collection<EventTraceDataSourceConfiguration> load(final @Context HttpServletRequest request) {
Optional<EventTraceDataSourceConfiguration> dataSourceConfig = eventTraceDataSourceService.loadActivated();
Optional<EventTraceDataSourceConfiguration> dataSourceConfig = eventTraceDataSourceConfigurationService.loadActivated();
if (dataSourceConfig.isPresent()) {
setDataSourceNameToSession(dataSourceConfig.get(), request.getSession());
}
return eventTraceDataSourceService.loadAll().getEventTraceDataSourceConfigurations().getEventTraceDataSourceConfiguration();
return eventTraceDataSourceConfigurationService.loadAll().getEventTraceDataSourceConfigurations().getEventTraceDataSourceConfiguration();
}

/**
Expand All @@ -73,7 +74,7 @@ public Collection<EventTraceDataSourceConfiguration> load(final @Context HttpSer
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public boolean add(final EventTraceDataSourceConfiguration config) {
return eventTraceDataSourceService.add(config);
return eventTraceDataSourceConfigurationService.add(config);
}

/**
Expand All @@ -84,7 +85,7 @@ public boolean add(final EventTraceDataSourceConfiguration config) {
@DELETE
@Consumes(MediaType.APPLICATION_JSON)
public void delete(final EventTraceDataSourceConfiguration config) {
eventTraceDataSourceService.delete(config.getName());
eventTraceDataSourceConfigurationService.delete(config.getName());
}

/**
Expand All @@ -99,9 +100,9 @@ public void delete(final EventTraceDataSourceConfiguration config) {
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public boolean connect(final EventTraceDataSourceConfiguration config, final @Context HttpServletRequest request) {
boolean isConnected = setDataSourceNameToSession(eventTraceDataSourceService.findDataSourceConfiguration(config.getName(), eventTraceDataSourceService.loadAll()), request.getSession());
boolean isConnected = setDataSourceNameToSession(eventTraceDataSourceConfigurationService.find(config.getName(), eventTraceDataSourceConfigurationService.loadAll()), request.getSession());
if (isConnected) {
eventTraceDataSourceService.load(config.getName());
eventTraceDataSourceConfigurationService.load(config.getName());
}
return isConnected;
}
Expand Down
7 changes: 4 additions & 3 deletions ...n/java/com/dangdang/ddframe/job/lite/console/restful/config/RegistryCenterRestfulApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
package com.dangdang.ddframe.job.lite.console.restful.config;

import com.dangdang.ddframe.job.lite.console.domain.RegistryCenterConfiguration;
import com.dangdang.ddframe.job.lite.console.service.impl.RegistryCenterServiceImpl;
import com.dangdang.ddframe.job.lite.console.service.RegistryCenterConfigurationService;
import com.dangdang.ddframe.job.lite.console.service.impl.RegistryCenterConfigurationServiceImpl;
import com.dangdang.ddframe.job.lite.console.util.SessionRegistryCenterConfiguration;
import com.dangdang.ddframe.job.lite.lifecycle.internal.reg.RegistryCenterFactory;
import com.dangdang.ddframe.job.reg.exception.RegException;
Expand Down Expand Up @@ -46,7 +47,7 @@ public final class RegistryCenterRestfulApi {

public static final String REG_CENTER_CONFIG_KEY = "reg_center_config_key";

private RegistryCenterServiceImpl regCenterService = new RegistryCenterServiceImpl();
private RegistryCenterConfigurationService regCenterService = new RegistryCenterConfigurationServiceImpl();

/**
* 读取注册中心配置.
Expand Down Expand Up @@ -92,7 +93,7 @@ public void delete(final RegistryCenterConfiguration config) {
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public boolean connect(final RegistryCenterConfiguration config, final @Context HttpServletRequest request) {
boolean isConnected = setRegistryCenterNameToSession(regCenterService.findRegistryCenterConfiguration(config.getName(), regCenterService.loadAll()), request.getSession());
boolean isConnected = setRegistryCenterNameToSession(regCenterService.find(config.getName(), regCenterService.loadAll()), request.getSession());
if (isConnected) {
regCenterService.load(config.getName());
}
Expand Down
11 changes: 10 additions & 1 deletion .../service/EventTraceDataSourceService.java → ...tTraceDataSourceConfigurationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*
* @author caohao
*/
public interface EventTraceDataSourceService {
public interface EventTraceDataSourceConfigurationService {

/**
* 读取全局配置.
Expand All @@ -43,6 +43,15 @@ public interface EventTraceDataSourceService {
*/
EventTraceDataSourceConfiguration load(String name);

/**
* 查找事件追踪数据源配置.
*
* @param name 配置名称
* @param configs 全局配置
* @return 事件追踪数据源配置
*/
EventTraceDataSourceConfiguration find(final String name, final GlobalConfiguration configs);

/**
* 读取已连接的事件追踪数据源配置.
*
Expand Down
11 changes: 10 additions & 1 deletion ...onsole/service/RegistryCenterService.java → ...e/RegistryCenterConfigurationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*
* @author zhangliang
*/
public interface RegistryCenterService {
public interface RegistryCenterConfigurationService {

/**
* 读取全局配置.
Expand All @@ -43,6 +43,15 @@ public interface RegistryCenterService {
*/
RegistryCenterConfiguration load(String name);

/**
* 查找注册中心配置.
*
* @param name 配置名称
* @param configs 全局配置
* @return 注册中心配置
*/
RegistryCenterConfiguration find(final String name, final GlobalConfiguration configs);

/**
* 读取已连接的注册中心配置.
*
Expand Down
9 changes: 5 additions & 4 deletions ...impl/EventTraceDataSourceServiceImpl.java → ...ceDataSourceConfigurationServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
import com.dangdang.ddframe.job.lite.console.domain.GlobalConfiguration;
import com.dangdang.ddframe.job.lite.console.repository.ConfigurationsXmlRepository;
import com.dangdang.ddframe.job.lite.console.repository.impl.ConfigurationsXmlRepositoryImpl;
import com.dangdang.ddframe.job.lite.console.service.EventTraceDataSourceService;
import com.dangdang.ddframe.job.lite.console.service.EventTraceDataSourceConfigurationService;
import com.google.common.base.Optional;

/**
* 事件追踪数据源配置服务实现类.
*
* @author caohao
*/
public final class EventTraceDataSourceServiceImpl implements EventTraceDataSourceService {
public final class EventTraceDataSourceConfigurationServiceImpl implements EventTraceDataSourceConfigurationService {

private ConfigurationsXmlRepository configurationsXmlRepository = new ConfigurationsXmlRepositoryImpl();

Expand All @@ -46,12 +46,13 @@ public GlobalConfiguration loadAll() {
@Override
public EventTraceDataSourceConfiguration load(final String name) {
GlobalConfiguration configs = loadAll();
EventTraceDataSourceConfiguration result = findDataSourceConfiguration(name, configs);
EventTraceDataSourceConfiguration result = find(name, configs);
setActivated(configs, result);
return result;
}

public EventTraceDataSourceConfiguration findDataSourceConfiguration(final String name, final GlobalConfiguration configs) {
@Override
public EventTraceDataSourceConfiguration find(final String name, final GlobalConfiguration configs) {
for (EventTraceDataSourceConfiguration each : configs.getEventTraceDataSourceConfigurations().getEventTraceDataSourceConfiguration()) {
if (name.equals(each.getName())) {
return each;
Expand Down
9 changes: 5 additions & 4 deletions ...rvice/impl/RegistryCenterServiceImpl.java → ...gistryCenterConfigurationServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
import com.dangdang.ddframe.job.lite.console.domain.RegistryCenterConfigurations;
import com.dangdang.ddframe.job.lite.console.repository.ConfigurationsXmlRepository;
import com.dangdang.ddframe.job.lite.console.repository.impl.ConfigurationsXmlRepositoryImpl;
import com.dangdang.ddframe.job.lite.console.service.RegistryCenterService;
import com.dangdang.ddframe.job.lite.console.service.RegistryCenterConfigurationService;
import com.google.common.base.Optional;

/**
* 注册中心配置服务实现类.
*
* @author zhangliang
*/
public final class RegistryCenterServiceImpl implements RegistryCenterService {
public final class RegistryCenterConfigurationServiceImpl implements RegistryCenterConfigurationService {

private ConfigurationsXmlRepository configurationsXmlRepository = new ConfigurationsXmlRepositoryImpl();

Expand All @@ -46,12 +46,13 @@ public GlobalConfiguration loadAll() {
@Override
public RegistryCenterConfiguration load(final String name) {
GlobalConfiguration configs = loadAll();
RegistryCenterConfiguration result = findRegistryCenterConfiguration(name, configs);
RegistryCenterConfiguration result = find(name, configs);
setActivated(configs, result);
return result;
}

public RegistryCenterConfiguration findRegistryCenterConfiguration(final String name, final GlobalConfiguration configs) {
@Override
public RegistryCenterConfiguration find(final String name, final GlobalConfiguration configs) {
for (RegistryCenterConfiguration each : configs.getRegistryCenterConfigurations().getRegistryCenterConfiguration()) {
if (name.equals(each.getName())) {
return each;
Expand Down

0 comments on commit e594a14

Please sign in to comment.