Skip to content

Commit

Permalink
refactor: fix various minors (typos etc)
Browse files Browse the repository at this point in the history
  • Loading branch information
buehner authored and groldan committed Oct 3, 2024
1 parent 4299702 commit 23480ba
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion compose/pgbouncer.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -299,7 +299,7 @@ protected <T extends Info> RemoteGeoServerEvent testRemoteCatalogInfoAddEvent(
protected <T extends Info> RemoteGeoServerEvent testRemoteAddEvent(
T info, Consumer<T> addOp, Class<? extends InfoAdded> eventType) {

this.eventsCaptor.stop().clear().capureEventsOf(eventType);
this.eventsCaptor.stop().clear().captureEventsOf(eventType);
eventsCaptor.start();
addOp.accept(info);

Expand Down Expand Up @@ -424,7 +424,7 @@ protected static class EventsCaptor {
final @Getter BusEventCollector local;
final @Getter BusEventCollector remote;

public <E extends InfoEvent> EventsCaptor capureEventsOf(Class<E> type) {
public <E extends InfoEvent> EventsCaptor captureEventsOf(Class<E> type) {
local.capture(type);
remote.capture(type);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* <p>The lookups by predicate have been tested and optimized for performance, in particular the
Expand Down Expand Up @@ -81,7 +81,8 @@ abstract class CatalogInfoLookup<T extends CatalogInfo> 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<ResourceInfo, Name> RESOURCE_NAME_MAPPER =
r -> new NameImpl(r.getNamespace().getId(), r.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ public void reload(Catalog newCatalog) throws Exception {
((CatalogImpl) catalog).sync((CatalogImpl) newCatalog);
((CatalogImpl) catalog).resolve();
} else {
callGeoServeLoaderReload();
callGeoServerLoaderReload();
}
}
} finally {
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 23480ba

Please sign in to comment.