Skip to content

Commit

Permalink
KAA-1279: Fixed about 700 warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@sashadidukh
sashadidukh committed Oct 1, 2016
1 parent fb7d67a commit db1fc73
Show file tree
Hide file tree
Showing 91 changed files with 1,544 additions and 915 deletions.
8 changes: 5 additions & 3 deletions ...on/dao/src/main/java/org/kaaproject/kaa/server/common/dao/ApplicationEventMapService.java
View file
Expand Up @@ -33,7 +33,8 @@ public interface ApplicationEventMapService {
* @param applicationId the application id * @param applicationId the application id
* @return the list of found application event family maps * @return the list of found application event family maps
*/ */
List<ApplicationEventFamilyMapDto> findApplicationEventFamilyMapsByApplicationId(String applicationId); List<ApplicationEventFamilyMapDto> findApplicationEventFamilyMapsByApplicationId(
String applicationId);


/** /**
* Find Application Event Family Maps by ids. * Find Application Event Family Maps by ids.
Expand All @@ -52,12 +53,13 @@ public interface ApplicationEventMapService {
ApplicationEventFamilyMapDto findApplicationEventFamilyMapById(String id); ApplicationEventFamilyMapDto findApplicationEventFamilyMapById(String id);


/** /**
* Save Application Event Family Map * Save Application Event Family Map.
* *
* @param applicationEventFamilyMap the application event family map dto * @param applicationEventFamilyMap the application event family map dto
* @return the application event family map dto * @return the application event family map dto
*/ */
ApplicationEventFamilyMapDto saveApplicationEventFamilyMap(ApplicationEventFamilyMapDto applicationEventFamilyMap); ApplicationEventFamilyMapDto saveApplicationEventFamilyMap(
ApplicationEventFamilyMapDto applicationEventFamilyMap);


/** /**
* Find Vacant Event Class Families by application id. * Find Vacant Event Class Families by application id.
Expand Down
55 changes: 32 additions & 23 deletions server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/CTLService.java
View file
Expand Up @@ -28,7 +28,8 @@
*/ */
public interface CTLService { public interface CTLService {


public static final String DEFAULT_SYSTEM_EMPTY_SCHEMA_FQN = "org.kaaproject.kaa.schema.system.EmptyData"; public static final String DEFAULT_SYSTEM_EMPTY_SCHEMA_FQN =
"org.kaaproject.kaa.schema.system.EmptyData";
public static final int DEFAULT_SYSTEM_EMPTY_SCHEMA_VERSION = 1; public static final int DEFAULT_SYSTEM_EMPTY_SCHEMA_VERSION = 1;


/** /**
Expand All @@ -45,15 +46,15 @@ public interface CTLService {
* @param ctlSchema the CTL schema object. * @param ctlSchema the CTL schema object.
* @return CTLSchemaDto the updated object. * @return CTLSchemaDto the updated object.
*/ */
CTLSchemaDto updateCTLSchema(CTLSchemaDto ctlSchema); CTLSchemaDto updateCtlSchema(CTLSchemaDto ctlSchema);


/** /**
* Update existing CTL schema meta info scope by the given CTL schema meta info object. * Update existing CTL schema meta info scope by the given CTL schema meta info object.
* *
* @param ctlSchemaMetaInfo the CTL schema meta info object. * @param ctlSchemaMetaInfo the CTL schema meta info object.
* @return CTLSchemaMetaInfoDto the updated CTL schema meta info object. * @return CTLSchemaMetaInfoDto the updated CTL schema meta info object.
*/ */
CTLSchemaMetaInfoDto updateCTLSchemaMetaInfoScope(CTLSchemaMetaInfoDto ctlSchemaMetaInfo); CTLSchemaMetaInfoDto updateCtlSchemaMetaInfoScope(CTLSchemaMetaInfoDto ctlSchemaMetaInfo);


/** /**
* Find CTL schema meta infos which are the application level siblings to the CTL * Find CTL schema meta infos which are the application level siblings to the CTL
Expand All @@ -64,7 +65,8 @@ public interface CTLService {
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the CTL schema meta information objects which are the siblings to the given CTL. * @return the CTL schema meta information objects which are the siblings to the given CTL.
*/ */
List<CTLSchemaMetaInfoDto> findSiblingsByFqnTenantIdAndApplicationId(String fqn, String tenantId, String applicationId); List<CTLSchemaMetaInfoDto> findSiblingsByFqnTenantIdAndApplicationId(
String fqn, String tenantId, String applicationId);


/** /**
* Remove a CTL schema of the given tenant or application with the given fully qualified * Remove a CTL schema of the given tenant or application with the given fully qualified
Expand All @@ -75,23 +77,24 @@ public interface CTLService {
* @param tenantId the tenant identifier. * @param tenantId the tenant identifier.
* @param applicationId the application identifier. * @param applicationId the application identifier.
*/ */
void removeCTLSchemaByFqnAndVerAndTenantIdAndApplicationId(String fqn, Integer version, String tenantId, String applicationId); void removeCtlSchemaByFqnAndVerAndTenantIdAndApplicationId(
String fqn, Integer version, String tenantId, String applicationId);


/** /**
* Find a CTL schema with the given identifier. * Find a CTL schema with the given identifier.
* *
* @param schemaId the CTL schema identifier. * @param schemaId the CTL schema identifier.
* @return CTLSchemaDto the CTL schema with the given identifier. * @return CTLSchemaDto the CTL schema with the given identifier.
*/ */
CTLSchemaDto findCTLSchemaById(String schemaId); CTLSchemaDto findCtlSchemaById(String schemaId);


/** /**
* Saves the given CTL schema to the database. * Saves the given CTL schema to the database.
* *
* @param ctlSchemaDto the CTL schema to save. * @param ctlSchemaDto the CTL schema to save.
* @return CTLSchemaDto the saved CTL schema. * @return CTLSchemaDto the saved CTL schema.
*/ */
CTLSchemaDto saveCTLSchema(CTLSchemaDto ctlSchemaDto); CTLSchemaDto saveCtlSchema(CTLSchemaDto ctlSchemaDto);


/** /**
* Find CTL schema with the given meta info id and version. * Find CTL schema with the given meta info id and version.
Expand All @@ -112,7 +115,8 @@ public interface CTLService {
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the CTL schema with the given fully qualified name and version number. * @return the CTL schema with the given fully qualified name and version number.
*/ */
CTLSchemaDto findCTLSchemaByFqnAndVerAndTenantIdAndApplicationId(String fqn, Integer version, String tenantId, String applicationId); CTLSchemaDto findCtlSchemaByFqnAndVerAndTenantIdAndApplicationId(
String fqn, Integer version, String tenantId, String applicationId);


/** /**
* Find any CTL schema of the given tenant or application with the given fully qualified name * Find any CTL schema of the given tenant or application with the given fully qualified name
Expand All @@ -124,21 +128,22 @@ public interface CTLService {
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the any CTL schema with the given fully qualified name and version number. * @return the any CTL schema with the given fully qualified name and version number.
*/ */
CTLSchemaDto findAnyCTLSchemaByFqnAndVerAndTenantIdAndApplicationId(String fqn, Integer version, String tenantId, String applicationId); CTLSchemaDto findAnyCtlSchemaByFqnAndVerAndTenantIdAndApplicationId(
String fqn, Integer version, String tenantId, String applicationId);


/** /**
* Find system CTL schemas available in the database. * Find system CTL schemas available in the database.
* *
* @return the list of available system CTL schemas in the database. * @return the list of available system CTL schemas in the database.
*/ */
List<CTLSchemaDto> findSystemCTLSchemas(); List<CTLSchemaDto> findSystemCtlSchemas();


/** /**
* Find system CTL schemas meta info available in the database. * Find system CTL schemas meta info available in the database.
* *
* @return the list of available system CTL schemas meta info in the database. * @return the list of available system CTL schemas meta info in the database.
*/ */
List<CTLSchemaMetaInfoDto> findSystemCTLSchemasMetaInfo(); List<CTLSchemaMetaInfoDto> findSystemCtlSchemasMetaInfo();


/** /**
* Find available CTL schemas meta info for tenant(include * Find available CTL schemas meta info for tenant(include
Expand All @@ -147,7 +152,7 @@ public interface CTLService {
* @param tenantId the tenant identifier. * @param tenantId the tenant identifier.
* @return the list of available CTL schemas meta info for tenant with given identifier. * @return the list of available CTL schemas meta info for tenant with given identifier.
*/ */
List<CTLSchemaMetaInfoDto> findAvailableCTLSchemasMetaInfoForTenant(String tenantId); List<CTLSchemaMetaInfoDto> findAvailableCtlSchemasMetaInfoForTenant(String tenantId);


/** /**
* Find available CTL schemas meta info for application(include * Find available CTL schemas meta info for application(include
Expand All @@ -157,7 +162,8 @@ public interface CTLService {
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the list of available CTL schemas meta info for application with given identifier. * @return the list of available CTL schemas meta info for application with given identifier.
*/ */
List<CTLSchemaMetaInfoDto> findAvailableCTLSchemasMetaInfoForApplication(String tenantId, String applicationId); List<CTLSchemaMetaInfoDto> findAvailableCtlSchemasMetaInfoForApplication(
String tenantId, String applicationId);


/** /**
* Find the last version of CTL schema with the given fully qualified name, tenant and application * Find the last version of CTL schema with the given fully qualified name, tenant and application
Expand All @@ -167,9 +173,10 @@ public interface CTLService {
* @param tenantId the tenant identifier. * @param tenantId the tenant identifier.
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the latest version of CTL schema with the given fully qualified name, tenant and * @return the latest version of CTL schema with the given fully qualified name, tenant and
* application identifier. * application identifier.
*/ */
CTLSchemaDto findLatestCTLSchemaByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId); CTLSchemaDto findLatestCtlSchemaByFqnAndTenantIdAndApplicationId(
String fqn, String tenantId, String applicationId);


/** /**
* Find the last version of CTL schema with the given meta info id. * Find the last version of CTL schema with the given meta info id.
Expand All @@ -187,16 +194,17 @@ public interface CTLService {
* @param tenantId the tenant identifier. * @param tenantId the tenant identifier.
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the list of available versions of CTL schema with the given fully qualified name, * @return the list of available versions of CTL schema with the given fully qualified name,
* tenant and application identifier. * tenant and application identifier.
*/ */
List<CTLSchemaDto> findAllCTLSchemasByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId); List<CTLSchemaDto> findAllCtlSchemasByFqnAndTenantIdAndApplicationId(
String fqn, String tenantId, String applicationId);


/** /**
* Find CTL schemas available in the database. * Find CTL schemas available in the database.
* *
* @return the list of available CTL schemas in the database. * @return the list of available CTL schemas in the database.
*/ */
List<CTLSchemaDto> findCTLSchemas(); List<CTLSchemaDto> findCtlSchemas();


/** /**
* Find the dependents CTL schemas from CTL schema with the given schema * Find the dependents CTL schemas from CTL schema with the given schema
Expand All @@ -205,7 +213,7 @@ public interface CTLService {
* @param schemaId the schema identifier. * @param schemaId the schema identifier.
* @return the list of dependents CTL schemas from CTL schema with the given identifier. * @return the list of dependents CTL schemas from CTL schema with the given identifier.
*/ */
List<CTLSchemaDto> findCTLSchemaDependents(String schemaId); List<CTLSchemaDto> findCtlSchemaDependents(String schemaId);


/** /**
* Find the dependents CTL schemas from CTL schema with the given tenant, application, * Find the dependents CTL schemas from CTL schema with the given tenant, application,
Expand All @@ -216,9 +224,10 @@ public interface CTLService {
* @param tenantId the tenant identifier. * @param tenantId the tenant identifier.
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the list of dependents CTL schemas from CTL schema with the given tenant, application, * @return the list of dependents CTL schemas from CTL schema with the given tenant, application,
* fully qualified name and version. * fully qualified name and version.
*/ */
List<CTLSchemaDto> findCTLSchemaDependents(String fqn, Integer version, String tenantId, String applicationId); List<CTLSchemaDto> findCtlSchemaDependents(
String fqn, Integer version, String tenantId, String applicationId);


/** /**
* Exports the body of a CTL schema. * Exports the body of a CTL schema.
Expand All @@ -243,7 +252,7 @@ public interface CTLService {
* *
* @param schema A CTL schema to export * @param schema A CTL schema to export
* @return A Schema object containing the body of a CTL schema with all dependencies inline, * @return A Schema object containing the body of a CTL schema with all dependencies inline,
* recursively * recursively
*/ */
Schema flatExportAsSchema(CTLSchemaDto schema); Schema flatExportAsSchema(CTLSchemaDto schema);


Expand All @@ -262,7 +271,7 @@ public interface CTLService {
* *
* @param schema A CTL schema to export * @param schema A CTL schema to export
* @return An archive containing the body of a CTL schema as a file and all dependencies as * @return An archive containing the body of a CTL schema as a file and all dependencies as
* different files, recursively. * different files, recursively.
*/ */
FileData deepExport(CTLSchemaDto schema); FileData deepExport(CTLSchemaDto schema);
} }
2 changes: 1 addition & 1 deletion ...r/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/ConfigurationService.java
View file
Expand Up @@ -185,7 +185,7 @@ ConfigurationSchemaDto saveConfSchema(ConfigurationSchemaDto configurationSchema
String groupId); String groupId);


