You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2021/04/29 04:23:23 UTC
[geode] branch develop updated: GEODE-9093 - Resolve package
splitting for geode-connectors (#6217)
This is an automated email from the ASF dual-hosted git repository.
udo 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 94104d2 GEODE-9093 - Resolve package splitting for geode-connectors (#6217)
94104d2 is described below
commit 94104d2ebf5a9a39a7d2babb975ffb9fe4a640a4
Author: Udo Kohlmeyer <ko...@users.noreply.github.com>
AuthorDate: Thu Apr 29 14:22:02 2021 +1000
GEODE-9093 - Resolve package splitting for geode-connectors (#6217)
Co-authored-by: Udo Kohlmeyer <ud...@vmware.com>
Co-authored-by: Patrick Johnson <jp...@vmware.com>
---
.../geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java | 6 ++++++
.../jdbc}/internal/ConnectorsDistributedSystemService.java | 3 ++-
.../management/internal/cli/converters/PoolPropertyConverter.java | 2 +-
.../org.apache.geode.distributed.internal.DistributedSystemService | 2 +-
.../jdbc}/internal/sanctioned-geode-connectors-serializables.txt | 0
.../org/apache/geode/management/internal/cli/CommandManager.java | 4 ++--
6 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
index 88d12c7..9832474 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
+import org.apache.geode.connectors.jdbc.internal.ConnectorsDistributedSystemService;
import org.apache.geode.test.junit.categories.SerializationTest;
@Category({SerializationTest.class})
@@ -25,4 +26,9 @@ public class AnalyzeConnectorsSerializablesJUnitTest extends AnalyzeSerializable
protected String getModuleName() {
return "geode-connectors";
}
+
+ @Override
+ protected Class getModuleClass() {
+ return ConnectorsDistributedSystemService.class;
+ }
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectorsDistributedSystemService.java
similarity index 93%
rename from geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectorsDistributedSystemService.java
index 4643bc1..90eec08 100644
--- a/geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectorsDistributedSystemService.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.internal;
+package org.apache.geode.connectors.jdbc.internal;
import java.io.IOException;
import java.net.URL;
@@ -20,6 +20,7 @@ import java.util.Collection;
import org.apache.geode.distributed.internal.DistributedSystemService;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.classloader.ClassPathLoader;
public class ConnectorsDistributedSystemService implements DistributedSystemService {
diff --git a/geode-connectors/src/main/java/org/apache/geode/management/internal/cli/converters/PoolPropertyConverter.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/management/internal/cli/converters/PoolPropertyConverter.java
similarity index 96%
rename from geode-connectors/src/main/java/org/apache/geode/management/internal/cli/converters/PoolPropertyConverter.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/management/internal/cli/converters/PoolPropertyConverter.java
index 6127a18..b80b3a9 100644
--- a/geode-connectors/src/main/java/org/apache/geode/management/internal/cli/converters/PoolPropertyConverter.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/management/internal/cli/converters/PoolPropertyConverter.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.management.internal.cli.converters;
+package org.apache.geode.connectors.jdbc.management.internal.cli.converters;
import java.io.IOException;
import java.util.List;
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
index 5fbba6d..b295fa6 100644
--- 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
@@ -12,5 +12,5 @@
# 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
+org.apache.geode.connectors.jdbc.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/connectors/jdbc/internal/sanctioned-geode-connectors-serializables.txt
similarity index 100%
rename from geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt
rename to geode-connectors/src/main/resources/org/apache/geode/connectors/jdbc/internal/sanctioned-geode-connectors-serializables.txt
diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
index de82f9d..a0de8b6 100644
--- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
+++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
@@ -176,7 +176,7 @@ public class CommandManager {
private void loadCommands() {
Set<String> userCommandPackages = getUserCommandPackages();
Set<String> packagesToScan = new HashSet<>(userCommandPackages);
- packagesToScan.add("org.apache.geode.management.internal.cli.converters");
+ packagesToScan.add("org.apache.geode");
packagesToScan.add("org.springframework.shell.converters");
packagesToScan.add(GfshCommand.class.getPackage().getName());
packagesToScan.add(VersionCommand.class.getPackage().getName());
@@ -195,7 +195,7 @@ public class CommandManager {
// Converters
try {
foundClasses = scanner.scanPackagesForClassesImplementing(Converter.class,
- "org.apache.geode.management.internal.cli.converters");
+ "org.apache.geode.*.converters.**");
for (Class<?> klass : foundClasses) {
try {
Converter<?> object = (Converter<?>) klass.newInstance();