Skip to content

Commit

Permalink
Fixed some warns.
Browse files Browse the repository at this point in the history
  • Loading branch information
Acarus committed Sep 29, 2016
1 parent 7e1f1c9 commit 29e140e
Show file tree
Hide file tree
Showing 23 changed files with 328 additions and 189 deletions.
Expand Up @@ -78,8 +78,8 @@
import org.kaaproject.kaa.server.admin.shared.schema.ProfileSchemaViewDto; import org.kaaproject.kaa.server.admin.shared.schema.ProfileSchemaViewDto;
import org.kaaproject.kaa.server.admin.shared.schema.SchemaInfoDto; import org.kaaproject.kaa.server.admin.shared.schema.SchemaInfoDto;
import org.kaaproject.kaa.server.admin.shared.schema.ServerProfileSchemaViewDto; import org.kaaproject.kaa.server.admin.shared.schema.ServerProfileSchemaViewDto;
import org.kaaproject.kaa.server.admin.shared.services.AdminUIService; import org.kaaproject.kaa.server.admin.shared.services.AdminUiService;
import org.kaaproject.kaa.server.admin.shared.services.AdminUIServiceAsync; import org.kaaproject.kaa.server.admin.shared.services.AdminUiServiceAsync;
import org.kaaproject.kaa.server.admin.shared.services.ApplicationService; import org.kaaproject.kaa.server.admin.shared.services.ApplicationService;
import org.kaaproject.kaa.server.admin.shared.services.ApplicationServiceAsync; import org.kaaproject.kaa.server.admin.shared.services.ApplicationServiceAsync;
import org.kaaproject.kaa.server.admin.shared.services.ConfigurationService; import org.kaaproject.kaa.server.admin.shared.services.ConfigurationService;
Expand Down Expand Up @@ -142,7 +142,7 @@ public class DataSource {


private final VerifierServiceAsync verifierRpcService = GWT.create(VerifierService.class); private final VerifierServiceAsync verifierRpcService = GWT.create(VerifierService.class);


private final AdminUIServiceAsync adminUirpcService = GWT.create(AdminUIService.class); private final AdminUiServiceAsync adminUirpcService = GWT.create(AdminUiService.class);


private final EventBus eventBus; private final EventBus eventBus;


Expand Down Expand Up @@ -699,7 +699,7 @@ protected void onResult(Void result) {


public void validateEcfListInSdkProfile(List<AefMapInfoDto> ecfList, public void validateEcfListInSdkProfile(List<AefMapInfoDto> ecfList,
final AsyncCallback<Void> callback) { final AsyncCallback<Void> callback) {
eventRpcService.validateECFListInSdkProfile(ecfList, new DataCallback<Void>(callback) { eventRpcService.validateEcfListInSdkProfile(ecfList, new DataCallback<Void>(callback) {
@Override @Override
protected void onResult(Void result) { protected void onResult(Void result) {
} }
Expand Down Expand Up @@ -852,7 +852,7 @@ protected void onResult(Boolean result) {
public void getAvailableApplicationCtlSchemaReferences( public void getAvailableApplicationCtlSchemaReferences(
String applicationId, String applicationId,
final AsyncCallback<List<CtlSchemaReferenceDto>> callback) { final AsyncCallback<List<CtlSchemaReferenceDto>> callback) {
ctlRpcService.getAvailableApplicationCTLSchemaReferences(applicationId, ctlRpcService.getAvailableApplicationCtlSchemaReferences(applicationId,
new DataCallback<List<CtlSchemaReferenceDto>>(callback) { new DataCallback<List<CtlSchemaReferenceDto>>(callback) {
@Override @Override
protected void onResult(List<CtlSchemaReferenceDto> result) { protected void onResult(List<CtlSchemaReferenceDto> result) {
Expand All @@ -864,7 +864,7 @@ public void getTenantLevelCtlSchemaReferenceForEcf(
String ecfId, String ecfId,
List<EventClassViewDto> eventClassViewDtoList, List<EventClassViewDto> eventClassViewDtoList,
final AsyncCallback<List<CtlSchemaReferenceDto>> callback) { final AsyncCallback<List<CtlSchemaReferenceDto>> callback) {
ctlRpcService.getTenantLevelCTLSchemaReferenceForECF(ecfId, eventClassViewDtoList, ctlRpcService.getTenantLevelCtlSchemaReferenceForEcf(ecfId, eventClassViewDtoList,
new DataCallback<List<CtlSchemaReferenceDto>>(callback) { new DataCallback<List<CtlSchemaReferenceDto>>(callback) {
@Override @Override
protected void onResult(List<CtlSchemaReferenceDto> result) { protected void onResult(List<CtlSchemaReferenceDto> result) {
Expand Down Expand Up @@ -1019,7 +1019,7 @@ protected void onResult(LogSchemaViewDto result) {


public void getSystemLevelCtlSchemas( public void getSystemLevelCtlSchemas(
final AsyncCallback<List<CTLSchemaMetaInfoDto>> callback) { final AsyncCallback<List<CTLSchemaMetaInfoDto>> callback) {
ctlRpcService.getSystemLevelCTLSchemas( ctlRpcService.getSystemLevelCtlSchemas(
new DataCallback<List<CTLSchemaMetaInfoDto>>(callback) { new DataCallback<List<CTLSchemaMetaInfoDto>>(callback) {
@Override @Override
protected void onResult(List<CTLSchemaMetaInfoDto> result) { protected void onResult(List<CTLSchemaMetaInfoDto> result) {
Expand All @@ -1029,7 +1029,7 @@ protected void onResult(List<CTLSchemaMetaInfoDto> result) {


public void getTenantLevelCtlSchemas( public void getTenantLevelCtlSchemas(
final AsyncCallback<List<CTLSchemaMetaInfoDto>> callback) { final AsyncCallback<List<CTLSchemaMetaInfoDto>> callback) {
ctlRpcService.getTenantLevelCTLSchemas( ctlRpcService.getTenantLevelCtlSchemas(
new DataCallback<List<CTLSchemaMetaInfoDto>>(callback) { new DataCallback<List<CTLSchemaMetaInfoDto>>(callback) {
@Override @Override
protected void onResult(List<CTLSchemaMetaInfoDto> result) { protected void onResult(List<CTLSchemaMetaInfoDto> result) {
Expand All @@ -1039,7 +1039,7 @@ protected void onResult(List<CTLSchemaMetaInfoDto> result) {


public void getCtlSchemaById(String ctlSchemaId, public void getCtlSchemaById(String ctlSchemaId,
final AsyncCallback<CTLSchemaDto> callback) { final AsyncCallback<CTLSchemaDto> callback) {
ctlRpcService.getCTLSchemaById(ctlSchemaId, ctlRpcService.getCtlSchemaById(ctlSchemaId,
new DataCallback<CTLSchemaDto>(callback) { new DataCallback<CTLSchemaDto>(callback) {
@Override @Override
protected void onResult(CTLSchemaDto result) { protected void onResult(CTLSchemaDto result) {
Expand All @@ -1050,7 +1050,7 @@ protected void onResult(CTLSchemaDto result) {
public void getApplicationLevelCtlSchemas( public void getApplicationLevelCtlSchemas(
String applicationId, String applicationId,
final AsyncCallback<List<CTLSchemaMetaInfoDto>> callback) { final AsyncCallback<List<CTLSchemaMetaInfoDto>> callback) {
ctlRpcService.getApplicationLevelCTLSchemas(applicationId, ctlRpcService.getApplicationLevelCtlSchemas(applicationId,
new DataCallback<List<CTLSchemaMetaInfoDto>>(callback) { new DataCallback<List<CTLSchemaMetaInfoDto>>(callback) {
@Override @Override
protected void onResult(List<CTLSchemaMetaInfoDto> result) { protected void onResult(List<CTLSchemaMetaInfoDto> result) {
Expand All @@ -1060,7 +1060,7 @@ protected void onResult(List<CTLSchemaMetaInfoDto> result) {


public void getLatestCtlSchemaForm(String metaInfoId, public void getLatestCtlSchemaForm(String metaInfoId,
final AsyncCallback<CtlSchemaFormDto> callback) { final AsyncCallback<CtlSchemaFormDto> callback) {
ctlRpcService.getLatestCTLSchemaForm(metaInfoId, ctlRpcService.getLatestCtlSchemaForm(metaInfoId,
new DataCallback<CtlSchemaFormDto>(callback) { new DataCallback<CtlSchemaFormDto>(callback) {
@Override @Override
protected void onResult(CtlSchemaFormDto result) { protected void onResult(CtlSchemaFormDto result) {
Expand All @@ -1070,7 +1070,7 @@ protected void onResult(CtlSchemaFormDto result) {


public void getCtlSchemaFormByMetaInfoIdAndVer(String metaInfoId, Integer version, public void getCtlSchemaFormByMetaInfoIdAndVer(String metaInfoId, Integer version,
final AsyncCallback<CtlSchemaFormDto> callback) { final AsyncCallback<CtlSchemaFormDto> callback) {
ctlRpcService.getCTLSchemaFormByMetaInfoIdAndVer(metaInfoId, version, ctlRpcService.getCtlSchemaFormByMetaInfoIdAndVer(metaInfoId, version,
new DataCallback<CtlSchemaFormDto>(callback) { new DataCallback<CtlSchemaFormDto>(callback) {
@Override @Override
protected void onResult(CtlSchemaFormDto result) { protected void onResult(CtlSchemaFormDto result) {
Expand All @@ -1081,7 +1081,7 @@ protected void onResult(CtlSchemaFormDto result) {
public void createNewCtlSchemaFormInstance(String metaInfoId, Integer sourceVersion, public void createNewCtlSchemaFormInstance(String metaInfoId, Integer sourceVersion,
String applicationId, ConverterType converterType, String applicationId, ConverterType converterType,
final AsyncCallback<CtlSchemaFormDto> callback) { final AsyncCallback<CtlSchemaFormDto> callback) {
ctlRpcService.createNewCTLSchemaFormInstance( ctlRpcService.createNewCtlSchemaFormInstance(
metaInfoId, sourceVersion, applicationId, converterType, metaInfoId, sourceVersion, applicationId, converterType,
new DataCallback<CtlSchemaFormDto>(callback) { new DataCallback<CtlSchemaFormDto>(callback) {
@Override @Override
Expand All @@ -1103,7 +1103,7 @@ protected void onResult(RecordField result) {
public void editCtlSchemaForm(CtlSchemaFormDto ctlSchemaForm, public void editCtlSchemaForm(CtlSchemaFormDto ctlSchemaForm,
ConverterType converterType, ConverterType converterType,
final AsyncCallback<CtlSchemaFormDto> callback) { final AsyncCallback<CtlSchemaFormDto> callback) {
ctlRpcService.saveCTLSchemaForm(ctlSchemaForm, converterType, ctlRpcService.saveCtlSchemaForm(ctlSchemaForm, converterType,
new DataCallback<CtlSchemaFormDto>(callback) { new DataCallback<CtlSchemaFormDto>(callback) {
@Override @Override
protected void onResult(CtlSchemaFormDto result) { protected void onResult(CtlSchemaFormDto result) {
Expand Down Expand Up @@ -1136,7 +1136,7 @@ protected void onResult(CTLSchemaMetaInfoDto result) {
public void deleteCtlSchemaByFqnVersionTenantIdAndApplicationId( public void deleteCtlSchemaByFqnVersionTenantIdAndApplicationId(
String fqn, Integer version, String tenantId, String fqn, Integer version, String tenantId,
String applicationId, final AsyncCallback<Void> callback) { String applicationId, final AsyncCallback<Void> callback) {
ctlRpcService.deleteCTLSchemaByFqnVersionTenantIdAndApplicationId(fqn, version, ctlRpcService.deleteCtlSchemaByFqnVersionTenantIdAndApplicationId(fqn, version,
tenantId, applicationId, tenantId, applicationId,
new DataCallback<Void>(callback) { new DataCallback<Void>(callback) {
@Override @Override
Expand All @@ -1148,7 +1148,7 @@ protected void onResult(Void result) {


public void prepareCtlSchemaExport(String ctlSchemaId, CTLSchemaExportMethod method, public void prepareCtlSchemaExport(String ctlSchemaId, CTLSchemaExportMethod method,
final AsyncCallback<String> callback) { final AsyncCallback<String> callback) {
ctlRpcService.prepareCTLSchemaExport(ctlSchemaId, method, new DataCallback<String>(callback) { ctlRpcService.prepareCtlSchemaExport(ctlSchemaId, method, new DataCallback<String>(callback) {
@Override @Override
protected void onResult(String result) { protected void onResult(String result) {
} }
Expand Down
Expand Up @@ -20,7 +20,7 @@


import org.kaaproject.kaa.server.admin.services.dao.UserFacade; import org.kaaproject.kaa.server.admin.services.dao.UserFacade;
import org.kaaproject.kaa.server.admin.services.util.Utils; import org.kaaproject.kaa.server.admin.services.util.Utils;
import org.kaaproject.kaa.server.admin.shared.services.AdminUIService; import org.kaaproject.kaa.server.admin.shared.services.AdminUiService;
import org.kaaproject.kaa.server.admin.shared.services.ApplicationService; import org.kaaproject.kaa.server.admin.shared.services.ApplicationService;
import org.kaaproject.kaa.server.admin.shared.services.ConfigurationService; import org.kaaproject.kaa.server.admin.shared.services.ConfigurationService;
import org.kaaproject.kaa.server.admin.shared.services.CtlService; import org.kaaproject.kaa.server.admin.shared.services.CtlService;
Expand Down Expand Up @@ -67,7 +67,7 @@ public abstract class AbstractAdminController {
* The kaa admin UI service. * The kaa admin UI service.
*/ */
@Autowired @Autowired
AdminUIService adminUIService; AdminUiService adminUIService;


/** /**
* The kaa application service. * The kaa application service.
Expand Down
Expand Up @@ -77,7 +77,7 @@ public CTLSchemaDto saveCTLSchemaWithAppToken(
@RequestParam(required = false) String tenantId, @RequestParam(required = false) String tenantId,
@ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = false) @ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = false)
@RequestParam(required = false) String applicationToken) throws KaaAdminServiceException { @RequestParam(required = false) String applicationToken) throws KaaAdminServiceException {
return ctlService.saveCTLSchemaWithAppToken(body, tenantId, applicationToken); return ctlService.saveCtlSchemaWithAppToken(body, tenantId, applicationToken);
} }


/** /**
Expand Down Expand Up @@ -109,7 +109,7 @@ public void deleteCTLSchemaByFqnVersionTenantIdAndApplicationToken(
@ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = false) @ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = false)
@RequestParam(required = false) String applicationToken) @RequestParam(required = false) String applicationToken)
throws KaaAdminServiceException { throws KaaAdminServiceException {
ctlService.deleteCTLSchemaByFqnVersionTenantIdAndApplicationToken(fqn, version, tenantId, applicationToken); ctlService.deleteCtlSchemaByFqnVersionTenantIdAndApplicationToken(fqn, version, tenantId, applicationToken);
} }


/** /**
Expand Down Expand Up @@ -141,7 +141,7 @@ public CTLSchemaDto getCTLSchemaByFqnVersionTenantIdAndApplicationToken(
@ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = false) @ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = false)
@RequestParam(required = false) String applicationToken) @RequestParam(required = false) String applicationToken)
throws KaaAdminServiceException { throws KaaAdminServiceException {
return ctlService.getCTLSchemaByFqnVersionTenantIdAndApplicationToken(fqn, version, tenantId, applicationToken); return ctlService.getCtlSchemaByFqnVersionTenantIdAndApplicationToken(fqn, version, tenantId, applicationToken);
} }


/** /**
Expand All @@ -163,7 +163,7 @@ public CTLSchemaDto getCTLSchemaByFqnVersionTenantIdAndApplicationToken(
public CTLSchemaDto getCTLSchemaById( public CTLSchemaDto getCTLSchemaById(
@ApiParam(name = "id", value = "A unique CTL schema identifier", required = true) @ApiParam(name = "id", value = "A unique CTL schema identifier", required = true)
@RequestParam String id) throws KaaAdminServiceException { @RequestParam String id) throws KaaAdminServiceException {
return ctlService.getCTLSchemaById(id); return ctlService.getCtlSchemaById(id);
} }


/** /**
Expand Down Expand Up @@ -234,7 +234,7 @@ public CTLSchemaMetaInfoDto promoteScopeToTenant(
@RequestMapping(value = "CTL/getSystemSchemas", method = RequestMethod.GET) @RequestMapping(value = "CTL/getSystemSchemas", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public List<CTLSchemaMetaInfoDto> getSystemLevelCTLSchemas() throws KaaAdminServiceException { public List<CTLSchemaMetaInfoDto> getSystemLevelCTLSchemas() throws KaaAdminServiceException {
return ctlService.getSystemLevelCTLSchemas(); return ctlService.getSystemLevelCtlSchemas();
} }


/** /**
Expand All @@ -252,7 +252,7 @@ public List<CTLSchemaMetaInfoDto> getSystemLevelCTLSchemas() throws KaaAdminServ
@RequestMapping(value = "CTL/getTenantSchemas", method = RequestMethod.GET) @RequestMapping(value = "CTL/getTenantSchemas", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public List<CTLSchemaMetaInfoDto> getTenantLevelCTLSchemas() throws KaaAdminServiceException { public List<CTLSchemaMetaInfoDto> getTenantLevelCTLSchemas() throws KaaAdminServiceException {
return ctlService.getTenantLevelCTLSchemas(); return ctlService.getTenantLevelCtlSchemas();
} }


/** /**
Expand All @@ -276,7 +276,7 @@ public List<CTLSchemaMetaInfoDto> getTenantLevelCTLSchemas() throws KaaAdminServ
public List<CTLSchemaMetaInfoDto> getApplicationLevelCTLSchemasByAppToken( public List<CTLSchemaMetaInfoDto> getApplicationLevelCTLSchemasByAppToken(
@ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = true) @ApiParam(name = "applicationToken", value = "A unique auto-generated application identifier", required = true)
@PathVariable String applicationToken) throws KaaAdminServiceException { @PathVariable String applicationToken) throws KaaAdminServiceException {
return ctlService.getApplicationLevelCTLSchemasByAppToken(applicationToken); return ctlService.getApplicationLevelCtlSchemasByAppToken(applicationToken);
} }


/** /**
Expand Down Expand Up @@ -315,7 +315,7 @@ public void exportCTLSchemaByAppToken(
@RequestParam(required = false) String applicationToken, @RequestParam(required = false) String applicationToken,
HttpServletRequest request, HttpServletResponse response) throws KaaAdminServiceException { HttpServletRequest request, HttpServletResponse response) throws KaaAdminServiceException {
try { try {
FileData output = ctlService.exportCTLSchemaByAppToken(fqn, version, applicationToken, CTLSchemaExportMethod.valueOf(method.toUpperCase())); FileData output = ctlService.exportCtlSchemaByAppToken(fqn, version, applicationToken, CTLSchemaExportMethod.valueOf(method.toUpperCase()));
ServletUtils.prepareDisposition(request, response, output.getFileName()); ServletUtils.prepareDisposition(request, response, output.getFileName());
response.setContentType(output.getContentType()); response.setContentType(output.getContentType());
response.setContentLength(output.getFileData().length); response.setContentLength(output.getFileData().length);
Expand Down
Expand Up @@ -29,12 +29,12 @@
import org.kaaproject.kaa.server.admin.services.entity.gen.SmtpMailProperties; import org.kaaproject.kaa.server.admin.services.entity.gen.SmtpMailProperties;
import org.kaaproject.kaa.server.admin.services.util.Utils; import org.kaaproject.kaa.server.admin.services.util.Utils;
import org.kaaproject.kaa.server.admin.shared.properties.PropertiesDto; import org.kaaproject.kaa.server.admin.shared.properties.PropertiesDto;
import org.kaaproject.kaa.server.admin.shared.services.AdminUIService; import org.kaaproject.kaa.server.admin.shared.services.AdminUiService;
import org.kaaproject.kaa.server.admin.shared.services.KaaAdminServiceException; import org.kaaproject.kaa.server.admin.shared.services.KaaAdminServiceException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@Service("adminUIService") @Service("adminUIService")
public class AdminUiServiceImpl extends AbstractAdminService implements AdminUIService { public class AdminUiServiceImpl extends AbstractAdminService implements AdminUiService {


@Override @Override
public PropertiesDto getMailProperties() throws KaaAdminServiceException { public PropertiesDto getMailProperties() throws KaaAdminServiceException {
Expand Down
Expand Up @@ -153,14 +153,14 @@ public ConfigurationSchemaViewDto saveConfigurationSchemaView(
if (isEmpty(ctlSchemaId)) { if (isEmpty(ctlSchemaId)) {
if (confSchemaView.useExistingCtlSchema()) { if (confSchemaView.useExistingCtlSchema()) {
CtlSchemaReferenceDto metaInfo = confSchemaView.getExistingMetaInfo(); CtlSchemaReferenceDto metaInfo = confSchemaView.getExistingMetaInfo();
CTLSchemaDto schema = ctlService.getCTLSchemaByFqnVersionTenantIdAndApplicationId( CTLSchemaDto schema = ctlService.getCtlSchemaByFqnVersionTenantIdAndApplicationId(
metaInfo.getMetaInfo().getFqn(), metaInfo.getMetaInfo().getFqn(),
metaInfo.getVersion(), metaInfo.getVersion(),
metaInfo.getMetaInfo().getTenantId(), metaInfo.getMetaInfo().getTenantId(),
metaInfo.getMetaInfo().getApplicationId()); metaInfo.getMetaInfo().getApplicationId());
confSchema.setCtlSchemaId(schema.getId()); confSchema.setCtlSchemaId(schema.getId());
} else { } else {
CtlSchemaFormDto ctlSchemaForm = ctlService.saveCTLSchemaForm( CtlSchemaFormDto ctlSchemaForm = ctlService.saveCtlSchemaForm(
confSchemaView.getCtlSchemaForm(), ConverterType.CONFIGURATION_FORM_AVRO_CONVERTER); confSchemaView.getCtlSchemaForm(), ConverterType.CONFIGURATION_FORM_AVRO_CONVERTER);
confSchema.setCtlSchemaId(ctlSchemaForm.getId()); confSchema.setCtlSchemaId(ctlSchemaForm.getId());
} }
Expand Down Expand Up @@ -450,7 +450,7 @@ public ConfigurationSchemaViewDto createConfigurationSchemaFormCtlSchema(
confSchema.setApplicationId(ctlSchemaForm.getMetaInfo().getApplicationId()); confSchema.setApplicationId(ctlSchemaForm.getMetaInfo().getApplicationId());
confSchema.setName(ctlSchemaForm.getSchema().getDisplayNameFieldValue()); confSchema.setName(ctlSchemaForm.getSchema().getDisplayNameFieldValue());
confSchema.setDescription(ctlSchemaForm.getSchema().getDescriptionFieldValue()); confSchema.setDescription(ctlSchemaForm.getSchema().getDescriptionFieldValue());
CtlSchemaFormDto savedCtlSchemaForm = ctlService.saveCTLSchemaForm( CtlSchemaFormDto savedCtlSchemaForm = ctlService.saveCtlSchemaForm(
ctlSchemaForm, ConverterType.CONFIGURATION_FORM_AVRO_CONVERTER); ctlSchemaForm, ConverterType.CONFIGURATION_FORM_AVRO_CONVERTER);
confSchema.setCtlSchemaId(savedCtlSchemaForm.getId()); confSchema.setCtlSchemaId(savedCtlSchemaForm.getId());
ConfigurationSchemaDto savedConfSchema = saveConfigurationSchema(confSchema); ConfigurationSchemaDto savedConfSchema = saveConfigurationSchema(confSchema);
Expand Down

0 comments on commit 29e140e

Please sign in to comment.