lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix sonar findings: dupplications (#1989)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-11-09 20:31:11 +02:00
committed by GitHub
parent a9714337e8
commit e886dda9e6
6 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerIntTest.java
View File

@@ -53,9 +53,10 @@ import org.springframework.data.domain.Slice;
@Story("Auto assign checker") @Story("Auto assign checker")
class AutoAssignCheckerIntTest extends AbstractJpaIntegrationTest { class AutoAssignCheckerIntTest extends AbstractJpaIntegrationTest {
private static final String SPACE_AND_DESCRIPTION = " description";
@Autowired @Autowired
private AutoAssignChecker autoAssignChecker; private AutoAssignChecker autoAssignChecker;
@Autowired @Autowired
private DeploymentManagement deploymentManagement; private DeploymentManagement deploymentManagement;
@@ -120,7 +121,7 @@ class AutoAssignCheckerIntTest extends AbstractJpaIntegrationTest {
final String targetDsAIdPref = "targ"; final String targetDsAIdPref = "targ";
final List<Target> targets = testdataFactory.createTargets(25, targetDsAIdPref, final List<Target> targets = testdataFactory.createTargets(25, targetDsAIdPref,
targetDsAIdPref.concat(" description")); targetDsAIdPref.concat(SPACE_AND_DESCRIPTION));
final int targetsCount = targets.size(); final int targetsCount = targets.size();
// assign set A to first 10 targets // assign set A to first 10 targets
@@ -199,7 +200,7 @@ class AutoAssignCheckerIntTest extends AbstractJpaIntegrationTest {
final String targetDsAIdPref = "targ"; final String targetDsAIdPref = "targ";
final List<Target> targets = testdataFactory.createTargets(20, targetDsAIdPref, final List<Target> targets = testdataFactory.createTargets(20, targetDsAIdPref,
targetDsAIdPref.concat(" description")); targetDsAIdPref.concat(SPACE_AND_DESCRIPTION));
// Run the check // Run the check
autoAssignChecker.checkAllTargets(); autoAssignChecker.checkAllTargets();
@@ -262,10 +263,10 @@ class AutoAssignCheckerIntTest extends AbstractJpaIntegrationTest {
implicitLock(setA); implicitLock(setA);
final List<Target> targetsF = testdataFactory.createTargets(10, targetDsFIdPref, final List<Target> targetsF = testdataFactory.createTargets(10, targetDsFIdPref,
targetDsFIdPref.concat(" description")); targetDsFIdPref.concat(SPACE_AND_DESCRIPTION));
final List<Target> targetsA = testdataFactory.createTargets(10, targetDsAIdPref, final List<Target> targetsA = testdataFactory.createTargets(10, targetDsAIdPref,
targetDsAIdPref.concat(" description")); targetDsAIdPref.concat(SPACE_AND_DESCRIPTION));
final int targetsCount = targetsA.size() + targetsF.size(); final int targetsCount = targetsA.size() + targetsF.size();
@@ -475,7 +476,7 @@ class AutoAssignCheckerIntTest extends AbstractJpaIntegrationTest {
final DistributionSet distributionSet, final ActionType actionType) { final DistributionSet distributionSet, final ActionType actionType) {
final List<Target> targets = testdataFactory.createTargets(targetCount, "target" + prefix, final List<Target> targets = testdataFactory.createTargets(targetCount, "target" + prefix,
prefix.concat(" description")); prefix.concat(SPACE_AND_DESCRIPTION));
targetFilterQueryManagement.create( targetFilterQueryManagement.create(
entityFactory.targetFilterQuery().create().name("filter" + prefix).query("id==target" + prefix + "*") entityFactory.targetFilterQuery().create().name("filter" + prefix).query("id==target" + prefix + "*")
.autoAssignDistributionSet(distributionSet).autoAssignActionType(actionType)); .autoAssignDistributionSet(distributionSet).autoAssignActionType(actionType));

10
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetManagementSearchTest.java
View File

@@ -47,6 +47,8 @@ import org.springframework.data.domain.Sort.Direction;
@Story("Target Management Searches") @Story("Target Management Searches")
class TargetManagementSearchTest extends AbstractJpaIntegrationTest { class TargetManagementSearchTest extends AbstractJpaIntegrationTest {
private static final String SPACE_AND_DESCRIPTION = " description";
@Test @Test
@Description("Verifies that targets with given target type are returned from repository.") @Description("Verifies that targets with given target type are returned from repository.")
public void findTargetByTargetType() { public void findTargetByTargetType() {
@@ -92,7 +94,7 @@ class TargetManagementSearchTest extends AbstractJpaIntegrationTest {
final String targetDsAIdPref = "targ-A"; final String targetDsAIdPref = "targ-A";
List<Target> targAs = testdataFactory.createTargets(100, targetDsAIdPref, List<Target> targAs = testdataFactory.createTargets(100, targetDsAIdPref,
targetDsAIdPref.concat(" description"), lastTargetQueryNotOverdue); targetDsAIdPref.concat(SPACE_AND_DESCRIPTION), lastTargetQueryNotOverdue);
targAs = assignTag(targAs, targTagX); targAs = assignTag(targAs, targTagX);
final Target targSpecialName = targetManagement final Target targSpecialName = targetManagement
@@ -100,21 +102,21 @@ class TargetManagementSearchTest extends AbstractJpaIntegrationTest {
final String targetDsBIdPref = "targ-B"; final String targetDsBIdPref = "targ-B";
List<Target> targBs = testdataFactory.createTargets(100, targetDsBIdPref, List<Target> targBs = testdataFactory.createTargets(100, targetDsBIdPref,
targetDsBIdPref.concat(" description"), lastTargetQueryAlwaysOverdue); targetDsBIdPref.concat(SPACE_AND_DESCRIPTION), lastTargetQueryAlwaysOverdue);
targBs = assignTag(targBs, targTagY); targBs = assignTag(targBs, targTagY);
targBs = assignTag(targBs, targTagW); targBs = assignTag(targBs, targTagW);
final String targetDsCIdPref = "targ-C"; final String targetDsCIdPref = "targ-C";
List<Target> targCs = testdataFactory.createTargets(100, targetDsCIdPref, List<Target> targCs = testdataFactory.createTargets(100, targetDsCIdPref,
targetDsCIdPref.concat(" description"), lastTargetQueryAlwaysOverdue); targetDsCIdPref.concat(SPACE_AND_DESCRIPTION), lastTargetQueryAlwaysOverdue);
targCs = assignTag(targCs, targTagZ); targCs = assignTag(targCs, targTagZ);
targCs = assignTag(targCs, targTagW); targCs = assignTag(targCs, targTagW);
final String targetDsDIdPref = "targ-D"; final String targetDsDIdPref = "targ-D";
final List<Target> targDs = testdataFactory.createTargets(100, targetDsDIdPref, final List<Target> targDs = testdataFactory.createTargets(100, targetDsDIdPref,
targetDsDIdPref.concat(" description"), null); targetDsDIdPref.concat(SPACE_AND_DESCRIPTION), null);
final String targetDsEIdPref = "targ-E"; final String targetDsEIdPref = "targ-E";
final List<Target> targEs = testdataFactory.createTargetsWithType(100, targetDsEIdPref, targetTypeX); final List<Target> targEs = testdataFactory.createTargetsWithType(100, targetDsEIdPref, targetTypeX);

10
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MsSqlTestDatabase.java
View File

@@ -19,6 +19,8 @@ import org.junit.jupiter.api.extension.Extension;
@Slf4j @Slf4j
public class MsSqlTestDatabase extends AbstractSqlTestDatabase { public class MsSqlTestDatabase extends AbstractSqlTestDatabase {
private static final String DATABASE_AND_SURROUNDINGS = ";database=";
public MsSqlTestDatabase(final DatasourceContext context) { public MsSqlTestDatabase(final DatasourceContext context) {
super(context); super(context);
} }
@@ -28,14 +30,14 @@ public class MsSqlTestDatabase extends AbstractSqlTestDatabase {
final String uri = context.getDatasourceUrl(); final String uri = context.getDatasourceUrl();
log.info("\033[0;33mCreating mssql schema {} \033[0m", context.getRandomSchemaName()); log.info("\033[0;33mCreating mssql schema {} \033[0m", context.getRandomSchemaName());
executeStatement(uri.split(";database=")[0], "CREATE DATABASE " + context.getRandomSchemaName() + ";"); executeStatement(uri.split(DATABASE_AND_SURROUNDINGS)[0], "CREATE DATABASE " + context.getRandomSchemaName() + ";");
return this; return this;
} }
@Override @Override
protected void dropRandomSchema() { protected void dropRandomSchema() {
final String uri = context.getDatasourceUrl(); final String uri = context.getDatasourceUrl();
final String dbServerUri = uri.split(";database=")[0]; final String dbServerUri = uri.split(DATABASE_AND_SURROUNDINGS)[0];
log.info("\033[0;33mDropping mssql schema {} \033[0m", context.getRandomSchemaName()); log.info("\033[0;33mDropping mssql schema {} \033[0m", context.getRandomSchemaName());
// Needed to avoid the DROP is rejected with "database still in use" // Needed to avoid the DROP is rejected with "database still in use"
@@ -46,6 +48,6 @@ public class MsSqlTestDatabase extends AbstractSqlTestDatabase {
@Override @Override
protected String getRandomSchemaUri() { protected String getRandomSchemaUri() {
final String uri = context.getDatasourceUrl(); final String uri = context.getDatasourceUrl();
return uri.substring(0, uri.indexOf(';')) + ";database=" + context.getRandomSchemaName(); return uri.substring(0, uri.indexOf(';')) + DATABASE_AND_SURROUNDINGS + context.getRandomSchemaName();
} }
} }

7
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/PostgreSqlTestDatabase.java
View File

@@ -22,6 +22,7 @@ import org.junit.jupiter.api.extension.Extension;
public class PostgreSqlTestDatabase extends AbstractSqlTestDatabase { public class PostgreSqlTestDatabase extends AbstractSqlTestDatabase {
private static final String POSTGRESQL_URI_PATTERN = "jdbc:postgresql://{host}:{port}/{db}*"; private static final String POSTGRESQL_URI_PATTERN = "jdbc:postgresql://{host}:{port}/{db}*";
private static final String CURRENT_SCHEMA_AND_SURROUNDINGS = "?currentSchema=";
public PostgreSqlTestDatabase(final DatasourceContext context) { public PostgreSqlTestDatabase(final DatasourceContext context) {
super(context); super(context);
@@ -30,7 +31,7 @@ public class PostgreSqlTestDatabase extends AbstractSqlTestDatabase {
@Override @Override
protected PostgreSqlTestDatabase createRandomSchema() { protected PostgreSqlTestDatabase createRandomSchema() {
log.info("\033[0;33mCreating postgreSql schema {} \033[0m", context.getRandomSchemaName()); log.info("\033[0;33mCreating postgreSql schema {} \033[0m", context.getRandomSchemaName());
final String uri = getBaseUri() + "?currentSchema=" + getSchemaName(); final String uri = getBaseUri() + CURRENT_SCHEMA_AND_SURROUNDINGS + getSchemaName();
executeStatement(uri, "CREATE SCHEMA " + context.getRandomSchemaName() + ";"); executeStatement(uri, "CREATE SCHEMA " + context.getRandomSchemaName() + ";");
return this; return this;
} }
@@ -38,13 +39,13 @@ public class PostgreSqlTestDatabase extends AbstractSqlTestDatabase {
@Override @Override
protected void dropRandomSchema() { protected void dropRandomSchema() {
log.info("\033[0;33mDropping postgreSql schema {}\033[0m", context.getRandomSchemaName()); log.info("\033[0;33mDropping postgreSql schema {}\033[0m", context.getRandomSchemaName());
final String uri = getBaseUri() + "?currentSchema=" + getSchemaName(); final String uri = getBaseUri() + CURRENT_SCHEMA_AND_SURROUNDINGS + getSchemaName();
executeStatement(uri, "DROP SCHEMA " + context.getRandomSchemaName() + " CASCADE;"); executeStatement(uri, "DROP SCHEMA " + context.getRandomSchemaName() + " CASCADE;");
} }
@Override @Override
protected String getRandomSchemaUri() { protected String getRandomSchemaUri() {
return getBaseUri() + "?currentSchema=" + context.getRandomSchemaName(); return getBaseUri() + CURRENT_SCHEMA_AND_SURROUNDINGS + context.getRandomSchemaName();
} }
private String getBaseUri() { private String getBaseUri() {

12
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TestdataFactory.java
View File

@@ -137,6 +137,8 @@ public class TestdataFactory {
public static final String DEFAULT_COLOUR = "#000000"; public static final String DEFAULT_COLOUR = "#000000";
private static final String SPACE_AND_DESCRIPTION = " description";
@Autowired @Autowired
private ControllerManagement controllerManagament; private ControllerManagement controllerManagament;
@@ -1070,7 +1072,7 @@ public class TestdataFactory {
public Rollout createRollout(final String prefix) { public Rollout createRollout(final String prefix) {
createTargets(quotaManagement.getMaxTargetsPerRolloutGroup() * quotaManagement.getMaxRolloutGroupsPerRollout(), createTargets(quotaManagement.getMaxTargetsPerRolloutGroup() * quotaManagement.getMaxRolloutGroupsPerRollout(),
prefix); prefix);
return createRolloutByVariables(prefix, prefix + " description", return createRolloutByVariables(prefix, prefix + SPACE_AND_DESCRIPTION,
quotaManagement.getMaxRolloutGroupsPerRollout(), "controllerId==" + prefix + "*", quotaManagement.getMaxRolloutGroupsPerRollout(), "controllerId==" + prefix + "*",
createDistributionSet(prefix), "50", "5"); createDistributionSet(prefix), "50", "5");
} }
@@ -1085,7 +1087,7 @@ public class TestdataFactory {
final String prefix = RandomStringUtils.randomAlphanumeric(5); final String prefix = RandomStringUtils.randomAlphanumeric(5);
createTargets(quotaManagement.getMaxTargetsPerRolloutGroup() * quotaManagement.getMaxRolloutGroupsPerRollout(), createTargets(quotaManagement.getMaxTargetsPerRolloutGroup() * quotaManagement.getMaxRolloutGroupsPerRollout(),
prefix); prefix);
return createRolloutByVariables(prefix, prefix + " description", return createRolloutByVariables(prefix, prefix + SPACE_AND_DESCRIPTION,
quotaManagement.getMaxRolloutGroupsPerRollout(), "controllerId==" + prefix + "*", quotaManagement.getMaxRolloutGroupsPerRollout(), "controllerId==" + prefix + "*",
createDistributionSet(prefix), "50", "5"); createDistributionSet(prefix), "50", "5");
} }
@@ -1187,7 +1189,7 @@ public class TestdataFactory {
public TargetType findOrCreateTargetType(final String targetTypeName) { public TargetType findOrCreateTargetType(final String targetTypeName) {
return targetTypeManagement.getByName(targetTypeName) return targetTypeManagement.getByName(targetTypeName)
.orElseGet(() -> targetTypeManagement.create(entityFactory.targetType().create() .orElseGet(() -> targetTypeManagement.create(entityFactory.targetType().create()
.name(targetTypeName).description(targetTypeName + " description") .name(targetTypeName).description(targetTypeName + SPACE_AND_DESCRIPTION)
.key(targetTypeName + " key").colour(DEFAULT_COLOUR))); .key(targetTypeName + " key").colour(DEFAULT_COLOUR)));
} }
@@ -1201,7 +1203,7 @@ public class TestdataFactory {
*/ */
public TargetType createTargetType(final String targetTypeName, final List<DistributionSetType> compatibleDsTypes) { public TargetType createTargetType(final String targetTypeName, final List<DistributionSetType> compatibleDsTypes) {
return targetTypeManagement.create(entityFactory.targetType().create().name(targetTypeName) return targetTypeManagement.create(entityFactory.targetType().create().name(targetTypeName)
.description(targetTypeName + " description").colour(DEFAULT_COLOUR) .description(targetTypeName + SPACE_AND_DESCRIPTION).colour(DEFAULT_COLOUR)
.compatible(compatibleDsTypes.stream().map(DistributionSetType::getId).collect(Collectors.toList()))); .compatible(compatibleDsTypes.stream().map(DistributionSetType::getId).collect(Collectors.toList())));
} }
@@ -1216,7 +1218,7 @@ public class TestdataFactory {
final List<TargetTypeCreate> result = new ArrayList<>(count); final List<TargetTypeCreate> result = new ArrayList<>(count);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
result.add(entityFactory.targetType().create() result.add(entityFactory.targetType().create()
.name(targetTypePrefix + i).description(targetTypePrefix + " description") .name(targetTypePrefix + i).description(targetTypePrefix + SPACE_AND_DESCRIPTION)
.key(targetTypePrefix + i + " key").colour(DEFAULT_COLOUR)); .key(targetTypePrefix + i + " key").colour(DEFAULT_COLOUR));
} }
return targetTypeManagement.create(result); return targetTypeManagement.create(result);

17
hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResourceTest.java
View File

@@ -59,14 +59,15 @@ import org.springframework.test.web.servlet.ResultActions;
@Story("Target Type Resource") @Story("Target Type Resource")
class MgmtTargetTypeResourceTest extends AbstractManagementApiIntegrationTest { class MgmtTargetTypeResourceTest extends AbstractManagementApiIntegrationTest {
private final static String TARGETTYPES_ENDPOINT = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING; private static final String TARGETTYPES_ENDPOINT = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING;
private final static String TARGETTYPE_SINGLE_ENDPOINT = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING private static final String TARGETTYPE_SINGLE_ENDPOINT = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING
+ "/{typeid}"; + "/{typeid}";
private final static String TARGETTYPE_DSTYPES_ENDPOINT = TARGETTYPE_SINGLE_ENDPOINT + "/" private static final String TARGETTYPE_DSTYPES_ENDPOINT = TARGETTYPE_SINGLE_ENDPOINT + "/"
+ MgmtRestConstants.TARGETTYPE_V1_DS_TYPES; + MgmtRestConstants.TARGETTYPE_V1_DS_TYPES;
private final static String TARGETTYPE_DSTYPE_SINGLE_ENDPOINT = TARGETTYPE_DSTYPES_ENDPOINT + "/{dstypeid}"; private static final String TARGETTYPE_DSTYPE_SINGLE_ENDPOINT = TARGETTYPE_DSTYPES_ENDPOINT + "/{dstypeid}";
private final static String TEST_USER = "targetTypeTester"; private static final String TEST_USER = "targetTypeTester";
private static final String SPACE_AND_DESCRIPTION = " description";
@Test @Test
@WithUser(principal = "targetTypeTester", allSpPermissions = true, removeFromAllPermission = { SpPermission.READ_TARGET }) @WithUser(principal = "targetTypeTester", allSpPermissions = true, removeFromAllPermission = { SpPermission.READ_TARGET })
@@ -89,7 +90,7 @@ class MgmtTargetTypeResourceTest extends AbstractManagementApiIntegrationTest {
.andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
.andExpect(jsonPath("$.id", is(typeId), Long.class)).andExpect(jsonPath("$.name", equalTo(typeName))) .andExpect(jsonPath("$.id", is(typeId), Long.class)).andExpect(jsonPath("$.name", equalTo(typeName)))
.andExpect(jsonPath("$.colour", is("#000000"))) .andExpect(jsonPath("$.colour", is("#000000")))
.andExpect(jsonPath("$.description", equalTo(typeName + " description"))) .andExpect(jsonPath("$.description", equalTo(typeName + SPACE_AND_DESCRIPTION)))
.andExpect(jsonPath("$.createdBy", equalTo(TEST_USER))) .andExpect(jsonPath("$.createdBy", equalTo(TEST_USER)))
.andExpect(jsonPath("$.createdAt", equalTo(testType.getCreatedAt()))) .andExpect(jsonPath("$.createdAt", equalTo(testType.getCreatedAt())))
.andExpect(jsonPath("$.lastModifiedBy", equalTo(TEST_USER))) .andExpect(jsonPath("$.lastModifiedBy", equalTo(TEST_USER)))
@@ -119,7 +120,7 @@ class MgmtTargetTypeResourceTest extends AbstractManagementApiIntegrationTest {
.andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].name", contains(typeName + index))) .andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].name", contains(typeName + index)))
.andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].colour", contains("#000000"))) .andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].colour", contains("#000000")))
.andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].description", .andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].description",
contains(typeName + " description"))) contains(typeName + SPACE_AND_DESCRIPTION)))
.andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].createdBy", contains(TEST_USER))) .andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].createdBy", contains(TEST_USER)))
.andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].createdAt", .andExpect(jsonPath("$.content.[?(@.id=='" + typeId + "')].createdAt",
contains(testTypes.get(index).getCreatedAt()))) contains(testTypes.get(index).getCreatedAt())))
@@ -171,7 +172,7 @@ class MgmtTargetTypeResourceTest extends AbstractManagementApiIntegrationTest {
.andExpect(jsonPath("$.content.[0].id", equalTo(testTypeC.getId().intValue()))) .andExpect(jsonPath("$.content.[0].id", equalTo(testTypeC.getId().intValue())))
.andExpect(jsonPath("$.content.[0].name", equalTo(typeNameC))) .andExpect(jsonPath("$.content.[0].name", equalTo(typeNameC)))
.andExpect(jsonPath("$.content.[0].colour", equalTo("#000000"))) .andExpect(jsonPath("$.content.[0].colour", equalTo("#000000")))
.andExpect(jsonPath("$.content.[0].description", equalTo(typeNameC + " description"))) .andExpect(jsonPath("$.content.[0].description", equalTo(typeNameC + SPACE_AND_DESCRIPTION)))
.andExpect(jsonPath("$.content.[0].createdBy", equalTo(TEST_USER))) .andExpect(jsonPath("$.content.[0].createdBy", equalTo(TEST_USER)))
.andExpect(jsonPath("$.content.[0].createdAt", equalTo(testTypeC.getCreatedAt()))) .andExpect(jsonPath("$.content.[0].createdAt", equalTo(testTypeC.getCreatedAt())))
.andExpect(jsonPath("$.content.[0].lastModifiedBy", equalTo(TEST_USER))) .andExpect(jsonPath("$.content.[0].lastModifiedBy", equalTo(TEST_USER)))