/** /**
* Save Configuration schema. <p> During saving new configuration schema will be generated: <ul> * Save Configuration schema. During saving new configuration schema will be generated: <ul>
* <li>Base Schema</li> <li>Override Schema</li> <li>Protocol Schema</li> <li>Base Data - * <li>Base Schema</li> <li>Override Schema</li> <li>Protocol Schema</li> <li>Base Data -
* Configuration attached to default group</li> </ul> After that will added information * Configuration attached to default group</li> </ul> After that will added information
* to history * to history
Expand Down
16 changes: 11 additions & 5 deletions server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/ProfileService.java
View file
Expand Up @@ -87,7 +87,8 @@ public interface ProfileService {
* @param includeDeprecated the include deprecated filters * @param includeDeprecated the include deprecated filters
* @return the collection of profile filters * @return the collection of profile filters
*/ */
Collection<ProfileFilterRecordDto> findAllProfileFilterRecordsByEndpointGroupId(String endpointGroupId, boolean includeDeprecated); Collection<ProfileFilterRecordDto> findAllProfileFilterRecordsByEndpointGroupId(
String endpointGroupId, boolean includeDeprecated);


/** /**
* Find profile filter record by schema ids and endpoint group id. * Find profile filter record by schema ids and endpoint group id.
Expand All @@ -97,7 +98,8 @@ public interface ProfileService {
* @param endpointGroupId the endpoint group identifier * @param endpointGroupId the endpoint group identifier
* @return the structure record dto * @return the structure record dto
*/ */
ProfileFilterRecordDto findProfileFilterRecordBySchemaIdAndEndpointGroupId(String endpointProfileSchemaId, String serverProfileSchemaId, String endpointGroupId); ProfileFilterRecordDto findProfileFilterRecordBySchemaIdAndEndpointGroupId(
String endpointProfileSchemaId, String serverProfileSchemaId, String endpointGroupId);


