Skip to content

Commit

Permalink
updated functionality on WEB UI, deleted AdminTenantDto
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pyshankov
Pyshankov committed Jul 28, 2016
1 parent 721657f commit 63d6c63
Show file tree
Hide file tree
Showing 37 changed files with 474 additions and 277 deletions.
Binary file added keys/bootstrap/private.key
View file
Binary file not shown.
Binary file added keys/bootstrap/public.key
View file
Binary file not shown.
Binary file added keys/operations/private.key
View file
Binary file not shown.
Binary file added keys/operations/public.key
View file
Binary file not shown.
8 changes: 7 additions & 1 deletion pom.xml
View file
Expand Up @@ -74,7 +74,7 @@ Copyright 2014-2016 CyberVision, Inc.
<httpcomponents.version>4.3.2</httpcomponents.version>
<jackson.version>2.4.1</jackson.version>
<javax.validation.version>1.1.0.Final</javax.validation.version>
<hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
<hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
<joda-time.version>2.2</joda-time.version>
<junit.version>4.11</junit.version>
<embed.mongo.version>1.42</embed.mongo.version>
Expand Down Expand Up @@ -1229,6 +1229,12 @@ Copyright 2014-2016 CyberVision, Inc.
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${gwt.version}</version>
<exclusions>
<exclusion>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ppender/src/main/java/org/kaaproject/kaa/server/appenders/rest/config/gen/RestConfig.java
View file
Expand Up @@ -7,7 +7,7 @@
@SuppressWarnings("all")
@org.apache.avro.specific.AvroGenerated
public class RestConfig extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"RestConfig\",\"namespace\":\"org.kaaproject.kaa.server.appenders.rest.config.gen\",\"fields\":[{\"name\":\"host\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Host\",\"by_default\":\"localhost\"},{\"name\":\"port\",\"type\":\"int\",\"displayName\":\"Port\",\"by_default\":10000},{\"name\":\"ssl\",\"type\":\"boolean\",\"displayName\":\"Use SSL\",\"by_default\":\"false\"},{\"name\":\"verifySslCert\",\"type\":\"boolean\",\"displayName\":\"Validate SSL Certificate\",\"by_default\":\"false\"},{\"name\":\"username\",\"type\":[{\"type\":\"string\",\"avro.java.string\":\"String\"},\"null\"],\"displayName\":\"Username\"},{\"name\":\"password\",\"type\":[{\"type\":\"string\",\"avro.java.string\":\"String\"},\"null\"],\"displayName\":\"Password\"},{\"name\":\"connectionPoolSize\",\"type\":\"int\",\"displayName\":\"Thread/connection pool size\",\"by_default\":1},{\"name\":\"header\",\"type\":\"boolean\",\"displayName\":\"Include Kaa header\",\"by_default\":\"false\"},{\"name\":\"path\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Relative URI path\"},{\"name\":\"method\",\"type\":{\"type\":\"enum\",\"name\":\"MethodType\",\"symbols\":[\"PUT\",\"POST\"]},\"displayName\":\"Method\"},{\"name\":\"mimeType\",\"type\":{\"type\":\"enum\",\"name\":\"RequestType\",\"symbols\":[\"TEXT\",\"JSON\"]},\"displayName\":\"Request mime type\"}]}");
public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"RestConfig\",\"namespace\":\"org.kaaproject.kaa.server.appenders.rest.config.gen\",\"fields\":[{\"name\":\"host\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Host\",\"by_default\":\"localhost\"},{\"name\":\"port\",\"type\":\"int\",\"displayName\":\"Port\",\"by_default\":10000},{\"name\":\"ssl\",\"type\":\"boolean\",\"displayName\":\"Use SSL\",\"by_default\":\"false\"},{\"name\":\"verifySslCert\",\"type\":\"boolean\",\"displayName\":\"Validate SSL Certificate\",\"by_default\":\"false\"},{\"name\":\"username\",\"type\":[{\"type\":\"string\",\"avro.java.string\":\"String\"},\"null\"],\"displayName\":\"Username\"},{\"name\":\"password\",\"type\":[{\"type\":\"string\",\"avro.java.string\":\"String\"},\"null\"],\"displayName\":\"Password\",\"inputType\":\"password\"},{\"name\":\"connectionPoolSize\",\"type\":\"int\",\"displayName\":\"Thread/connection pool size\",\"by_default\":1},{\"name\":\"header\",\"type\":\"boolean\",\"displayName\":\"Include Kaa header\",\"by_default\":\"false\"},{\"name\":\"path\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Relative URI path\"},{\"name\":\"method\",\"type\":{\"type\":\"enum\",\"name\":\"MethodType\",\"symbols\":[\"PUT\",\"POST\"]},\"displayName\":\"Method\"},{\"name\":\"mimeType\",\"type\":{\"type\":\"enum\",\"name\":\"RequestType\",\"symbols\":[\"TEXT\",\"JSON\"]},\"displayName\":\"Request mime type\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private java.lang.String host;
private int port;
Expand Down
35 changes: 17 additions & 18 deletions server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/UserService.java
View file
Expand Up @@ -19,7 +19,6 @@

