Commit 34b912c5 authored by kezhenxu94's avatar kezhenxu94 Committed by Jason Song

fix typo

parent 0ab20b09
......@@ -36,7 +36,7 @@ public class AppController {
if (!InputValidator.isValidClusterNamespace(dto.getAppId())) {
throw new BadRequestException(String.format("AppId格式错误: %s", InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
}
App entity = BeanUtils.transfrom(App.class, dto);
App entity = BeanUtils.transform(App.class, dto);
App managedEntity = appService.findOne(entity.getAppId());
if (managedEntity != null) {
throw new BadRequestException("app already exist.");
......@@ -44,7 +44,7 @@ public class AppController {
entity = adminService.createNewApp(entity);
dto = BeanUtils.transfrom(AppDTO.class, entity);
dto = BeanUtils.transform(AppDTO.class, entity);
return dto;
}
......@@ -84,7 +84,7 @@ public class AppController {
if (app == null) {
throw new NotFoundException("app not found for appId " + appId);
}
return BeanUtils.transfrom(AppDTO.class, app);
return BeanUtils.transform(AppDTO.class, app);
}
@RequestMapping(value = "/apps/{appId}/unique", method = RequestMethod.GET)
......
......@@ -34,7 +34,7 @@ public class AppNamespaceController {
public AppNamespaceDTO create(@RequestBody AppNamespaceDTO appNamespace,
@RequestParam(defaultValue = "false") boolean silentCreation) {
AppNamespace entity = BeanUtils.transfrom(AppNamespace.class, appNamespace);
AppNamespace entity = BeanUtils.transform(AppNamespace.class, appNamespace);
AppNamespace managedEntity = appNamespaceService.findOne(entity.getAppId(), entity.getName());
if (managedEntity == null) {
......@@ -52,7 +52,7 @@ public class AppNamespaceController {
throw new BadRequestException("app namespaces already exist.");
}
return BeanUtils.transfrom(AppNamespaceDTO.class, entity);
return BeanUtils.transform(AppNamespaceDTO.class, entity);
}
@RequestMapping(value = "/apps/{appId}/appnamespaces/{namespaceName:.+}", method = RequestMethod.DELETE)
......
......@@ -33,7 +33,7 @@ public class ClusterController {
throw new BadRequestException(String.format("Cluster格式错误: %s", InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
}
Cluster entity = BeanUtils.transfrom(Cluster.class, dto);
Cluster entity = BeanUtils.transform(Cluster.class, dto);
Cluster managedEntity = clusterService.findOne(appId, entity.getName());
if (managedEntity != null) {
throw new BadRequestException("cluster already exist.");
......@@ -45,7 +45,7 @@ public class ClusterController {
entity = clusterService.saveWithoutInstanceOfAppNamespaces(entity);
}
dto = BeanUtils.transfrom(ClusterDTO.class, entity);
dto = BeanUtils.transform(ClusterDTO.class, entity);
return dto;
}
......@@ -79,7 +79,7 @@ public class ClusterController {
if (cluster == null) {
throw new NotFoundException("cluster not found for name " + clusterName);
}
return BeanUtils.transfrom(ClusterDTO.class, cluster);
return BeanUtils.transform(ClusterDTO.class, cluster);
}
@RequestMapping(value = "/apps/{appId}/cluster/{clusterName}/unique", method = RequestMethod.GET)
......
......@@ -139,7 +139,7 @@ public class InstanceConfigController {
for (Release release : otherReleases) {
//unset configurations to save space
release.setConfigurations(null);
ReleaseDTO releaseDTO = BeanUtils.transfrom(ReleaseDTO.class, release);
ReleaseDTO releaseDTO = BeanUtils.transform(ReleaseDTO.class, release);
releaseMap.put(release.getReleaseKey(), releaseDTO);
}
......
......@@ -38,7 +38,7 @@ public class ItemController {
public ItemDTO create(@PathVariable("appId") String appId,
@PathVariable("clusterName") String clusterName,
@PathVariable("namespaceName") String namespaceName, @RequestBody ItemDTO dto) {
Item entity = BeanUtils.transfrom(Item.class, dto);
Item entity = BeanUtils.transform(Item.class, dto);
ConfigChangeContentBuilder builder = new ConfigChangeContentBuilder();
Item managedEntity = itemService.findOne(appId, clusterName, namespaceName, entity.getKey());
......@@ -48,7 +48,7 @@ public class ItemController {
entity = itemService.save(entity);
builder.createItem(entity);
}
dto = BeanUtils.transfrom(ItemDTO.class, entity);
dto = BeanUtils.transform(ItemDTO.class, entity);
Commit commit = new Commit();
commit.setAppId(appId);
......@@ -70,7 +70,7 @@ public class ItemController {
@PathVariable("itemId") long itemId,
@RequestBody ItemDTO itemDTO) {
Item entity = BeanUtils.transfrom(Item.class, itemDTO);
Item entity = BeanUtils.transform(Item.class, itemDTO);
ConfigChangeContentBuilder builder = new ConfigChangeContentBuilder();
......@@ -79,7 +79,7 @@ public class ItemController {
throw new BadRequestException("item not exist");
}
Item beforeUpdateItem = BeanUtils.transfrom(Item.class, managedEntity);
Item beforeUpdateItem = BeanUtils.transform(Item.class, managedEntity);
//protect. only value,comment,lastModifiedBy can be modified
managedEntity.setValue(entity.getValue());
......@@ -88,7 +88,7 @@ public class ItemController {
entity = itemService.update(managedEntity);
builder.updateItem(beforeUpdateItem, entity);
itemDTO = BeanUtils.transfrom(ItemDTO.class, entity);
itemDTO = BeanUtils.transform(ItemDTO.class, entity);
if (builder.hasContent()) {
Commit commit = new Commit();
......@@ -138,7 +138,7 @@ public class ItemController {
if (item == null) {
throw new NotFoundException("item not found for itemId " + itemId);
}
return BeanUtils.transfrom(ItemDTO.class, item);
return BeanUtils.transform(ItemDTO.class, item);
}
@RequestMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}", method = RequestMethod.GET)
......@@ -150,7 +150,7 @@ public class ItemController {
throw new NotFoundException(
String.format("item not found for %s %s %s %s", appId, clusterName, namespaceName, key));
}
return BeanUtils.transfrom(ItemDTO.class, item);
return BeanUtils.transform(ItemDTO.class, item);
}
......
......@@ -44,7 +44,7 @@ public class NamespaceBranchController {
Namespace createdBranch = namespaceBranchService.createBranch(appId, clusterName, namespaceName, operator);
return BeanUtils.transfrom(NamespaceDTO.class, createdBranch);
return BeanUtils.transform(NamespaceDTO.class, createdBranch);
}
@RequestMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules",
......@@ -79,7 +79,7 @@ public class NamespaceBranchController {
checkBranch(appId, clusterName, namespaceName, branchName);
GrayReleaseRule newRules = BeanUtils.transfrom(GrayReleaseRule.class, newRuleDto);
GrayReleaseRule newRules = BeanUtils.transform(GrayReleaseRule.class, newRuleDto);
newRules.setRules(GrayReleaseRuleItemTransformer.batchTransformToJSON(newRuleDto.getRuleItems()));
newRules.setBranchStatus(NamespaceBranchStatus.ACTIVE);
......@@ -116,7 +116,7 @@ public class NamespaceBranchController {
return null;
}
return BeanUtils.transfrom(NamespaceDTO.class, childNamespace);
return BeanUtils.transform(NamespaceDTO.class, childNamespace);
}
private void checkBranch(String appId, String clusterName, String namespaceName, String branchName) {
......
......@@ -31,7 +31,7 @@ public class NamespaceController {
if (!InputValidator.isValidClusterNamespace(dto.getNamespaceName())) {
throw new BadRequestException(String.format("Namespace格式错误: %s", InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
}
Namespace entity = BeanUtils.transfrom(Namespace.class, dto);
Namespace entity = BeanUtils.transform(Namespace.class, dto);
Namespace managedEntity = namespaceService.findOne(appId, clusterName, entity.getNamespaceName());
if (managedEntity != null) {
throw new BadRequestException("namespace already exist.");
......@@ -39,7 +39,7 @@ public class NamespaceController {
entity = namespaceService.save(entity);
dto = BeanUtils.transfrom(NamespaceDTO.class, entity);
dto = BeanUtils.transform(NamespaceDTO.class, entity);
return dto;
}
......@@ -66,7 +66,7 @@ public class NamespaceController {
Namespace namespace = namespaceService.findOne(namespaceId);
if (namespace == null)
throw new NotFoundException(String.format("namespace not found for %s", namespaceId));
return BeanUtils.transfrom(NamespaceDTO.class, namespace);
return BeanUtils.transform(NamespaceDTO.class, namespace);
}
@RequestMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName:.+}", method = RequestMethod.GET)
......@@ -76,7 +76,7 @@ public class NamespaceController {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace == null) throw new NotFoundException(
String.format("namespace not found for %s %s %s", appId, clusterName, namespaceName));
return BeanUtils.transfrom(NamespaceDTO.class, namespace);
return BeanUtils.transform(NamespaceDTO.class, namespace);
}
@RequestMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/associated-public-namespace",
......@@ -90,7 +90,7 @@ public class NamespaceController {
throw new NotFoundException(String.format("public namespace not found. namespace:%s", namespaceName));
}
return BeanUtils.transfrom(NamespaceDTO.class, namespace);
return BeanUtils.transform(NamespaceDTO.class, namespace);
}
/**
......
......@@ -44,7 +44,7 @@ public class NamespaceLockController {
return null;
}
return BeanUtils.transfrom(NamespaceLockDTO.class, lock);
return BeanUtils.transform(NamespaceLockDTO.class, lock);
}
}
......@@ -54,7 +54,7 @@ public class ReleaseController {
if (release == null) {
throw new NotFoundException(String.format("release not found for %s", releaseId));
}
return BeanUtils.transfrom(ReleaseDTO.class, release);
return BeanUtils.transform(ReleaseDTO.class, release);
}
@RequestMapping(value = "/releases", method = RequestMethod.GET)
......@@ -91,7 +91,7 @@ public class ReleaseController {
@PathVariable("clusterName") String clusterName,
@PathVariable("namespaceName") String namespaceName) {
Release release = releaseService.findLatestActiveRelease(appId, clusterName, namespaceName);
return BeanUtils.transfrom(ReleaseDTO.class, release);
return BeanUtils.transform(ReleaseDTO.class, release);
}
@Transactional
......@@ -120,7 +120,7 @@ public class ReleaseController {
}
messageSender.sendMessage(ReleaseMessageKeyGenerator.generate(appId, messageCluster, namespaceName),
Topics.APOLLO_RELEASE_TOPIC);
return BeanUtils.transfrom(ReleaseDTO.class, release);
return BeanUtils.transform(ReleaseDTO.class, release);
}
......@@ -157,7 +157,7 @@ public class ReleaseController {
messageSender.sendMessage(ReleaseMessageKeyGenerator.generate(appId, clusterName, namespaceName),
Topics.APOLLO_RELEASE_TOPIC);
return BeanUtils.transfrom(ReleaseDTO.class, release);
return BeanUtils.transform(ReleaseDTO.class, release);
}
......@@ -204,7 +204,7 @@ public class ReleaseController {
}
messageSender.sendMessage(ReleaseMessageKeyGenerator.generate(appId, messageCluster, namespaceName),
Topics.APOLLO_RELEASE_TOPIC);
return BeanUtils.transfrom(ReleaseDTO.class, release);
return BeanUtils.transform(ReleaseDTO.class, release);
}
}
......@@ -85,7 +85,7 @@ public class AppControllerTest extends AbstractControllerTest {
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testFind() {
AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transfrom(App.class, dto);
App app = BeanUtils.transform(App.class, dto);
app = appRepository.save(app);
AppDTO result = restTemplate.getForObject(getBaseAppUrl() + dto.getAppId(), AppDTO.class);
......@@ -103,7 +103,7 @@ public class AppControllerTest extends AbstractControllerTest {
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testDelete() {
AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transfrom(App.class, dto);
App app = BeanUtils.transform(App.class, dto);
app = appRepository.save(app);
restTemplate.delete("http://localhost:{port}/apps/{appId}?operator={operator}", port, app.getAppId(), "test");
......
......@@ -41,7 +41,7 @@ public class ItemSetService {
if (!CollectionUtils.isEmpty(changeSet.getCreateItems())) {
for (ItemDTO item : changeSet.getCreateItems()) {
Item entity = BeanUtils.transfrom(Item.class, item);
Item entity = BeanUtils.transform(Item.class, item);
entity.setDataChangeCreatedBy(operator);
entity.setDataChangeLastModifiedBy(operator);
Item createdItem = itemService.save(entity);
......@@ -52,13 +52,13 @@ public class ItemSetService {
if (!CollectionUtils.isEmpty(changeSet.getUpdateItems())) {
for (ItemDTO item : changeSet.getUpdateItems()) {
Item entity = BeanUtils.transfrom(Item.class, item);
Item entity = BeanUtils.transform(Item.class, item);
Item managedItem = itemService.findOne(entity.getId());
if (managedItem == null) {
throw new NotFoundException(String.format("item not found.(key=%s)", entity.getKey()));
}
Item beforeUpdateItem = BeanUtils.transfrom(Item.class, managedItem);
Item beforeUpdateItem = BeanUtils.transform(Item.class, managedItem);
//protect. only value,comment,lastModifiedBy,lineNum can be modified
managedItem.setValue(entity.getValue());
......
......@@ -32,7 +32,7 @@ public class BeanUtils {
List<T> result = new ArrayList<>(srcList.size());
for (Object srcObject : srcList) {
result.add(transfrom(clazz, srcObject));
result.add(transform(clazz, srcObject));
}
return result;
}
......@@ -45,7 +45,7 @@ public class BeanUtils {
* return BeanUtil.transform(UserDTO.class, userBean);
* </pre>
*/
public static <T> T transfrom(Class<T> clazz, Object src) {
public static <T> T transform(Class<T> clazz, Object src) {
if (src == null) {
return null;
}
......
......@@ -25,28 +25,28 @@ public class OpenApiBeanUtils {
public static OpenItemDTO transformFromItemDTO(ItemDTO item) {
Preconditions.checkArgument(item != null);
return BeanUtils.transfrom(OpenItemDTO.class, item);
return BeanUtils.transform(OpenItemDTO.class, item);
}
public static ItemDTO transformToItemDTO(OpenItemDTO openItemDTO) {
Preconditions.checkArgument(openItemDTO != null);
return BeanUtils.transfrom(ItemDTO.class, openItemDTO);
return BeanUtils.transform(ItemDTO.class, openItemDTO);
}
public static OpenAppNamespaceDTO transformToOpenAppNamespaceDTO(AppNamespace appNamespace) {
Preconditions.checkArgument(appNamespace != null);
return BeanUtils.transfrom(OpenAppNamespaceDTO.class, appNamespace);
return BeanUtils.transform(OpenAppNamespaceDTO.class, appNamespace);
}
public static AppNamespace transformToAppNamespace(OpenAppNamespaceDTO openAppNamespaceDTO) {
Preconditions.checkArgument(openAppNamespaceDTO != null);
return BeanUtils.transfrom(AppNamespace.class, openAppNamespaceDTO);
return BeanUtils.transform(AppNamespace.class, openAppNamespaceDTO);
}
public static OpenReleaseDTO transformFromReleaseDTO(ReleaseDTO release) {
Preconditions.checkArgument(release != null);
OpenReleaseDTO openReleaseDTO = BeanUtils.transfrom(OpenReleaseDTO.class, release);
OpenReleaseDTO openReleaseDTO = BeanUtils.transform(OpenReleaseDTO.class, release);
Map<String, String> configs = gson.fromJson(release.getConfigurations(), type);
......@@ -57,7 +57,7 @@ public class OpenApiBeanUtils {
public static OpenNamespaceDTO transformFromNamespaceBO(NamespaceBO namespaceBO) {
Preconditions.checkArgument(namespaceBO != null);
OpenNamespaceDTO openNamespaceDTO = BeanUtils.transfrom(OpenNamespaceDTO.class, namespaceBO
OpenNamespaceDTO openNamespaceDTO = BeanUtils.transform(OpenNamespaceDTO.class, namespaceBO
.getBaseInfo());
//app namespace info
......@@ -110,7 +110,7 @@ public class OpenApiBeanUtils {
public static OpenGrayReleaseRuleDTO transformFromGrayReleaseRuleDTO(GrayReleaseRuleDTO grayReleaseRuleDTO){
Preconditions.checkArgument(grayReleaseRuleDTO != null);
return BeanUtils.transfrom(OpenGrayReleaseRuleDTO.class, grayReleaseRuleDTO);
return BeanUtils.transform(OpenGrayReleaseRuleDTO.class, grayReleaseRuleDTO);
}
public static GrayReleaseRuleDTO transformToGrayReleaseRuleDTO(OpenGrayReleaseRuleDTO openGrayReleaseRuleDTO){
......
......@@ -15,7 +15,6 @@ import com.ctrip.framework.apollo.openapi.auth.ConsumerPermissionValidator;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.ctrip.framework.apollo.portal.service.NamespaceBranchService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
......@@ -70,7 +69,7 @@ public class NamespaceBranchController {
if (namespaceDTO == null) {
return null;
}
return BeanUtils.transfrom(OpenNamespaceDTO.class, namespaceDTO);
return BeanUtils.transform(OpenNamespaceDTO.class, namespaceDTO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
......
......@@ -57,7 +57,7 @@ public class ReleaseController {
throw new BadRequestException("user(releaseBy) not exists");
}
NamespaceReleaseModel releaseModel = BeanUtils.transfrom(NamespaceReleaseModel.class, model);
NamespaceReleaseModel releaseModel = BeanUtils.transform(NamespaceReleaseModel.class, model);
releaseModel.setAppId(appId);
releaseModel.setEnv(Env.fromString(env).toString());
......@@ -119,7 +119,7 @@ public class ReleaseController {
throw new BadRequestException("user(releaseBy) not exists");
}
NamespaceReleaseModel releaseModel = BeanUtils.transfrom(NamespaceReleaseModel.class, model);
NamespaceReleaseModel releaseModel = BeanUtils.transform(NamespaceReleaseModel.class, model);
releaseModel.setAppId(appId);
releaseModel.setEnv(Env.fromString(env).toString());
......@@ -149,7 +149,7 @@ public class ReleaseController {
throw new BadRequestException("user(releaseBy) not exists");
}
NamespaceGrayDelReleaseModel releaseModel = BeanUtils.transfrom(NamespaceGrayDelReleaseModel.class, model);
NamespaceGrayDelReleaseModel releaseModel = BeanUtils.transform(NamespaceGrayDelReleaseModel.class, model);
releaseModel.setAppId(appId);
releaseModel.setEnv(env.toUpperCase());
releaseModel.setClusterName(branchName);
......
......@@ -172,7 +172,7 @@ public class NamespaceController {
String.format("AppNamespace not exists. AppId = %s, NamespaceName = %s", appId, namespaceName));
}
return BeanUtils.transfrom(AppNamespaceDTO.class, appNamespace);
return BeanUtils.transform(AppNamespaceDTO.class, appNamespace);
}
@PreAuthorize(value = "@permissionValidator.hasCreateAppNamespacePermission(#appId, #appNamespace)")
......
......@@ -5,7 +5,6 @@ import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.component.PortalSettings;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.slf4j.Logger;
......@@ -27,7 +26,7 @@ public class AppInfoChangedListener {
@EventListener
public void onAppInfoChange(AppInfoChangedEvent event) {
AppDTO appDTO = BeanUtils.transfrom(AppDTO.class, event.getApp());
AppDTO appDTO = BeanUtils.transform(AppDTO.class, event.getApp());
String appId = appDTO.getAppId();
List<Env> envs = portalSettings.getActiveEnvs();
......
......@@ -30,7 +30,7 @@ public class CreationListener {
@EventListener
public void onAppCreationEvent(AppCreationEvent event) {
AppDTO appDTO = BeanUtils.transfrom(AppDTO.class, event.getApp());
AppDTO appDTO = BeanUtils.transform(AppDTO.class, event.getApp());
List<Env> envs = portalSettings.getActiveEnvs();
for (Env env : envs) {
try {
......@@ -44,7 +44,7 @@ public class CreationListener {
@EventListener
public void onAppNamespaceCreationEvent(AppNamespaceCreationEvent event) {
AppNamespaceDTO appNamespace = BeanUtils.transfrom(AppNamespaceDTO.class, event.getAppNamespace());
AppNamespaceDTO appNamespace = BeanUtils.transform(AppNamespaceDTO.class, event.getAppNamespace());
List<Env> envs = portalSettings.getActiveEnvs();
for (Env env : envs) {
try {
......
......@@ -28,7 +28,7 @@ public class DeletionListener {
@EventListener
public void onAppDeletionEvent(AppDeletionEvent event) {
AppDTO appDTO = BeanUtils.transfrom(AppDTO.class, event.getApp());
AppDTO appDTO = BeanUtils.transform(AppDTO.class, event.getApp());
String appId = appDTO.getAppId();
String operator = appDTO.getDataChangeLastModifiedBy();
......@@ -45,7 +45,7 @@ public class DeletionListener {
@EventListener
public void onAppNamespaceDeletionEvent(AppNamespaceDeletionEvent event) {
AppNamespaceDTO appNamespace = BeanUtils.transfrom(AppNamespaceDTO.class, event.getAppNamespace());
AppNamespaceDTO appNamespace = BeanUtils.transform(AppNamespaceDTO.class, event.getAppNamespace());
List<Env> envs = portalSettings.getActiveEnvs();
String appId = appNamespace.getAppId();
String namespaceName = appNamespace.getName();
......
......@@ -81,7 +81,7 @@ public class AppService {
app.setDataChangeCreatedBy(username);
app.setDataChangeLastModifiedBy(username);
AppDTO appDTO = BeanUtils.transfrom(AppDTO.class, app);
AppDTO appDTO = BeanUtils.transform(AppDTO.class, app);
appAPI.createApp(env, appDTO);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment