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 1693168 GEODE-9095: Resolve package splitting http-service (#6220)
1693168 is described below
commit 1693168225451e93b9d900b6a3e8ee8fbb06b037
Author: Udo Kohlmeyer <[email protected]>
AuthorDate: Mon Apr 26 16:20:29 2021 +1000
GEODE-9095: Resolve package splitting http-service (#6220)
Co-authored-by: Udo Kohlmeyer <[email protected]>
Co-authored-by: Patrick Johnson <[email protected]>
---
.../geode/internal/cache/{ => http/service}/InternalHttpService.java | 4 +++-
.../META-INF/services/org.apache.geode.internal.cache.CacheService | 2 +-
.../geode/management/internal/InternalHttpServiceJunitTest.java | 2 +-
.../java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/geode-http-service/src/main/java/org/apache/geode/internal/cache/InternalHttpService.java
b/geode-http-service/src/main/java/org/apache/geode/internal/cache/http/service/InternalHttpService.java
similarity index 98%
rename from
geode-http-service/src/main/java/org/apache/geode/internal/cache/InternalHttpService.java
rename to
geode-http-service/src/main/java/org/apache/geode/internal/cache/http/service/InternalHttpService.java
index 7cb27a2..fe6bde7 100644
---
a/geode-http-service/src/main/java/org/apache/geode/internal/cache/InternalHttpService.java
+++
b/geode-http-service/src/main/java/org/apache/geode/internal/cache/http/service/InternalHttpService.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.cache;
+package org.apache.geode.internal.cache.http.service;
import java.io.File;
import java.nio.file.Path;
@@ -41,6 +41,8 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.internal.HttpService;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.cache.CacheService;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.net.SSLConfig;
import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.internal.net.SSLUtil;
diff --git
a/geode-http-service/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService
b/geode-http-service/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService
index ecf5680..985ca27 100644
---
a/geode-http-service/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService
+++
b/geode-http-service/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService
@@ -1 +1 @@
-org.apache.geode.internal.cache.InternalHttpService
\ No newline at end of file
+org.apache.geode.internal.cache.http.service.InternalHttpService
diff --git
a/geode-http-service/src/test/java/org/apache/geode/management/internal/InternalHttpServiceJunitTest.java
b/geode-http-service/src/test/java/org/apache/geode/management/internal/InternalHttpServiceJunitTest.java
index 6100501..cf587e1 100644
---
a/geode-http-service/src/test/java/org/apache/geode/management/internal/InternalHttpServiceJunitTest.java
+++
b/geode-http-service/src/test/java/org/apache/geode/management/internal/InternalHttpServiceJunitTest.java
@@ -28,7 +28,7 @@ import
org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.InternalHttpService;
+import org.apache.geode.internal.cache.http.service.InternalHttpService;
/**
* The InternalHttpServiceJunitTest class is a test suite of test cases
testing the contract and
diff --git
a/geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
b/geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
index d44c9d7..10d558c 100644
---
a/geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
+++
b/geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.junit.rules.ExternalResource;
-import org.apache.geode.internal.cache.InternalHttpService;
+import org.apache.geode.internal.cache.http.service.InternalHttpService;
import org.apache.geode.internal.net.SSLConfig;
import org.apache.geode.tools.pulse.internal.data.PulseConstants;
import org.apache.geode.tools.pulse.tests.Server;