import java.util.List;

import org.kaaproject.kaa.common.dto.TenantAdminDto;
import org.kaaproject.kaa.common.dto.TenantDto;
import org.kaaproject.kaa.common.dto.UserDto;

Expand Down Expand Up @@ -90,13 +89,13 @@ public interface UserService {
*/
UserDto findUserById(String id);

/**
* Save tenant admin.
*
* @param tenantAdminDto the tenant dto
* @return the tenant dto
*/
TenantAdminDto saveTenantAdmin(TenantAdminDto tenantAdminDto);
// /**
// * Save tenant admin.
// *
// * @param tenantAdminDto the tenant dto
// * @return the tenant dto
// */
// TenantAdminDto saveTenantAdmin(TenantAdminDto tenantAdminDto);

/**
* remove tenant admin.
Expand All @@ -106,12 +105,12 @@ public interface UserService {
void removeTenantAdminById(String tenantId);

/**
* Find tenant admin by id.
* Find all tenant admin by tenant id.
*
* @param id the id
* @return the tenant admin dto
* @param tenantId the tenant id
* @return the UserDto list
*/
TenantAdminDto findTenantAdminById(String id);
List<UserDto> findAllTenantAdminsByTenantId(String tenantId);

/**
* Find all tenants.
Expand All @@ -127,12 +126,12 @@ public interface UserService {
*/
List<UserDto> findAllUsers();

/**
* Find all tenant admins.
*
* @return the list of tenant admins
*/
List<TenantAdminDto> findAllTenantAdmins();
// /**
// * Find all tenant admins.
// *
// * @return the list of tenant admins
// */
// List<TenantAdminDto> findAllTenantAdmins();

/**
* Find all tenant users.
Expand Down
112 changes: 50 additions & 62 deletions ...ommon/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/UserServiceImpl.java
View file
Expand Up @@ -26,7 +26,6 @@

import org.apache.commons.lang.StringUtils;
import org.kaaproject.kaa.common.dto.KaaAuthorityDto;
import org.kaaproject.kaa.common.dto.TenantAdminDto;
import org.kaaproject.kaa.common.dto.TenantDto;
import org.kaaproject.kaa.common.dto.UserDto;
import org.kaaproject.kaa.server.common.dao.ApplicationService;
Expand Down Expand Up @@ -140,52 +139,53 @@ public List<UserDto> findAllUsers() {
return convertDtoList(userDao.find());
}

@Override
public List<TenantAdminDto> findAllTenantAdmins() {
LOG.debug("Try to find all admin tenants");
List<TenantDto> tenants = findAllTenants();
List<TenantAdminDto> tenantAdmins = new ArrayList<TenantAdminDto>(tenants.size());
for (TenantDto tenant : tenants) {
TenantAdminDto tenantAdmin = new TenantAdminDto();
tenantAdmin.setId(tenant.getId());
tenantAdmin.setName(tenant.getName());
List<User> users = userDao.findByTenantIdAndAuthority(tenant.getId(), KaaAuthorityDto.TENANT_ADMIN.name());
if (!users.isEmpty()) {
tenantAdmin.setUserId(users.get(0).getId().toString());
tenantAdmin.setUsername(users.get(0).getUsername());
tenantAdmin.setExternalUid(users.get(0).getExternalUid());
}
tenantAdmins.add(tenantAdmin);
}
return tenantAdmins;
}

@Override
public TenantAdminDto saveTenantAdmin(TenantAdminDto tenantAdminDto) {
TenantAdminDto tenantAdmin = new TenantAdminDto();
if (isValidSqlObject(tenantAdminDto)) {
TenantDto tenant = new TenantDto();
tenant.setId(tenantAdminDto.getId());
tenant.setName(tenantAdminDto.getName());
tenant = saveTenant(tenant);
tenantAdmin.setId(tenant.getId());
tenantAdmin.setName(tenant.getName());
}
if (StringUtils.isEmpty(tenantAdminDto.getUserId()) || isValidSqlId(tenantAdminDto.getUserId())) {
UserDto user = new UserDto();
user.setId(tenantAdminDto.getUserId());
user.setUsername(tenantAdminDto.getUsername());
user.setExternalUid(tenantAdminDto.getExternalUid());
user.setTenantId(tenantAdmin.getId());
user.setAuthority(KaaAuthorityDto.TENANT_ADMIN);
user = saveUser(user);
tenantAdmin.setUserId(user.getId());
tenantAdmin.setUsername(user.getUsername());
tenantAdmin.setExternalUid(user.getExternalUid());
tenantAdmin.setId(user.getTenantId());
}
return tenantAdmin;
}
// @Override
// public List<TenantAdminDto> findAllTenantAdmins() {
// LOG.debug("Try to find all admin tenants");
// List<TenantDto> tenants = findAllTenants();
// List<TenantAdminDto> tenantAdmins = new ArrayList<TenantAdminDto>(tenants.size());
// for (TenantDto tenant : tenants) {
// TenantAdminDto tenantAdmin = new TenantAdminDto();
// tenantAdmin.setId(tenant.getId());
// tenantAdmin.setName(tenant.getName());
// List<User> users = userDao.findByTenantIdAndAuthority(tenant.getId(), KaaAuthorityDto.TENANT_ADMIN.name());
// if (!users.isEmpty()) {
// tenantAdmin.setUserId(users.get(0).getId().toString());
// tenantAdmin.setUsername(users.get(0).getUsername());
// tenantAdmin.setExternalUid(users.get(0).getExternalUid());
// }
// tenantAdmins.add(tenantAdmin);
// }
// return tenantAdmins;
// }
//
// //remove
// @Override
// public TenantAdminDto saveTenantAdmin(TenantAdminDto tenantAdminDto) {
// TenantAdminDto tenantAdmin = new TenantAdminDto();
// if (isValidSqlObject(tenantAdminDto)) {
// TenantDto tenant = new TenantDto();
// tenant.setId(tenantAdminDto.getId());
// tenant.setName(tenantAdminDto.getName());
// tenant = saveTenant(tenant);
// tenantAdmin.setId(tenant.getId());
// tenantAdmin.setName(tenant.getName());
// }
// if (StringUtils.isEmpty(tenantAdminDto.getUserId()) || isValidSqlId(tenantAdminDto.getUserId())) {
// UserDto user = new UserDto();
// user.setId(tenantAdminDto.getUserId());
// user.setUsername(tenantAdminDto.getUsername());
// user.setExternalUid(tenantAdminDto.getExternalUid());
// user.setTenantId(tenantAdmin.getId());
// user.setAuthority(KaaAuthorityDto.TENANT_ADMIN);
// user = saveUser(user);
// tenantAdmin.setUserId(user.getId());
// tenantAdmin.setUsername(user.getUsername());
// tenantAdmin.setExternalUid(user.getExternalUid());
// tenantAdmin.setId(user.getTenantId());
// }
// return tenantAdmin;
// }

@Override
public void removeTenantAdminById(String tenantId) {
Expand All @@ -196,23 +196,11 @@ public void removeTenantAdminById(String tenantId) {
}

@Override
public TenantAdminDto findTenantAdminById(String id) {
TenantAdminDto tenantAdminDto = null;
public List<UserDto> findAllTenantAdminsByTenantId(String id) {
if (isValidSqlId(id)) {
TenantDto tenantDto = getDto(tenantDao.findById(id));
if (tenantDto != null) {
tenantAdminDto = new TenantAdminDto();
tenantAdminDto.setId(tenantDto.getId());
tenantAdminDto.setName(tenantDto.getName());
List<User> users = userDao.findByTenantIdAndAuthority(id, KaaAuthorityDto.TENANT_ADMIN.name());
if (!users.isEmpty()) {
tenantAdminDto.setUserId(users.get(0).getId().toString());
tenantAdminDto.setUsername(users.get(0).getUsername());
tenantAdminDto.setExternalUid(users.get(0).getExternalUid());
}
}
return convertDtoList(userDao.findByTenantIdAndAuthority(id, KaaAuthorityDto.TENANT_ADMIN.name()));
}
return tenantAdminDto;
return null;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion server/common/dao/src/main/resources/maria-dao.properties.template
View file
Expand Up @@ -27,7 +27,7 @@ jdbc_username=sqladmin
jdbc_password=admin

# specify jdbc database hosts and ports
jdbc_host_port=localhost:3306
jdbc_host_port=10.2.3.66:3306

# specify jdbc database provider name
sql_provider_name=mysql:failover
15 changes: 7 additions & 8 deletions server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java
View file
Expand Up @@ -61,7 +61,6 @@
import org.kaaproject.kaa.common.dto.NotificationTypeDto;
import org.kaaproject.kaa.common.dto.ProfileFilterDto;
import org.kaaproject.kaa.common.dto.ServerProfileSchemaDto;
import org.kaaproject.kaa.common.dto.TenantAdminDto;
import org.kaaproject.kaa.common.dto.TenantDto;
import org.kaaproject.kaa.common.dto.TopicDto;
import org.kaaproject.kaa.common.dto.TopicTypeDto;
Expand Down Expand Up @@ -504,21 +503,21 @@ protected List<LogSchemaDto> generateLogSchemaDto(String appId, int count) {
return schemas;
}

protected TenantAdminDto generateTenantAdminDto(TenantDto tenantDto, String userId) {
TenantAdminDto tenant = new TenantAdminDto();
tenant.setName(generateString(TENANT_NAME));
protected UserDto generateTenantAdmin(TenantDto tenantDto, String userId) {
UserDto tenant = new UserDto();
tenant.setUsername(generateString(TENANT_NAME));
if (tenantDto == null) {
tenantDto = generateTenantDto();
}
tenant.setTenant(tenantDto);
tenant.setTenantId(tenantDto.getId());
if (isBlank(userId)) {
List<UserDto> users = generateUsersDto(tenantDto.getId(), KaaAuthorityDto.TENANT_ADMIN, 1);
tenant.setUserId(users.get(0).getId());
tenant.setId(users.get(0).getId());
} else {
tenant.setUserId(userId);
tenant.setId(userId);
}
tenant.setExternalUid(UUID.randomUUID().toString());
tenant = userService.saveTenantAdmin(tenant);
tenant = userService.saveUser(tenant);
return tenant;
}

Expand Down
37 changes: 18 additions & 19 deletions ...o/src/test/java/org/kaaproject/kaa/server/common/dao/service/AbstractServiceImplTest.java
View file
Expand Up @@ -34,7 +34,6 @@
import org.kaaproject.kaa.common.dto.EndpointGroupDto;
import org.kaaproject.kaa.common.dto.EndpointProfileSchemaDto;
import org.kaaproject.kaa.common.dto.KaaAuthorityDto;
import org.kaaproject.kaa.common.dto.TenantAdminDto;
import org.kaaproject.kaa.common.dto.TenantDto;
import org.kaaproject.kaa.common.dto.UserDto;
import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto;
Expand Down Expand Up @@ -105,24 +104,24 @@ protected List<UserDto> generateUsers(String tenantId, KaaAuthorityDto authority
}
return users;
}

protected TenantAdminDto generateTenantAdmin(TenantDto tenantDto, String userId) {
TenantAdminDto tenant = new TenantAdminDto();
tenant.setName(TENANT_NAME);
if (tenantDto == null) {
tenantDto = generateTenant();
}
tenant.setTenant(tenantDto);
if (isBlank(userId)) {
List<UserDto> users = generateUsers(tenantDto.getId(), KaaAuthorityDto.TENANT_ADMIN, 1);
tenant.setUserId(users.get(0).getId());
} else {
tenant.setUserId(userId);
}
tenant.setExternalUid(UUID.randomUUID().toString());
tenant = userService.saveTenantAdmin(tenant);
return tenant;
}
//
// protected TenantAdminDto generateTenantAdmin(TenantDto tenantDto, String userId) {
// TenantAdminDto tenant = new TenantAdminDto();
// tenant.setName(TENANT_NAME);
// if (tenantDto == null) {
// tenantDto = generateTenant();
// }
// tenant.setTenant(tenantDto);
// if (isBlank(userId)) {
// List<UserDto> users = generateUsers(tenantDto.getId(), KaaAuthorityDto.TENANT_ADMIN, 1);
// tenant.setUserId(users.get(0).getId());
// } else {
// tenant.setUserId(userId);
// }
// tenant.setExternalUid(UUID.randomUUID().toString());
// tenant = userService.saveTenantAdmin(tenant);
// return tenant;
// }

protected String readSchemaFileAsString(String filePath) throws IOException {
try {
Expand Down
16 changes: 4 additions & 12 deletions ...n/dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/UserServiceImplTest.java
View file
Expand Up @@ -24,7 +24,6 @@
import org.junit.Ignore;
import org.junit.Test;
import org.kaaproject.kaa.common.dto.KaaAuthorityDto;
import org.kaaproject.kaa.common.dto.TenantAdminDto;
import org.kaaproject.kaa.common.dto.TenantDto;
import org.kaaproject.kaa.common.dto.UserDto;
import org.kaaproject.kaa.server.common.dao.AbstractTest;
Expand Down Expand Up @@ -136,26 +135,19 @@ public void findAllUsersTest() {
}


@Test
public void findAllTenantAdminsTest() {
TenantAdminDto tenantAdminDto = generateTenantAdminDto(null, null);
List<TenantAdminDto> admins = userService.findAllTenantAdmins();
Assert.assertEquals(1, admins.size());
Assert.assertEquals(tenantAdminDto, admins.get(0));
}

@Test
public void removeTenantAdminByIdTest() {
TenantAdminDto tenantAdminDto = generateTenantAdminDto(null, null);
UserDto tenantAdminDto = generateTenantAdmin(null, null);
userService.removeTenantAdminById(tenantAdminDto.getId());
TenantAdminDto found = userService.findTenantAdminById(tenantAdminDto.getId());
UserDto found = userService.findUserById(tenantAdminDto.getId());
Assert.assertNull(found);
}

@Test
public void findTenantAdminByIdTest() {
TenantAdminDto tenantAdminDto = generateTenantAdminDto(null, null);
TenantAdminDto found = userService.findTenantAdminById(tenantAdminDto.getId());
UserDto tenantAdminDto = generateTenantAdmin(null, null);
UserDto found = userService.findUserById(tenantAdminDto.getId());
Assert.assertEquals(tenantAdminDto, found);
}

Expand Down
18 changes: 14 additions & 4 deletions server/common/dto/pom.xml
View file
Expand Up @@ -48,15 +48,25 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>javax.validation</groupId>-->
<!--<artifactId>validation-api</artifactId>-->
<!--<version>${javax.validation.version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${javax.validation.version}</version>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
<version>5.2.4.Final</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit 63d6c63

Please sign in to comment.