From 0908acb894a88537cbee1bb2634f264050760676 Mon Sep 17 00:00:00 2001 From: Nick Reich Date: Mon, 12 Mar 2018 14:34:05 -0700 Subject: [PATCH] Bug/geode 4798: Add JDBC Connector classes to sanctioned serializables (#1592) * Added infrastructure to handle sanctioning serializables in JDBC Connector and improve use of serializable in the module --- .../internal/cli/AlterConnectionFunction.java | 2 +- .../internal/cli/AlterMappingFunction.java | 2 +- .../cli/CreateConnectionFunction.java | 2 +- .../internal/cli/CreateMappingFunction.java | 2 +- .../cli/DescribeConnectionFunction.java | 2 +- .../internal/cli/DescribeMappingFunction.java | 2 +- .../cli/DestroyConnectionFunction.java | 2 +- .../internal/cli/DestroyMappingFunction.java | 2 +- .../jdbc/internal/cli/ExceptionHandler.java | 2 +- .../cli/FunctionContextArgumentProvider.java | 10 ++--- .../jdbc/internal/cli/JdbcCliFunction.java | 16 +++---- .../internal/cli/ListConnectionFunction.java | 2 +- .../internal/cli/ListMappingFunction.java | 2 +- .../ConnectorsDistributedSystemService.java | 43 +++++++++++++++++++ .../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 0 ...tributed.internal.DistributedSystemService | 16 +++++++ ...ctioned-geode-connectors-serializables.txt | 18 ++++++++ ...alyzeConnectorsSerializablesJUnitTest.java | 30 +++++++++++++ .../JDBCConnectorFunctionsSecurityTest.java | 2 +- .../internal/cli/JdbcCliFunctionTest.java | 4 +- .../geode/codeAnalysis/excludedClasses.txt | 5 +++ .../sanctionedDataSerializables.txt | 0 .../internal/InternalDataSerializer.java | 2 - 23 files changed, 137 insertions(+), 31 deletions(-) create mode 100644 geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java rename geode-connectors/src/main/resources/META-INF/{services => }/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd (100%) create mode 100644 geode-connectors/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService create mode 100755 geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt create mode 100644 geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java create mode 100644 geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt create mode 100644 geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java index 7ac824075343..14b231d183b6 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java @@ -29,7 +29,7 @@ public class AlterConnectionFunction extends JdbcCliFunction { AlterConnectionFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java index f7f004500736..55c26576844b 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java @@ -28,7 +28,7 @@ public class AlterMappingFunction extends JdbcCliFunction { AlterMappingFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java index 55b435844ddb..1fee150d57e9 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java @@ -27,7 +27,7 @@ public class CreateConnectionFunction extends JdbcCliFunction { CreateConnectionFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java index a7fb1a5d7472..f6c4139a68f0 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java @@ -26,7 +26,7 @@ public class CreateMappingFunction extends JdbcCliFunction { CreateMappingFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java index 73c1cb8983d7..054335fb52bc 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java @@ -23,7 +23,7 @@ public class DescribeConnectionFunction extends JdbcCliFunction { DescribeConnectionFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java index 49c56a31884b..76dcc649c238 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java @@ -23,7 +23,7 @@ public class DescribeMappingFunction extends JdbcCliFunction { DescribeMappingFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java index e69710db8e7c..85b7335d55bb 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java @@ -25,7 +25,7 @@ public class DestroyConnectionFunction extends JdbcCliFunction { DestroyConnectionFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java index 643aea6bcc38..9d3c0efa0df8 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java @@ -25,7 +25,7 @@ public class DestroyMappingFunction extends JdbcCliFunction { DestroyMappingFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ExceptionHandler.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ExceptionHandler.java index 59b4a6a1b753..8545ffd1587e 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ExceptionHandler.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ExceptionHandler.java @@ -28,7 +28,7 @@ /** * Handles exceptions by returning an error result to GFSH */ -class ExceptionHandler implements Serializable { +class ExceptionHandler { private static final Logger logger = LogService.getLogger(); void handleException(final FunctionContext context, final Exception exception) { diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java index 57d58193094b..11865fb5e5dc 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java @@ -31,7 +31,7 @@ /** * Provides JDBC command dependencies provided in the FunctionContext */ -class FunctionContextArgumentProvider implements Serializable { +class FunctionContextArgumentProvider { static InternalCache getCacheFromContext(FunctionContext context) { return (InternalCache) context.getCache(); @@ -45,26 +45,26 @@ static String getMemberFromContext(FunctionContext context) { /** * Returns the JdbcConnectorService */ - JdbcConnectorService getJdbcConnectorService(FunctionContext context) { + static JdbcConnectorService getJdbcConnectorService(FunctionContext context) { return getCacheFromContext(context).getService(JdbcConnectorService.class); } /** * Returns the name of the distributed member or its id if it has no name */ - String getMember(FunctionContext context) { + static String getMember(FunctionContext context) { return getMemberFromContext(context); } /** * Returns XmlEntity for JdbcConnectorServiceXmlGenerator snippet of cache xml */ - XmlEntity createXmlEntity(FunctionContext context) { + static XmlEntity createXmlEntity(FunctionContext context) { return new XmlEntity(createCacheProvider(context), CACHE, PREFIX, NAMESPACE, CONNECTION_SERVICE.getTypeName(), NAME, CONNECTION_SERVICE.getTypeName()); } - private XmlEntity.CacheProvider createCacheProvider(FunctionContext context) { + private static XmlEntity.CacheProvider createCacheProvider(FunctionContext context) { return () -> getCacheFromContext(context); } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java index 8b7bd46b1f3a..2032fadc171f 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java @@ -23,13 +23,10 @@ @Experimental public abstract class JdbcCliFunction implements InternalFunction { - private final FunctionContextArgumentProvider argumentProvider; - private final ExceptionHandler exceptionHandler; + private final transient ExceptionHandler exceptionHandler; - JdbcCliFunction(FunctionContextArgumentProvider argumentProvider, - ExceptionHandler exceptionHandler) { - this.argumentProvider = argumentProvider; - this.exceptionHandler = exceptionHandler; + JdbcCliFunction() { + this.exceptionHandler = new ExceptionHandler(); } @Override @@ -45,7 +42,8 @@ public String getId() { @Override public void execute(FunctionContext context) { try { - JdbcConnectorService service = argumentProvider.getJdbcConnectorService(context); + JdbcConnectorService service = + FunctionContextArgumentProvider.getJdbcConnectorService(context); T2 result = getFunctionResult(service, context); context.getResultSender().lastResult(result); } catch (Exception e) { @@ -54,11 +52,11 @@ public void execute(FunctionContext context) { } String getMember(FunctionContext context) { - return argumentProvider.getMember(context); + return FunctionContextArgumentProvider.getMember(context); } XmlEntity createXmlEntity(FunctionContext context) { - return argumentProvider.createXmlEntity(context); + return FunctionContextArgumentProvider.createXmlEntity(context); } abstract T2 getFunctionResult(JdbcConnectorService service, FunctionContext context) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java index 58866a6f5c95..50a16578cce1 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java @@ -25,7 +25,7 @@ public class ListConnectionFunction extends JdbcCliFunction { ListConnectionFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java index 7b472e191d0a..0d24bd03d972 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java @@ -25,7 +25,7 @@ public class ListMappingFunction extends JdbcCliFunction { ListMappingFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java b/geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java new file mode 100644 index 000000000000..6535e1dc424b --- /dev/null +++ b/geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java @@ -0,0 +1,43 @@ +/* + * 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; + +import java.io.IOException; +import java.net.URL; +import java.util.Collection; + +import org.apache.geode.distributed.internal.DistributedSystemService; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.internal.ClassPathLoader; +import org.apache.geode.internal.InternalDataSerializer; + +public class ConnectorsDistributedSystemService implements DistributedSystemService { + @Override + public void init(InternalDistributedSystem internalDistributedSystem) { + + } + + @Override + public Class getInterface() { + return getClass(); + } + + @Override + public Collection getSerializationWhitelist() throws IOException { + URL sanctionedSerializables = ClassPathLoader.getLatest().getResource(getClass(), + "sanctioned-geode-connectors-serializables.txt"); + return InternalDataSerializer.loadClassNames(sanctionedSerializables); + } +} diff --git a/geode-connectors/src/main/resources/META-INF/services/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd similarity index 100% rename from geode-connectors/src/main/resources/META-INF/services/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd rename to geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd diff --git a/geode-connectors/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService b/geode-connectors/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService new file mode 100644 index 000000000000..5fbba6d72c4e --- /dev/null +++ b/geode-connectors/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService @@ -0,0 +1,16 @@ +# 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. +org.apache.geode.internal.ConnectorsDistributedSystemService + diff --git a/geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt b/geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt new file mode 100755 index 000000000000..6a6b8be93992 --- /dev/null +++ b/geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt @@ -0,0 +1,18 @@ +org/apache/geode/connectors/jdbc/JdbcConnectorException,true,1 +org/apache/geode/connectors/jdbc/internal/ConnectionConfigExistsException,false +org/apache/geode/connectors/jdbc/internal/ConnectionConfigNotFoundException,false +org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration,false,name:java/lang/String,parameters:java/util/Map,password:java/lang/String,url:java/lang/String,user:java/lang/String +org/apache/geode/connectors/jdbc/internal/RegionMapping,false,columnToFieldMap:java/util/Map,connectionConfigName:java/lang/String,fieldToColumnMap:java/util/Map,pdxClassName:java/lang/String,primaryKeyInValue:java/lang/Boolean,regionName:java/lang/String,tableName:java/lang/String +org/apache/geode/connectors/jdbc/internal/RegionMappingExistsException,false +org/apache/geode/connectors/jdbc/internal/RegionMappingNotFoundException,false +org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction,false +org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction,false +org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction,false +org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction,false +org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction,false +org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction,false +org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction,false +org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction,false +org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction,false +org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction,false +org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction,false diff --git a/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java new file mode 100644 index 000000000000..93942804ba6c --- /dev/null +++ b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java @@ -0,0 +1,30 @@ +/* + * 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.codeAnalysis; + +import org.junit.experimental.categories.Category; + +import org.apache.geode.test.junit.categories.IntegrationTest; +import org.apache.geode.test.junit.categories.LuceneTest; + + +@Category({IntegrationTest.class}) +public class AnalyzeConnectorsSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest { + + @Override + protected String getModuleName() { + return "geode-connectors"; + } +} diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java index abc0a3de7a11..951ca213f9fa 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java @@ -38,7 +38,7 @@ class InheritsDefaultPermissionsJDBCFunction extends JdbcCliFunction { InheritsDefaultPermissionsJDBCFunction() { - super(new FunctionContextArgumentProvider(), new ExceptionHandler()); + super(); } @Override diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java index 6ada61e4a552..320191e89f3d 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java @@ -32,9 +32,7 @@ public class JdbcCliFunctionTest { @Before public void setup() { - FunctionContextArgumentProvider argumentProvider = mock(FunctionContextArgumentProvider.class); - ExceptionHandler exceptionHandler = mock(ExceptionHandler.class); - function = new JdbcCliFunction(argumentProvider, exceptionHandler) { + function = new JdbcCliFunction() { @Override Void getFunctionResult(JdbcConnectorService service, FunctionContext context) { return null; diff --git a/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt new file mode 100644 index 000000000000..2a4046b14a97 --- /dev/null +++ b/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt @@ -0,0 +1,5 @@ +org/apache/geode/connectors/jdbc/internal/xml/ElementType +org/apache/geode/connectors/jdbc/internal/xml/ElementType$1 +org/apache/geode/connectors/jdbc/internal/xml/ElementType$2 +org/apache/geode/connectors/jdbc/internal/xml/ElementType$3 +org/apache/geode/connectors/jdbc/internal/xml/ElementType$4 diff --git a/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java index 8c2b27df649c..c1ca15c21cb6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java @@ -187,8 +187,6 @@ public abstract class InternalDataSerializer extends DataSerializer implements D // jar deployment + ";com.sun.proxy.$Proxy*" + ";com.healthmarketscience.rmiio.RemoteInputStream" - + ";org.apache.geode.connectors.jdbc.internal.**" // TODO - remove this! See GEODE-4752 - // geode-modules + ";org.apache.geode.modules.util.SessionCustomExpiry" + ";";