From 23480ba2c2b988ac316680c23c38ac5002df2ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20B=C3=BChner?= Date: Wed, 2 Oct 2024 19:17:41 +0200 Subject: [PATCH] refactor: fix various minors (typos etc) --- compose/pgbouncer.yml | 2 +- .../{resconfig-v1-service.md => restconfig-v1-service.md} | 0 .../cloud/security/CloudGeoServerSecurityManager.java | 2 +- .../cloud/event/bus/RemoteGeoServerEventBridge.java | 1 - .../geoserver/cloud/event/bus/BusAmqpIntegrationTests.java | 6 +++--- .../events/CatalogApplicationEventsConfigurationTest.java | 2 +- .../org/geoserver/catalog/plugin/CatalogInfoLookup.java | 5 +++-- .../java/org/geoserver/config/plugin/GeoServerImpl.java | 4 ++-- .../cloud/test/ApplicationEventCapturingListener.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename docs/develop/services/{resconfig-v1-service.md => restconfig-v1-service.md} (100%) diff --git a/compose/pgbouncer.yml b/compose/pgbouncer.yml index 108a534e6..8092d6cfd 100644 --- a/compose/pgbouncer.yml +++ b/compose/pgbouncer.yml @@ -1,4 +1,4 @@ -# for simplicity, use one pgbouncer instance per databse +# for simplicity, use one pgbouncer instance per database # postgis -> postgis_pg # acldb -> acldb_pg # pgconfigdb -> pgconfigdb_pg diff --git a/docs/develop/services/resconfig-v1-service.md b/docs/develop/services/restconfig-v1-service.md similarity index 100% rename from docs/develop/services/resconfig-v1-service.md rename to docs/develop/services/restconfig-v1-service.md diff --git a/src/catalog/backends/common/src/main/java/org/geoserver/cloud/security/CloudGeoServerSecurityManager.java b/src/catalog/backends/common/src/main/java/org/geoserver/cloud/security/CloudGeoServerSecurityManager.java index d516db26f..cdcfe28bd 100644 --- a/src/catalog/backends/common/src/main/java/org/geoserver/cloud/security/CloudGeoServerSecurityManager.java +++ b/src/catalog/backends/common/src/main/java/org/geoserver/cloud/security/CloudGeoServerSecurityManager.java @@ -33,7 +33,7 @@ * Extends {@link GeoServerSecurityManager} to {@link #fireRemoteChangedEvent(String) notify} other * services of changes to the security configuration happened on the currently running service, and * to {@link #onRemoteSecurityConfigChangeEvent listen to} those events to {@link - * GeoServerSecurityManager#reload() reload} the security config when other serice made a change. + * GeoServerSecurityManager#reload() reload} the security config when other service made a change. */ @Slf4j(topic = "org.geoserver.cloud.security") public class CloudGeoServerSecurityManager extends GeoServerSecurityManager { diff --git a/src/catalog/event-bus/src/main/java/org/geoserver/cloud/event/bus/RemoteGeoServerEventBridge.java b/src/catalog/event-bus/src/main/java/org/geoserver/cloud/event/bus/RemoteGeoServerEventBridge.java index 1a4092c03..c1689afb9 100644 --- a/src/catalog/event-bus/src/main/java/org/geoserver/cloud/event/bus/RemoteGeoServerEventBridge.java +++ b/src/catalog/event-bus/src/main/java/org/geoserver/cloud/event/bus/RemoteGeoServerEventBridge.java @@ -30,7 +30,6 @@ * * @see #publishRemoteEvent(GeoServerEvent) * @see #publishLocalEvent(RemoteGeoServerEvent) - * @see RemoteGeoServerEventProcessor */ @Slf4j(topic = "org.geoserver.cloud.event.bus.bridge") public class RemoteGeoServerEventBridge implements DisposableBean { diff --git a/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/BusAmqpIntegrationTests.java b/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/BusAmqpIntegrationTests.java index df8449445..7fe22e989 100644 --- a/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/BusAmqpIntegrationTests.java +++ b/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/BusAmqpIntegrationTests.java @@ -151,7 +151,7 @@ public void before() { BusEventCollector remoteAppEvents = remoteAppContext.getBean(BusEventCollector.class); this.eventsCaptor = new EventsCaptor(localAppEvents, remoteAppEvents); - eventsCaptor.stop().clear().capureEventsOf(InfoEvent.class); + eventsCaptor.stop().clear().captureEventsOf(InfoEvent.class); testData = CatalogTestData.empty(() -> catalog, () -> geoserver).initialize(); } @@ -299,7 +299,7 @@ protected RemoteGeoServerEvent testRemoteCatalogInfoAddEvent( protected RemoteGeoServerEvent testRemoteAddEvent( T info, Consumer addOp, Class eventType) { - this.eventsCaptor.stop().clear().capureEventsOf(eventType); + this.eventsCaptor.stop().clear().captureEventsOf(eventType); eventsCaptor.start(); addOp.accept(info); @@ -424,7 +424,7 @@ protected static class EventsCaptor { final @Getter BusEventCollector local; final @Getter BusEventCollector remote; - public EventsCaptor capureEventsOf(Class type) { + public EventsCaptor captureEventsOf(Class type) { local.capture(type); remote.capture(type); return this; diff --git a/src/catalog/events/src/test/java/org/geoserver/cloud/config/catalog/events/CatalogApplicationEventsConfigurationTest.java b/src/catalog/events/src/test/java/org/geoserver/cloud/config/catalog/events/CatalogApplicationEventsConfigurationTest.java index edf1723b9..cee4e2ac4 100644 --- a/src/catalog/events/src/test/java/org/geoserver/cloud/config/catalog/events/CatalogApplicationEventsConfigurationTest.java +++ b/src/catalog/events/src/test/java/org/geoserver/cloud/config/catalog/events/CatalogApplicationEventsConfigurationTest.java @@ -71,7 +71,7 @@ class CatalogApplicationEventsConfigurationTest { private CatalogTestData testData; public @BeforeEach void before() { - listener.setCapureEventsOf(InfoEvent.class); + listener.setCaptureEventsOf(InfoEvent.class); catalog.dispose(); listener.clear(); testData = CatalogTestData.empty(() -> catalog, () -> geoserver).initialize(); diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java index 70ee07ebd..6aab27151 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java @@ -53,7 +53,7 @@ /** * A support index for {@link DefaultMemoryCatalogFacade}, can perform fast lookups of {@link - * CatalogInfo} objects by id or by "name", where the name is defined by a a user provided mapping + * CatalogInfo} objects by id or by "name", where the name is defined by a user provided mapping * function. * *