/** /**
* Find all vacant profile schemas versions by endpoint group id. * Find all vacant profile schemas versions by endpoint group id.
Expand Down Expand Up @@ -150,7 +152,9 @@ public interface ProfileService {
* @param deactivatedUsername the deactivated username * @param deactivatedUsername the deactivated username
* @return the change profile filter notification * @return the change profile filter notification
*/ */
ChangeProfileFilterNotification deleteProfileFilterRecord(String endpointProfileSchemaId, String serverProfileSchemaId, String groupId, String deactivatedUsername); ChangeProfileFilterNotification deleteProfileFilterRecord(
String endpointProfileSchemaId, String serverProfileSchemaId,
String groupId, String deactivatedUsername);


/** /**
* Find profile filter by application id and version. * Find profile filter by application id and version.
Expand All @@ -160,7 +164,8 @@ public interface ProfileService {
* @param serverSchemaVersion the schema version * @param serverSchemaVersion the schema version
* @return the list of profile filters * @return the list of profile filters
*/ */
List<ProfileFilterDto> findProfileFiltersByAppIdAndVersionsCombination(String appId, int endpointSchemaVersion, int serverSchemaVersion); List<ProfileFilterDto> findProfileFiltersByAppIdAndVersionsCombination(
String appId, int endpointSchemaVersion, int serverSchemaVersion);


