kirklund commented on a change in pull request #7299: URL: https://github.com/apache/geode/pull/7299#discussion_r791827736
########## File path: geode-serialization/src/integrationTest/java/org/apache/geode/internal/serialization/filter/SystemPropertyGlobalSerialFilterConfigurationFactoryIntegrationTest.java ########## @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.internal.serialization.filter; + +import static org.apache.commons.lang3.JavaVersion.JAVA_1_8; +import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assumptions.assumeThat; +import static org.mockito.Mockito.mock; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; + +public class SystemPropertyGlobalSerialFilterConfigurationFactoryIntegrationTest { + + private SerializableObjectConfig serializableObjectConfig; + + @Rule + public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + @Before + public void setUp() { + serializableObjectConfig = mock(SerializableObjectConfig.class); + } + + @Test + public void throwsUnsupportedOperationException_whenEnableGlobalSerialFilterIsTrue_onLessThanJava8u121() { + assumeThat(isJavaVersionAtMost(JAVA_1_8)).isTrue(); + + System.setProperty("geode.enableGlobalSerialFilter", "true"); + + // TODO:KIRK: move to acceptance test to validate expected logging + // TODO:KIRK: improve consistency between GlobalSerialFilter and ObjectInputFilter + // TODO:KIRK: uplift logging severity to warn or error Review comment: Remove these TODO:KIRK comments. ########## File path: geode-serialization/src/main/java/org/apache/geode/internal/serialization/filter/GlobalSerialFilterConfiguration.java ########## @@ -38,7 +38,9 @@ private final SerializableObjectConfig serializableObjectConfig; private final FilterPatternFactory filterPatternFactory; private final Supplier<Set<String>> sanctionedClassesSupplier; - private final Consumer<String> logger; + private final Consumer<String> infoLogger; + private final Consumer<String> warnLogger; + private final Consumer<String> errorLogger; Review comment: Would it be cleaner and still testable to use a single log4j-api Logger interface instead of three Consumer? The tests need to differentiate between three different log levels: INFO, WARN and ERROR. ########## File path: geode-serialization/src/test/java/org/apache/geode/internal/serialization/filter/GlobalSerialFilterConfigurationTest.java ########## @@ -29,38 +29,60 @@ private SerializableObjectConfig config; private GlobalSerialFilter globalSerialFilter; - private Consumer<String> logger; + private Consumer<String> infoLogger; + private Consumer<String> warnLogger; + private Consumer<String> errorLogger; @Before public void setUp() { config = mock(SerializableObjectConfig.class); globalSerialFilter = mock(GlobalSerialFilter.class); - logger = uncheckedCast(mock(Consumer.class)); + infoLogger = uncheckedCast(mock(Consumer.class)); + warnLogger = uncheckedCast(mock(Consumer.class)); + errorLogger = uncheckedCast(mock(Consumer.class)); } @Test - public void configureLogs_whenUnsupportedOperationExceptionIsThrown_withCause() { + public void configureLogsInfo_whenOperationIsSuccessful() { Review comment: I think we should remove `configure` from the beginning of these test names since it's a `FunctionalInterface` with just one method. ########## File path: geode-serialization/src/test/java/org/apache/geode/internal/serialization/filter/ReflectiveFacadeGlobalSerialFilterFactoryTest.java ########## @@ -16,23 +16,31 @@ import static java.util.Collections.emptySet; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowable; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.lang.reflect.InvocationTargetException; +import java.util.function.Supplier; +import org.junit.Rule; import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; public class ReflectiveFacadeGlobalSerialFilterFactoryTest { + @Rule + public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + @Test public void constructsDelegatingGlobalSerialFilter() { Review comment: I just noticed that a previous rename of `DelegatingGlobalSerialFilter` to `ReflectiveFacadeGlobalSerialFIlter` missed a bunch of test names. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