The lookups by predicate have been tested and optimized for performance, in particular the @@ -81,7 +81,8 @@ abstract class CatalogInfoLookup implements CatalogInfoRe s -> new NameImpl(s.getWorkspace().getId(), s.getName()); /** - * The name uses the namspace id as it does not need to be updated when the namespace is renamed + * The name uses the namespace id as it does not need to be updated when the namespace is + * renamed */ static final Function RESOURCE_NAME_MAPPER = r -> new NameImpl(r.getNamespace().getId(), r.getName()); diff --git a/src/catalog/plugin/src/main/java/org/geoserver/config/plugin/GeoServerImpl.java b/src/catalog/plugin/src/main/java/org/geoserver/config/plugin/GeoServerImpl.java index 3eaa291a2..3a7cf4dc6 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/config/plugin/GeoServerImpl.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/config/plugin/GeoServerImpl.java @@ -561,7 +561,7 @@ public void reload(Catalog newCatalog) throws Exception { ((CatalogImpl) catalog).sync((CatalogImpl) newCatalog); ((CatalogImpl) catalog).resolve(); } else { - callGeoServeLoaderReload(); + callGeoServerLoaderReload(); } } } finally { @@ -579,7 +579,7 @@ public void reload(Catalog newCatalog) throws Exception { } } - private void callGeoServeLoaderReload() throws Exception { + private void callGeoServerLoaderReload() throws Exception { GeoServerLoaderProxy loaderProxy = GeoServerExtensions.bean(GeoServerLoaderProxy.class); if (loaderProxy == null) { GeoServerLoader geoServerLoader = GeoServerExtensions.bean(GeoServerLoader.class); diff --git a/src/catalog/plugin/src/test/java/org/geoserver/cloud/test/ApplicationEventCapturingListener.java b/src/catalog/plugin/src/test/java/org/geoserver/cloud/test/ApplicationEventCapturingListener.java index ab3a35287..b93d13e4d 100644 --- a/src/catalog/plugin/src/test/java/org/geoserver/cloud/test/ApplicationEventCapturingListener.java +++ b/src/catalog/plugin/src/test/java/org/geoserver/cloud/test/ApplicationEventCapturingListener.java @@ -24,7 +24,7 @@ public class ApplicationEventCapturingListener { private Class eventType = ApplicationEvent.class; - public void setCapureEventsOf(Class type) { + public void setCaptureEventsOf(Class type) { this.eventType = type; }