/** /**
* Find profile schema by application id and version. * Find profile schema by application id and version.
Expand All @@ -179,7 +184,8 @@ public interface ProfileService {
* @param groupId the endpoint group identifier * @param groupId the endpoint group identifier
* @return found profile filter * @return found profile filter
*/ */
ProfileFilterDto findLatestFilterBySchemaIdsAndGroupId(String endpointProfileSchemaId, String serverProfileSchemaId, String groupId); ProfileFilterDto findLatestFilterBySchemaIdsAndGroupId(
String endpointProfileSchemaId, String serverProfileSchemaId, String groupId);


EndpointProfileDto findEndpointProfileByEndpointKeyHash(String endpointKeyHash); EndpointProfileDto findEndpointProfileByEndpointKeyHash(String endpointKeyHash);
} }
10 changes: 5 additions & 5 deletions ...er/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/UserVerifierService.java
View file
Expand Up @@ -40,32 +40,32 @@
public interface UserVerifierService { public interface UserVerifierService {


/** /**
* @param appId the app id * @param appId the app id.
* @return the list user verifier dto * @return the list user verifier dto
*/ */
List<UserVerifierDto> findUserVerifiersByAppId(String appId); List<UserVerifierDto> findUserVerifiersByAppId(String appId);


/** /**
* @param appId the app id * @param appId the app id.
* @param verifierToken the verifier token * @param verifierToken the verifier token
* @return the user verifier dto * @return the user verifier dto
*/ */
UserVerifierDto findUserVerifiersByAppIdAndVerifierToken(String appId, String verifierToken); UserVerifierDto findUserVerifiersByAppIdAndVerifierToken(String appId, String verifierToken);


/** /**
* @param id the id * @param id the id.
* @return the user verifier dto * @return the user verifier dto
*/ */
UserVerifierDto findUserVerifierById(String id); UserVerifierDto findUserVerifierById(String id);


/** /**
* @param logAppenderDto the log appender dto * @param logAppenderDto the log appender dto.
* @return the user verifier dto * @return the user verifier dto
*/ */
UserVerifierDto saveUserVerifier(UserVerifierDto logAppenderDto); UserVerifierDto saveUserVerifier(UserVerifierDto logAppenderDto);


/** /**
* @param id the id * @param id the id.
*/ */
void removeUserVerifierById(String id); void removeUserVerifierById(String id);


Expand Down
7 changes: 4 additions & 3 deletions ...mon/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CTLSchemaMetaInfoDao.java
View file
Expand Up @@ -33,7 +33,7 @@ public interface CTLSchemaMetaInfoDao<T> extends SqlDao<T> {
* @param tenantId the tenant identifier. * @param tenantId the tenant identifier.
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the CTL schema meta information object with given fully qualified name, tenant and * @return the CTL schema meta information object with given fully qualified name, tenant and
* application identifiers. * application identifiers.
*/ */
T findByFqnTenantIdAndApplicationId(String fqn, String tenantId, String applicationId); T findByFqnTenantIdAndApplicationId(String fqn, String tenantId, String applicationId);


Expand All @@ -46,7 +46,8 @@ public interface CTLSchemaMetaInfoDao<T> extends SqlDao<T> {
* @param applicationId the application identifier. * @param applicationId the application identifier.
* @return the CTL schema meta information objects which are the siblings to the given CTL. * @return the CTL schema meta information objects which are the siblings to the given CTL.
*/ */
List<T> findSiblingsByFqnTenantIdAndApplicationId(String fqn, String tenantId, String applicationId); List<T> findSiblingsByFqnTenantIdAndApplicationId(
String fqn, String tenantId, String applicationId);


/** /**
* Find a list of CTL schema meta infos of the given fully qualified name * Find a list of CTL schema meta infos of the given fully qualified name
Expand All @@ -67,7 +68,7 @@ public interface CTLSchemaMetaInfoDao<T> extends SqlDao<T> {
* @param tenantId the tenant identifier. * @param tenantId the tenant identifier.
* @param excludingId the ctl schema meta info identifier to exclude. * @param excludingId the ctl schema meta info identifier to exclude.
* @return the others CTL schema meta infos with the given fully qualified name and tenant * @return the others CTL schema meta infos with the given fully qualified name and tenant
* identifier. * identifier.
*/ */
List<T> findOthersByFqnAndTenantId(String fqn, String tenantId, String excludingId); List<T> findOthersByFqnAndTenantId(String fqn, String tenantId, String excludingId);


Expand Down
2 changes: 1 addition & 1 deletion ...n/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/ConfigurationSchemaDao.java
View file
Expand Up @@ -51,7 +51,7 @@ public interface ConfigurationSchemaDao<T> extends SqlDao<T> {
T findByAppIdAndVersion(String applicationId, int version); T findByAppIdAndVersion(String applicationId, int version);


/** /**
* Find schemas without active/inactive configurations * Find schemas without active/inactive configurations.
* *
* @param applicationId the application id * @param applicationId the application id
* @param usedSchemaIds The list of schemas with active/inactive configurations * @param usedSchemaIds The list of schemas with active/inactive configurations
Expand Down
2 changes: 1 addition & 1 deletion ...er/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CredentialsDao.java
View file
Expand Up @@ -24,7 +24,7 @@
import java.util.Optional; import java.util.Optional;


/** /**
* @param <T> A specific security credentials type * @param <T> A specific security credentials type.
* @author Andrew Shvayka * @author Andrew Shvayka
* @author Bohdan Khablenko * @author Bohdan Khablenko
*/ */
Expand Down

0 comments on commit db1fc73

Please sign in to comment.