Skip to content

Commit 25610e5

Browse files
committed
Additional qa fixes from sonarcloud reports
1 parent e094d02 commit 25610e5

File tree

31 files changed

+120
-88
lines changed

31 files changed

+120
-88
lines changed

src/apps/base-images/geoserver/src/main/java/org/geoserver/cloud/InstallDuckDBExtensions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class InstallDuckDBExtensions {
3232
*
3333
* @param args Command line arguments (not used)
3434
*/
35-
@SuppressWarnings("java:S4507") // printStackTrace() is ok in this class
35+
@SuppressWarnings({"java:S4507", "java:S106"}) // printStackTrace() and System.out.println() are ok in this class
3636
public static void main(String[] args) {
3737
try {
3838
Class.forName("org.duckdb.DuckDBDriver");

src/apps/geoserver/wms/src/test/java/org/geoserver/cloud/wms/app/StatusCodeWmsExceptionHandlerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.core.env.PropertyResolver;
2727
import org.springframework.http.HttpStatus;
2828

29-
public class StatusCodeWmsExceptionHandlerTest {
29+
class StatusCodeWmsExceptionHandlerTest {
3030
private StatusCodeWmsExceptionHandler handler;
3131
private PropertyResolver propertyResolver = mock(PropertyResolver.class);
3232
private GeoServer geoServer = mock(GeoServer.class);

src/catalog/backends/common/src/main/java/org/geoserver/security/impl/GsCloudLayerGroupContainmentCache.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ private void updateContainedLayers(
371371
String resourceId = layer.getResource().getId();
372372
clearContainment(groupSummary, resourceId);
373373
} else if (removed instanceof LayerGroupInfo child) {
374-
//// getGroupData(child)
375374
LayerGroupSummary summary = groupCache.get(child.getId());
376375
if (summary != null) {
377376
summary.containerGroups.remove(groupSummary);

src/catalog/backends/datadir/src/main/java/org/geoserver/cloud/catalog/backend/datadir/EventuallyConsistentCatalogFacade.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public void setDefaultDataStore(WorkspaceInfo workspace, DataStoreInfo store) {
215215
enforcer.setDefaultDataStore(workspace, store);
216216
}
217217

218-
///////// point queries, apply retry if
218+
// point queries, apply retry if
219219

220220
@Override
221221
public <T extends StoreInfo> T getStore(String id, Class<T> clazz) {

src/catalog/backends/datadir/src/test/java/org/geoserver/cloud/catalog/backend/datadir/EventualConsistencyEnforcerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ class EventualConsistencyEnforcerTest {
4040

4141
private EventualConsistencyEnforcer enforcer;
4242

43-
public static @BeforeAll void oneTimeSetup() {
43+
static @BeforeAll void oneTimeSetup() {
4444
// avoid the chatty warning logs due to catalog looking up a bean of type GeoServerConfigurationLock
4545
GeoServerExtensionsHelper.setIsSpringContext(false);
4646
}
4747

48-
public @BeforeEach void before() {
48+
@BeforeEach
49+
void before() {
4950
catalog = new CatalogPlugin();
5051
geoserver = new GeoServerImpl();
5152
geoserver.setCatalog(catalog);

src/catalog/backends/pgconfig/src/main/java/org/geoserver/cloud/backend/pgconfig/catalog/repository/LoggingTemplate.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ private void logAfter(long reqId, String sql, Duration elapsed, Exception error)
106106
if (error instanceof org.springframework.dao.EmptyResultDataAccessException) {
107107
return;
108108
}
109-
error.printStackTrace();
110109
}
111110
if (!log.isDebugEnabled()) {
112111
return;

src/catalog/backends/pgconfig/src/main/java/org/geoserver/cloud/backend/pgconfig/config/PgconfigConfigRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public SettingsInfo update(SettingsInfo settings, Patch patch) {
101101
return update(settings, patch, SettingsInfo.class, "settingsinfo", "settingsinfos", SettingsInfoRowMapper);
102102
}
103103

104+
@SuppressWarnings("java:S2077") // table is a safe argument, constrained to "settingsinfo" and "serviceinfo"
104105
private <T extends Info> T update(
105106
T value, Patch patch, Class<T> clazz, String table, String querytable, RowMapper<T> mapper) {
106107

src/catalog/backends/pgconfig/src/main/java/org/geoserver/cloud/backend/pgconfig/resource/PgconfigResource.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import lombok.EqualsAndHashCode;
1515
import lombok.Getter;
1616
import lombok.NonNull;
17-
import lombok.ToString;
1817
import org.geoserver.platform.resource.Paths;
1918
import org.geoserver.platform.resource.Resource;
2019
import org.geoserver.platform.resource.ResourceListener;
@@ -23,7 +22,6 @@
2322
* @since 1.4
2423
*/
2524
@EqualsAndHashCode(exclude = {"store", "lastChecked"})
26-
@ToString(exclude = "store")
2725
class PgconfigResource implements Resource {
2826

2927
@Getter

src/catalog/backends/pgconfig/src/test/java/org/geoserver/cloud/backend/pgconfig/resource/PgconfigResourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ private LockRegistry pgconfigLockRegistry() {
158158
LockRepository pgconfigLockRepository() {
159159
DataSource dataSource = container.getDataSource();
160160
DefaultLockRepository lockRepository = new DefaultLockRepository(dataSource, "test-instance");
161-
// override default table prefix "INT" by "RESOURCE_" (matching table definition
162-
// RESOURCE_LOCK in init.XXX.sql
161+
// override default table prefix "INT" by "RESOURCE_" (matching table RESOURCE_LOCK in flyway ddl scripts)
163162
lockRepository.setPrefix("RESOURCE_");
164163
// time in ms to expire dead locks (10k is the default)
165164
lockRepository.setTimeToLive(300_000);
@@ -516,6 +515,7 @@ public void testUpdateStateHandlesDeletedResource() throws Exception {
516515
* </p>
517516
*/
518517
@Test
518+
@SuppressWarnings("java:S2925") // Thread.sleep
519519
public void testUpdateStateHandlesModifiedResource() throws Exception {
520520
// Create a test resource in the database
521521
String path = "security/updated.properties";

src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingCatalogFacade.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public CachingCatalogFacade(@NonNull ExtendedCatalogFacade facade, @NonNull Cach
6666
this.support = support;
6767
}
6868

69-
///////////////////// Eviction event listeners //////////////////////////
69+
// /////////////////// Eviction event listeners //////////////////////////
7070

7171
@EventListener(classes = DefaultWorkspaceSet.class)
7272
public void onDefaultWorkspaceSet() {
@@ -114,7 +114,7 @@ public void onCatalogInfoRemovedEvent(CatalogInfoRemoved event) {
114114
}
115115
}
116116

117-
///////////////////// CatalogFacade override methods //////////////////////////
117+
// /////////////////// CatalogFacade override methods //////////////////////////
118118

119119
@Override
120120
public <T extends CatalogInfo> T add(@NonNull T info) {

0 commit comments

Comments
 (0)