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

Assorted collection of typos (#1434)

Browse Source 
* hawkbit-repository: fix typoL annotations

Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>

* hawkbit-repository: fix typo: verifies

Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>

* hawkbit-repository: fix typo: exclusion

Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>

* hawkbit-core: fix typo: placeholder

Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>

---------

Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
This commit is contained in:
Zygmunt Krynicki
2023-09-26 11:30:29 +02:00
committed by GitHub
parent e2d90b7092
commit 318f94fa32
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java
View File

@@ -62,8 +62,8 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler {
private static final String TENANT_PLACEHOLDER = "tenant"; private static final String TENANT_PLACEHOLDER = "tenant";
private static final String TENANT_ID_BASE10_PLACEHOLDER = "tenantId"; private static final String TENANT_ID_BASE10_PLACEHOLDER = "tenantId";
private static final String TENANT_ID_BASE62_PLACEHOLDER = "tenantIdBase62"; private static final String TENANT_ID_BASE62_PLACEHOLDER = "tenantIdBase62";
private static final String SOFTWARE_MODULE_ID_BASE10_PLACDEHOLDER = "softwareModuleId"; private static final String SOFTWARE_MODULE_ID_BASE10_PLACEHOLDER = "softwareModuleId";
private static final String SOFTWARE_MODULE_ID_BASE62_PLACDEHOLDER = "softwareModuleIdBase62"; private static final String SOFTWARE_MODULE_ID_BASE62_PLACEHOLDER = "softwareModuleIdBase62";
final static String DEFAULT_URL_PROTOCOL_REF = "{" + PROTOCOL_PLACEHOLDER + "}://{" + HOSTNAME_PLACEHOLDER + "}:{" + PORT_PLACEHOLDER + "}{" + CONTEXT_PATH + "}/{" + TENANT_PLACEHOLDER + "}/controller/v1/{" + CONTROLLER_ID_PLACEHOLDER + "}/softwaremodules/{" + SOFTWARE_MODULE_ID_BASE10_PLACDEHOLDER + "}/artifacts/{" + ARTIFACT_FILENAME_PLACEHOLDER + "}"; final static String DEFAULT_URL_PROTOCOL_REF = "{" + PROTOCOL_PLACEHOLDER + "}://{" + HOSTNAME_PLACEHOLDER + "}:{" + PORT_PLACEHOLDER + "}{" + CONTEXT_PATH + "}/{" + TENANT_PLACEHOLDER + "}/controller/v1/{" + CONTROLLER_ID_PLACEHOLDER + "}/softwaremodules/{" + SOFTWARE_MODULE_ID_BASE10_PLACDEHOLDER + "}/artifacts/{" + ARTIFACT_FILENAME_PLACEHOLDER + "}";
@@ -143,9 +143,9 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler {
replaceMap.put(ARTIFACT_ID_BASE62_PLACEHOLDER, replaceMap.put(ARTIFACT_ID_BASE62_PLACEHOLDER,
Base62Util.fromBase10(placeholder.getSoftwareData().getArtifactId())); Base62Util.fromBase10(placeholder.getSoftwareData().getArtifactId()));
replaceMap.put(ARTIFACT_ID_BASE10_PLACEHOLDER, String.valueOf(placeholder.getSoftwareData().getArtifactId())); replaceMap.put(ARTIFACT_ID_BASE10_PLACEHOLDER, String.valueOf(placeholder.getSoftwareData().getArtifactId()));
replaceMap.put(SOFTWARE_MODULE_ID_BASE10_PLACDEHOLDER, replaceMap.put(SOFTWARE_MODULE_ID_BASE10_PLACEHOLDER,
String.valueOf(placeholder.getSoftwareData().getSoftwareModuleId())); String.valueOf(placeholder.getSoftwareData().getSoftwareModuleId()));
replaceMap.put(SOFTWARE_MODULE_ID_BASE62_PLACDEHOLDER, replaceMap.put(SOFTWARE_MODULE_ID_BASE62_PLACEHOLDER,
Base62Util.fromBase10(placeholder.getSoftwareData().getSoftwareModuleId())); Base62Util.fromBase10(placeholder.getSoftwareData().getSoftwareModuleId()));
return replaceMap; return replaceMap;
} }

8
hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java
View File

@@ -41,7 +41,7 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest {
} }
@Test @Test
@Description("Verfies that repository methods are @PreAuthorize annotated") @Description("Verifies that repository methods are @PreAuthorize annotated")
public void repositoryManagementMethodsArePreAuthorizedAnnotated() public void repositoryManagementMethodsArePreAuthorizedAnnotated()
throws ClassNotFoundException, URISyntaxException, IOException { throws ClassNotFoundException, URISyntaxException, IOException {
final List<Class<?>> findInterfacesInPackage = findInterfacesInPackage(getClass().getPackage(), final List<Class<?>> findInterfacesInPackage = findInterfacesInPackage(getClass().getPackage(),
@@ -49,10 +49,10 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest {
assertThat(findInterfacesInPackage).isNotEmpty(); assertThat(findInterfacesInPackage).isNotEmpty();
for (final Class<?> interfaceToCheck : findInterfacesInPackage) { for (final Class<?> interfaceToCheck : findInterfacesInPackage) {
assertDeclaredMethodsContainsPreAuthorizeAnnotaions(interfaceToCheck); assertDeclaredMethodsContainsPreAuthorizeAnnotations(interfaceToCheck);
} }
// all exclusion should be used, otherwise the method exlusion should be // all exclusion should be used, otherwise the method exclusion should be
// cleaned up again // cleaned up again
assertThat(METHOD_SECURITY_EXCLUSION).isEmpty(); assertThat(METHOD_SECURITY_EXCLUSION).isEmpty();
} }
@@ -66,7 +66,7 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest {
* @param clazz * @param clazz
* the class to retrieve the public declared methods * the class to retrieve the public declared methods
*/ */
private static void assertDeclaredMethodsContainsPreAuthorizeAnnotaions(final Class<?> clazz) { private static void assertDeclaredMethodsContainsPreAuthorizeAnnotations(final Class<?> clazz) {
final Method[] declaredMethods = clazz.getDeclaredMethods(); final Method[] declaredMethods = clazz.getDeclaredMethods();
for (final Method method : declaredMethods) { for (final Method method : declaredMethods) {
final boolean methodExcluded = METHOD_SECURITY_EXCLUSION.contains(method); final boolean methodExcluded = METHOD_SECURITY_EXCLUSION.contains(method);