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

[#1238] Fix SpServerError key typos (#2173)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-01-08 11:23:40 +02:00
committed by GitHub
parent 5177409fb4
commit cad18fe04b
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java
View File

@@ -12,7 +12,7 @@ package org.eclipse.hawkbit.exception;
import lombok.Getter; import lombok.Getter;
/** /**
* Define the Error code for Error handling * Define the Error codes for Error handling
*/ */
@Getter @Getter
public enum SpServerError { public enum SpServerError {
@@ -21,7 +21,7 @@ public enum SpServerError {
"hawkbit.server.error.repo.genericError", "hawkbit.server.error.repo.genericError",
"unknown error occurred"), "unknown error occurred"),
SP_REPO_ENTITY_ALREADY_EXISTS( SP_REPO_ENTITY_ALREADY_EXISTS(
"hawkbit.server.error.repo.entitiyAlreayExists", "hawkbit.server.error.repo.entityAlreadyExists",
"The given entity already exists in database"), "The given entity already exists in database"),
SP_REPO_AUTO_CONFIRMATION_ALREADY_ACTIVE( SP_REPO_AUTO_CONFIRMATION_ALREADY_ACTIVE(
"hawkbit.server.error.repo.autoConfAlreadyActive", "hawkbit.server.error.repo.autoConfAlreadyActive",
@@ -84,7 +84,7 @@ public enum SpServerError {
"hawkbit.server.error.distributionset.creationFailed.missingModule", "hawkbit.server.error.distributionset.creationFailed.missingModule",
"Creation if Distribution Set failed as module is missing that is configured as mandatory."), "Creation if Distribution Set failed as module is missing that is configured as mandatory."),
SP_INSUFFICIENT_PERMISSION( SP_INSUFFICIENT_PERMISSION(
"hawkbit.server.error.insufficientpermission", "hawkbit.server.error.insufficientPermission",
"Insufficient Permission"), "Insufficient Permission"),
SP_ARTIFACT_DELETE_FAILED( SP_ARTIFACT_DELETE_FAILED(
"hawkbit.server.error.artifact.deleteFailed", "hawkbit.server.error.artifact.deleteFailed",
@@ -105,10 +105,10 @@ public enum SpServerError {
"hawkbit.server.error.quota.storageExceeded", "hawkbit.server.error.quota.storageExceeded",
"Storage quota will be exceeded if file is uploaded."), "Storage quota will be exceeded if file is uploaded."),
SP_ACTION_NOT_CANCELABLE( SP_ACTION_NOT_CANCELABLE(
"hawkbit.server.error.action.notcancelable", "hawkbit.server.error.action.notCancelable",
"Only active actions which are in status pending are cancelable."), "Only active actions which are in status pending are cancelable."),
SP_ACTION_NOT_FORCE_QUITABLE( SP_ACTION_NOT_FORCE_QUITABLE(
"hawkbit.server.error.action.notforcequitable", "hawkbit.server.error.action.notForceQuitable",
"Only active actions which are in status pending can be force quit."), "Only active actions which are in status pending can be force quit."),
SP_DS_INCOMPLETE( SP_DS_INCOMPLETE(
"hawkbit.server.error.distributionset.incomplete", "hawkbit.server.error.distributionset.incomplete",
@@ -132,10 +132,10 @@ public enum SpServerError {
"hawkbit.server.error.repo.tenantNotExists", "hawkbit.server.error.repo.tenantNotExists",
"The entity cannot be inserted due the tenant does not exists"), "The entity cannot be inserted due the tenant does not exists"),
SP_ENTITY_LOCKED( SP_ENTITY_LOCKED(
"hawkbit.server.error.entitiylocked", "hawkbit.server.error.entityLocked",
"The given entity is locked by the server."), "The given entity is locked by the server."),
SP_REPO_ENTITY_READ_ONLY( SP_REPO_ENTITY_READ_ONLY(
"hawkbit.server.error.entityreadonly", "hawkbit.server.error.entityReadOnly",
"The given entity is read only and the change cannot be completed."), "The given entity is read only and the change cannot be completed."),
SP_CONFIGURATION_VALUE_INVALID( SP_CONFIGURATION_VALUE_INVALID(
"hawkbit.server.error.configValueInvalid", "hawkbit.server.error.configValueInvalid",
@@ -144,7 +144,7 @@ public enum SpServerError {
"hawkbit.server.error.configKeyInvalid", "hawkbit.server.error.configKeyInvalid",
"The given configuration key is invalid."), "The given configuration key is invalid."),
SP_ROLLOUT_ILLEGAL_STATE( SP_ROLLOUT_ILLEGAL_STATE(
"hawkbit.server.error.rollout.illegalstate", "hawkbit.server.error.rollout.illegalState",
"The rollout is in the wrong state for the requested operation"), "The rollout is in the wrong state for the requested operation"),
SP_ROLLOUT_VERIFICATION_FAILED( SP_ROLLOUT_VERIFICATION_FAILED(
"hawkbit.server.error.rollout.verificationFailed", "hawkbit.server.error.rollout.verificationFailed",
@@ -162,7 +162,7 @@ public enum SpServerError {
"hawkbit.server.error.repo.tenantConfigurationValueChangeNotAllowed", "hawkbit.server.error.repo.tenantConfigurationValueChangeNotAllowed",
"The requested tenant configuration value modification is not allowed."), "The requested tenant configuration value modification is not allowed."),
SP_MULTIASSIGNMENT_NOT_ENABLED( SP_MULTIASSIGNMENT_NOT_ENABLED(
"hawkbit.server.error.multiassignmentNotEnabled", "hawkbit.server.error.multiAssignmentNotEnabled",
"The requested operation requires multi assignments to be enabled."), "The requested operation requires multi assignments to be enabled."),
SP_NO_WEIGHT_PROVIDED_IN_MULTIASSIGNMENT_MODE( SP_NO_WEIGHT_PROVIDED_IN_MULTIASSIGNMENT_MODE(
"hawkbit.server.error.noWeightProvidedInMultiAssignmentMode", "hawkbit.server.error.noWeightProvidedInMultiAssignmentMode",

4
hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java
View File

@@ -154,7 +154,7 @@ public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegr
+ smIDs.get(0)).contentType(MediaType.APPLICATION_JSON)) + smIDs.get(0)).contentType(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isForbidden()) .andExpect(status().isForbidden())
.andExpect(jsonPath("$.errorCode", equalTo("hawkbit.server.error.entityreadonly"))); .andExpect(jsonPath("$.errorCode", equalTo(SpServerError.SP_REPO_ENTITY_READ_ONLY.getKey())));
} }
@Test @Test
@@ -197,7 +197,7 @@ public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegr
.contentType(MediaType.APPLICATION_JSON).content(smList2.toString())) .contentType(MediaType.APPLICATION_JSON).content(smList2.toString()))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isForbidden()) .andExpect(status().isForbidden())
.andExpect(jsonPath("$.errorCode", equalTo("hawkbit.server.error.entityreadonly"))); .andExpect(jsonPath("$.errorCode", equalTo(SpServerError.SP_REPO_ENTITY_READ_ONLY.getKey())));
} }
@Test @Test

