From 318f94fa329d21d7c77a1f7b1a9aeefb7adb3e5a Mon Sep 17 00:00:00 2001 From: Zygmunt Krynicki Date: Tue, 26 Sep 2023 11:30:29 +0200 Subject: [PATCH] Assorted collection of typos (#1434) * hawkbit-repository: fix typoL annotations Signed-off-by: Zygmunt Krynicki * hawkbit-repository: fix typo: verifies Signed-off-by: Zygmunt Krynicki * hawkbit-repository: fix typo: exclusion Signed-off-by: Zygmunt Krynicki * hawkbit-core: fix typo: placeholder Signed-off-by: Zygmunt Krynicki --------- Signed-off-by: Zygmunt Krynicki --- .../hawkbit/api/PropertyBasedArtifactUrlHandler.java | 8 ++++---- ...positoryManagementMethodPreAuthorizeAnnotatedTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java index e86fb9d20..c4ea4d072 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java @@ -62,8 +62,8 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler { private static final String TENANT_PLACEHOLDER = "tenant"; private static final String TENANT_ID_BASE10_PLACEHOLDER = "tenantId"; 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_BASE62_PLACDEHOLDER = "softwareModuleIdBase62"; + private static final String SOFTWARE_MODULE_ID_BASE10_PLACEHOLDER = "softwareModuleId"; + 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 + "}"; @@ -143,9 +143,9 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler { replaceMap.put(ARTIFACT_ID_BASE62_PLACEHOLDER, Base62Util.fromBase10(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())); - replaceMap.put(SOFTWARE_MODULE_ID_BASE62_PLACDEHOLDER, + replaceMap.put(SOFTWARE_MODULE_ID_BASE62_PLACEHOLDER, Base62Util.fromBase10(placeholder.getSoftwareData().getSoftwareModuleId())); return replaceMap; } diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java index 509c9c550..beb4c57d8 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java @@ -41,7 +41,7 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest { } @Test - @Description("Verfies that repository methods are @PreAuthorize annotated") + @Description("Verifies that repository methods are @PreAuthorize annotated") public void repositoryManagementMethodsArePreAuthorizedAnnotated() throws ClassNotFoundException, URISyntaxException, IOException { final List> findInterfacesInPackage = findInterfacesInPackage(getClass().getPackage(), @@ -49,10 +49,10 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest { assertThat(findInterfacesInPackage).isNotEmpty(); 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 assertThat(METHOD_SECURITY_EXCLUSION).isEmpty(); } @@ -66,7 +66,7 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest { * @param clazz * 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(); for (final Method method : declaredMethods) { final boolean methodExcluded = METHOD_SECURITY_EXCLUSION.contains(method);