This is an automated email from the ASF dual-hosted git repository.
nreich pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 0908acb Bug/geode 4798: Add JDBC Connector classes to sanctioned
serializables (#1592)
0908acb is described below
commit 0908acb894a88537cbee1bb2634f264050760676
Author: Nick Reich <nre...@pivotal.io>
AuthorDate: Mon Mar 12 14:34:05 2018 -0700
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
---
.../jdbc/internal/cli/AlterConnectionFunction.java | 2 +-
.../jdbc/internal/cli/AlterMappingFunction.java | 2 +-
.../internal/cli/CreateConnectionFunction.java | 2 +-
.../jdbc/internal/cli/CreateMappingFunction.java | 2 +-
.../internal/cli/DescribeConnectionFunction.java | 2 +-
.../jdbc/internal/cli/DescribeMappingFunction.java | 2 +-
.../internal/cli/DestroyConnectionFunction.java | 2 +-
.../jdbc/internal/cli/DestroyMappingFunction.java | 2 +-
.../jdbc/internal/cli/ExceptionHandler.java | 2 +-
.../cli/FunctionContextArgumentProvider.java | 10 ++---
.../jdbc/internal/cli/JdbcCliFunction.java | 16 ++++----
.../jdbc/internal/cli/ListConnectionFunction.java | 2 +-
.../jdbc/internal/cli/ListMappingFunction.java | 2 +-
.../ConnectorsDistributedSystemService.java | 43 ++++++++++++++++++++++
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 0
...e.distributed.internal.DistributedSystemService | 16 ++++++++
.../sanctioned-geode-connectors-serializables.txt | 18 +++++++++
.../AnalyzeConnectorsSerializablesJUnitTest.java} | 21 +++++------
.../cli/JDBCConnectorFunctionsSecurityTest.java | 2 +-
.../jdbc/internal/cli/JdbcCliFunctionTest.java | 4 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 5 +++
.../codeAnalysis/sanctionedDataSerializables.txt | 0
.../geode/internal/InternalDataSerializer.java | 2 -
23 files changed, 116 insertions(+), 43 deletions(-)
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 7ac8240..14b231d 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<ConnectionConfiguration, CliFunctionResult> {
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 f7f0045..55c2657 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 @@ import
org.apache.geode.management.internal.configuration.domain.XmlEntity;
public class AlterMappingFunction extends JdbcCliFunction<RegionMapping,
CliFunctionResult> {
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 55b4358..1fee150 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<ConnectionConfiguration, CliFunctionResult> {
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 a7fb1a5..f6c4139 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 @@ import
org.apache.geode.management.internal.configuration.domain.XmlEntity;
public class CreateMappingFunction extends JdbcCliFunction<RegionMapping,
CliFunctionResult> {
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 73c1cb8..054335f 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 @@ import
org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
public class DescribeConnectionFunction extends JdbcCliFunction<String,
ConnectionConfiguration> {
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 49c56a3..76dcc64 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 @@ import
org.apache.geode.connectors.jdbc.internal.RegionMapping;
public class DescribeMappingFunction extends JdbcCliFunction<String,
RegionMapping> {
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 e69710d..85b7335 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 @@ import
org.apache.geode.management.internal.configuration.domain.XmlEntity;
public class DestroyConnectionFunction extends JdbcCliFunction<String,
CliFunctionResult> {
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 643aea6..9d3c0ef 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 @@ import
org.apache.geode.management.internal.configuration.domain.XmlEntity;
public class DestroyMappingFunction extends JdbcCliFunction<String,
CliFunctionResult> {
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 59b4a6a..8545ffd 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 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
/**
* 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 57d5819..11865fb 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 @@ import
org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* 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 @@ class FunctionContextArgumentProvider implements
Serializable {
/**
* 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 8b7bd46..2032fad 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 @@ import
org.apache.geode.management.internal.configuration.domain.XmlEntity;
@Experimental
public abstract class JdbcCliFunction<T1, T2> implements InternalFunction<T1> {
- 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 abstract class JdbcCliFunction<T1, T2> implements
InternalFunction<T1> {
@Override
public void execute(FunctionContext<T1> 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 abstract class JdbcCliFunction<T1, T2> implements
InternalFunction<T1> {
}
String getMember(FunctionContext<T1> context) {
- return argumentProvider.getMember(context);
+ return FunctionContextArgumentProvider.getMember(context);
}
XmlEntity createXmlEntity(FunctionContext<T1> context) {
- return argumentProvider.createXmlEntity(context);
+ return FunctionContextArgumentProvider.createXmlEntity(context);
}
abstract T2 getFunctionResult(JdbcConnectorService service,
FunctionContext<T1> 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 58866a6..50a1657 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 @@ import
org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
public class ListConnectionFunction extends JdbcCliFunction<Void,
ConnectionConfiguration[]> {
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 7b472e1..0d24bd0 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 @@ import
org.apache.geode.connectors.jdbc.internal.RegionMapping;
public class ListMappingFunction extends JdbcCliFunction<Void,
RegionMapping[]> {
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 0000000..6535e1d
--- /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<String> 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 0000000..5fbba6d
--- /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 0000000..6a6b8be
--- /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/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
similarity index 54%
copy from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
copy to
geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
index 49c56a3..9394280 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
+++
b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
@@ -12,22 +12,19 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.connectors.jdbc.internal.cli;
+package org.apache.geode.codeAnalysis;
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
-import org.apache.geode.connectors.jdbc.internal.RegionMapping;
+import org.junit.experimental.categories.Category;
-@Experimental
-public class DescribeMappingFunction extends JdbcCliFunction<String,
RegionMapping> {
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.LuceneTest;
- DescribeMappingFunction() {
- super(new FunctionContextArgumentProvider(), new ExceptionHandler());
- }
+
+@Category({IntegrationTest.class})
+public class AnalyzeConnectorsSerializablesJUnitTest extends
AnalyzeSerializablesJUnitTest {
@Override
- RegionMapping getFunctionResult(JdbcConnectorService service,
FunctionContext<String> context) {
- return service.getMappingForRegion(context.getArguments());
+ 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 abc0a3d..951ca21 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 @@ import org.apache.geode.test.junit.rules.ServerStarterRule;
class InheritsDefaultPermissionsJDBCFunction extends JdbcCliFunction<String,
CliFunctionResult> {
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 6ada61e..320191e 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<Void, Void>(argumentProvider,
exceptionHandler) {
+ function = new JdbcCliFunction<Void, Void>() {
@Override
Void getFunctionResult(JdbcConnectorService service,
FunctionContext<Void> 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 0000000..2a4046b
--- /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 0000000..e69de29
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 8c2b27d..c1ca15c 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" + ";";
--
To stop receiving notification emails like this one, please contact
nre...@apache.org.