4
hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java
View File

@@ -1165,7 +1165,7 @@ class MgmtRolloutResourceTest extends AbstractManagementApiIntegrationTest {
mvc.perform(post("/rest/v1/rollouts/{rolloutId}/start", rollout.getId())) mvc.perform(post("/rest/v1/rollouts/{rolloutId}/start", rollout.getId()))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isBadRequest()) .andExpect(status().isBadRequest())
.andExpect(jsonPath("errorCode", equalTo("hawkbit.server.error.rollout.illegalstate"))); .andExpect(jsonPath("errorCode", equalTo(SpServerError.SP_ROLLOUT_ILLEGAL_STATE.getKey())));
} }
@Test @Test
@@ -1183,7 +1183,7 @@ class MgmtRolloutResourceTest extends AbstractManagementApiIntegrationTest {
mvc.perform(post("/rest/v1/rollouts/{rolloutId}/resume", rollout.getId())) mvc.perform(post("/rest/v1/rollouts/{rolloutId}/resume", rollout.getId()))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isBadRequest()) .andExpect(status().isBadRequest())
.andExpect(jsonPath("errorCode", equalTo("hawkbit.server.error.rollout.illegalstate"))); .andExpect(jsonPath("errorCode", equalTo(SpServerError.SP_ROLLOUT_ILLEGAL_STATE.getKey())));
} }
@Test @Test