You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@geode.apache.org by GitBox <gi...@apache.org> on 2022/05/05 13:44:40 UTC
[GitHub] [geode] mivanac opened a new pull request, #7662: GEODE-10280: add Status Message to Status Server Command
mivanac opened a new pull request, #7662:
URL: https://github.com/apache/geode/pull/7662
<!-- Thank you for submitting a contribution to Apache Geode. -->
<!-- In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
-->
### For all changes:
- [*] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
- [*] Has your PR been rebased against the latest commit within the target branch (typically `develop`)?
- [*] Is your initial contribution a single, squashed commit?
- [*] Does `gradlew build` run cleanly?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
<!-- Note:
Please ensure that once the PR is submitted, check Concourse for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.
-->
--
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: notifications-unsubscribe@geode.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] mivanac commented on a diff in pull request #7662: GEODE-10280: add Status Message to Status Server Command
Posted by GitBox <gi...@apache.org>.
mivanac commented on code in PR #7662:
URL: https://github.com/apache/geode/pull/7662#discussion_r890261041
##########
geode-core/src/test/java/org/apache/geode/distributed/ServerStateTest.java:
##########
@@ -0,0 +1,207 @@
+/*
+ * 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.distributed;
+
+import static org.apache.geode.distributed.AbstractLauncher.ServiceState.TO_STRING_STATUS_MESSAGE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ServerLauncher.ServerState}.
+ */
+public class ServerStateTest {
+
+ private String classpath;
+ private String gemFireVersion;
+ private String host;
+ private String javaVersion;
+ private String jvmArguments;
+ private String serviceLocation;
+ private String logFile;
+ private String memberName;
+ private Integer pid;
+ private String port;
+ private String statusDescription;
+ private String statusMessage;
+ private Long timestampTime;
+ private Long uptime;
+ private String workingDirectory;
+
+ @BeforeEach
+ public void setUp() {
+ classpath = "test_classpath";
+ gemFireVersion = "test_gemfireVersion";
+ host = "test_host";
+ javaVersion = "test_javaVersion";
+ jvmArguments = "test_jvmArguments";
+ serviceLocation = "test_location";
+ logFile = "test_logfile";
+ memberName = "test_memberName";
+ pid = 6398;
+ port = "test_port";
+ statusDescription = AbstractLauncher.Status.NOT_RESPONDING.getDescription();
+ statusMessage = "test_statusMessage";
+ timestampTime = 1450728233024L;
+ uptime = 16291L;
+ workingDirectory = "test_workingDirectory";
+ }
+
+
+ @Test
+ public void fromJsonWithEmptyStringThrowsIllegalArgumentException() {
+ // given: empty string
+ String emptyString = "";
+
+ // when: passed to fromJson
+ Throwable thrown = catchThrowable(() -> fromJson(emptyString));
+
+ assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
+ .hasCauseInstanceOf(NullPointerException.class);
+ assertThat(thrown.getCause()).isInstanceOf(NullPointerException.class).hasNoCause();
+ }
+
+ @Test
+ public void fromJsonWithWhiteSpaceStringThrowsIllegalArgumentException() {
+ // given: white space string
+ String whiteSpaceString = " ";
+
+ // when: passed to fromJson
+ Throwable thrown = catchThrowable(() -> fromJson(whiteSpaceString));
+
+ // then: throws IllegalArgumentException with cause of NullPointerException
+ assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
+ .hasCauseInstanceOf(NullPointerException.class);
+ assertThat(thrown.getCause()).isInstanceOf(NullPointerException.class).hasNoCause();
+ }
+
+ @Test
+ public void fromJsonWithNullStringThrowsNullPointerException() {
+ // given: null string
+ String nullString = null;
+
+ // when: passed to fromJson
+ Throwable thrown = catchThrowable(() -> fromJson(nullString));
+
+ // then: throws IllegalArgumentException
+ assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
+ .hasCauseInstanceOf(IllegalArgumentException.class);
+ assertThat(thrown.getCause()).isInstanceOf(IllegalArgumentException.class).hasNoCause();
+
+ }
+
+
+ @Test
+ public void fromJsonWithValidJsonStringReturnsServerState() {
+ // given: valid json string
+ String jsonString = createStatusJson();
+
+ // when: passed to fromJson
+ ServerLauncher.ServerState value = fromJson(jsonString);
+
+ // then: return valid instance of ServerState
+ assertThat(value).isInstanceOf(ServerLauncher.ServerState.class);
+ assertThat(value.getClasspath()).isEqualTo(classpath);
+ assertThat(value.getGemFireVersion()).isEqualTo(gemFireVersion);
+ assertThat(value.getHost()).isEqualTo(host);
+ assertThat(value.getJavaVersion()).isEqualTo(javaVersion);
+ assertThat(value.getJvmArguments()).isEqualTo(getJvmArguments());
+ assertThat(value.getLogFile()).isEqualTo(logFile);
+ assertThat(value.getMemberName()).isEqualTo(memberName);
+ assertThat(value.getPid()).isEqualTo(pid);
+ assertThat(value.getPort()).isEqualTo(port);
+ assertThat(value.getServiceLocation()).isEqualTo(serviceLocation);
+ assertThat(value.getStatus().getDescription()).isEqualTo(statusDescription);
+ assertThat(value.getStatusMessage()).isEqualTo(statusMessage);
+ assertThat(value.getTimestamp().getTime()).isEqualTo(timestampTime);
+ assertThat(value.getUptime()).isEqualTo(uptime);
+ assertThat(value.getWorkingDirectory()).isEqualTo(workingDirectory);
+ }
+
+
+ @Test
+ public void fromJsonWithValidJsonStringReturnsServerStateToStringNoStatusMessage() {
+ // given: valid json string
+ String jsonString = createStatusJson();
+
+ // when: passed to fromJson
+ ServerLauncher.ServerState value = fromJson(jsonString);
+
+ String toString = value.toString();
+ assertThat(toString.contains(TO_STRING_STATUS_MESSAGE)).isFalse();
+
+ }
+
+ @Test
+ public void fromJsonWithValidJsonStringReturnsServerStateToStringHasStatusMessage() {
+ // given: valid json string
+ statusDescription = AbstractLauncher.Status.STARTING.getDescription();
+ String jsonString = createStatusJson();
+
+ // when: passed to fromJson
+ ServerLauncher.ServerState value = fromJson(jsonString);
+
+ String toString = value.toString();
+ assertThat(toString.contains(TO_STRING_STATUS_MESSAGE)).isTrue();
+
+ }
+
+ private ServerLauncher.ServerState fromJson(final String value) {
+ return ServerLauncher.ServerState.fromJson(value);
+ }
+
+ private List<String> getJvmArguments() {
+ List<String> list = new ArrayList<>();
+ list.add(jvmArguments);
+ return list;
+ }
+
+ private String createStatusJson() {
+ Map<String, Object> map = new HashMap<>();
+ map.put(AbstractLauncher.ServiceState.JSON_CLASSPATH, classpath);
+ map.put(AbstractLauncher.ServiceState.JSON_GEMFIREVERSION, gemFireVersion);
+ map.put(AbstractLauncher.ServiceState.JSON_HOST, host);
+ map.put(AbstractLauncher.ServiceState.JSON_JAVAVERSION, javaVersion);
+ map.put(AbstractLauncher.ServiceState.JSON_JVMARGUMENTS, getJvmArguments());
+ map.put(AbstractLauncher.ServiceState.JSON_LOCATION, serviceLocation);
+ map.put(AbstractLauncher.ServiceState.JSON_LOGFILE, logFile);
+ map.put(AbstractLauncher.ServiceState.JSON_MEMBERNAME, memberName);
+ map.put(AbstractLauncher.ServiceState.JSON_PID, pid);
+ map.put(AbstractLauncher.ServiceState.JSON_PORT, port);
+ map.put(AbstractLauncher.ServiceState.JSON_STATUS, statusDescription);
+ map.put(AbstractLauncher.ServiceState.JSON_STATUSMESSAGE, statusMessage);
+ map.put(AbstractLauncher.ServiceState.JSON_TIMESTAMP, timestampTime);
+ map.put(AbstractLauncher.ServiceState.JSON_UPTIME, uptime);
+ map.put(AbstractLauncher.ServiceState.JSON_WORKINGDIRECTORY, workingDirectory);
+
+ String status = null;
+ try {
+ status = new ObjectMapper().writeValueAsString(map);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
Review Comment:
Thanks for comments. Updated.
--
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: notifications-unsubscribe@geode.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] kirklund commented on a diff in pull request #7662: GEODE-10280: add Status Message to Status Server Command
Posted by GitBox <gi...@apache.org>.
kirklund commented on code in PR #7662:
URL: https://github.com/apache/geode/pull/7662#discussion_r888472239
##########
geode-core/src/test/java/org/apache/geode/distributed/ServerStateTest.java:
##########
@@ -0,0 +1,207 @@
+/*
+ * 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.distributed;
+
+import static org.apache.geode.distributed.AbstractLauncher.ServiceState.TO_STRING_STATUS_MESSAGE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ServerLauncher.ServerState}.
+ */
+public class ServerStateTest {
+
+ private String classpath;
+ private String gemFireVersion;
+ private String host;
+ private String javaVersion;
+ private String jvmArguments;
+ private String serviceLocation;
+ private String logFile;
+ private String memberName;
+ private Integer pid;
+ private String port;
+ private String statusDescription;
+ private String statusMessage;
+ private Long timestampTime;
+ private Long uptime;
+ private String workingDirectory;
+
+ @BeforeEach
+ public void setUp() {
+ classpath = "test_classpath";
+ gemFireVersion = "test_gemfireVersion";
+ host = "test_host";
+ javaVersion = "test_javaVersion";
+ jvmArguments = "test_jvmArguments";
+ serviceLocation = "test_location";
+ logFile = "test_logfile";
+ memberName = "test_memberName";
+ pid = 6398;
+ port = "test_port";
+ statusDescription = AbstractLauncher.Status.NOT_RESPONDING.getDescription();
+ statusMessage = "test_statusMessage";
+ timestampTime = 1450728233024L;
+ uptime = 16291L;
+ workingDirectory = "test_workingDirectory";
+ }
+
+
+ @Test
+ public void fromJsonWithEmptyStringThrowsIllegalArgumentException() {
+ // given: empty string
+ String emptyString = "";
+
+ // when: passed to fromJson
+ Throwable thrown = catchThrowable(() -> fromJson(emptyString));
+
+ assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
+ .hasCauseInstanceOf(NullPointerException.class);
+ assertThat(thrown.getCause()).isInstanceOf(NullPointerException.class).hasNoCause();
+ }
+
+ @Test
+ public void fromJsonWithWhiteSpaceStringThrowsIllegalArgumentException() {
+ // given: white space string
+ String whiteSpaceString = " ";
+
+ // when: passed to fromJson
+ Throwable thrown = catchThrowable(() -> fromJson(whiteSpaceString));
+
+ // then: throws IllegalArgumentException with cause of NullPointerException
+ assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
+ .hasCauseInstanceOf(NullPointerException.class);
+ assertThat(thrown.getCause()).isInstanceOf(NullPointerException.class).hasNoCause();
+ }
+
+ @Test
+ public void fromJsonWithNullStringThrowsNullPointerException() {
+ // given: null string
+ String nullString = null;
+
+ // when: passed to fromJson
+ Throwable thrown = catchThrowable(() -> fromJson(nullString));
+
+ // then: throws IllegalArgumentException
+ assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
+ .hasCauseInstanceOf(IllegalArgumentException.class);
+ assertThat(thrown.getCause()).isInstanceOf(IllegalArgumentException.class).hasNoCause();
+
+ }
+
+
+ @Test
+ public void fromJsonWithValidJsonStringReturnsServerState() {
+ // given: valid json string
+ String jsonString = createStatusJson();
+
+ // when: passed to fromJson
+ ServerLauncher.ServerState value = fromJson(jsonString);
+
+ // then: return valid instance of ServerState
+ assertThat(value).isInstanceOf(ServerLauncher.ServerState.class);
+ assertThat(value.getClasspath()).isEqualTo(classpath);
+ assertThat(value.getGemFireVersion()).isEqualTo(gemFireVersion);
+ assertThat(value.getHost()).isEqualTo(host);
+ assertThat(value.getJavaVersion()).isEqualTo(javaVersion);
+ assertThat(value.getJvmArguments()).isEqualTo(getJvmArguments());
+ assertThat(value.getLogFile()).isEqualTo(logFile);
+ assertThat(value.getMemberName()).isEqualTo(memberName);
+ assertThat(value.getPid()).isEqualTo(pid);
+ assertThat(value.getPort()).isEqualTo(port);
+ assertThat(value.getServiceLocation()).isEqualTo(serviceLocation);
+ assertThat(value.getStatus().getDescription()).isEqualTo(statusDescription);
+ assertThat(value.getStatusMessage()).isEqualTo(statusMessage);
+ assertThat(value.getTimestamp().getTime()).isEqualTo(timestampTime);
+ assertThat(value.getUptime()).isEqualTo(uptime);
+ assertThat(value.getWorkingDirectory()).isEqualTo(workingDirectory);
+ }
+
+
+ @Test
+ public void fromJsonWithValidJsonStringReturnsServerStateToStringNoStatusMessage() {
+ // given: valid json string
+ String jsonString = createStatusJson();
+
+ // when: passed to fromJson
+ ServerLauncher.ServerState value = fromJson(jsonString);
+
+ String toString = value.toString();
+ assertThat(toString.contains(TO_STRING_STATUS_MESSAGE)).isFalse();
+
+ }
+
+ @Test
+ public void fromJsonWithValidJsonStringReturnsServerStateToStringHasStatusMessage() {
+ // given: valid json string
+ statusDescription = AbstractLauncher.Status.STARTING.getDescription();
+ String jsonString = createStatusJson();
+
+ // when: passed to fromJson
+ ServerLauncher.ServerState value = fromJson(jsonString);
+
+ String toString = value.toString();
+ assertThat(toString.contains(TO_STRING_STATUS_MESSAGE)).isTrue();
+
+ }
+
+ private ServerLauncher.ServerState fromJson(final String value) {
+ return ServerLauncher.ServerState.fromJson(value);
+ }
+
+ private List<String> getJvmArguments() {
+ List<String> list = new ArrayList<>();
+ list.add(jvmArguments);
+ return list;
+ }
+
+ private String createStatusJson() {
+ Map<String, Object> map = new HashMap<>();
+ map.put(AbstractLauncher.ServiceState.JSON_CLASSPATH, classpath);
+ map.put(AbstractLauncher.ServiceState.JSON_GEMFIREVERSION, gemFireVersion);
+ map.put(AbstractLauncher.ServiceState.JSON_HOST, host);
+ map.put(AbstractLauncher.ServiceState.JSON_JAVAVERSION, javaVersion);
+ map.put(AbstractLauncher.ServiceState.JSON_JVMARGUMENTS, getJvmArguments());
+ map.put(AbstractLauncher.ServiceState.JSON_LOCATION, serviceLocation);
+ map.put(AbstractLauncher.ServiceState.JSON_LOGFILE, logFile);
+ map.put(AbstractLauncher.ServiceState.JSON_MEMBERNAME, memberName);
+ map.put(AbstractLauncher.ServiceState.JSON_PID, pid);
+ map.put(AbstractLauncher.ServiceState.JSON_PORT, port);
+ map.put(AbstractLauncher.ServiceState.JSON_STATUS, statusDescription);
+ map.put(AbstractLauncher.ServiceState.JSON_STATUSMESSAGE, statusMessage);
+ map.put(AbstractLauncher.ServiceState.JSON_TIMESTAMP, timestampTime);
+ map.put(AbstractLauncher.ServiceState.JSON_UPTIME, uptime);
+ map.put(AbstractLauncher.ServiceState.JSON_WORKINGDIRECTORY, workingDirectory);
+
+ String status = null;
+ try {
+ status = new ObjectMapper().writeValueAsString(map);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
Review Comment:
Please add `throws JsonProcessingException` to the test method and remove the try-catch block.
--
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: notifications-unsubscribe@geode.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] mivanac merged pull request #7662: GEODE-10280: add Status Message to Status Server Command
Posted by GitBox <gi...@apache.org>.
mivanac merged PR #7662:
URL: https://github.com/apache/geode/pull/7662
--
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: notifications-unsubscribe@geode.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] kirklund commented on a diff in pull request #7662: GEODE-10280: add Status Message to Status Server Command
Posted by GitBox <gi...@apache.org>.
kirklund commented on code in PR #7662:
URL: https://github.com/apache/geode/pull/7662#discussion_r890409212
##########
geode-core/src/test/java/org/apache/geode/distributed/ServerStateTest.java:
##########
@@ -0,0 +1,204 @@
+/*
+ * 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.distributed;
+
+import static org.apache.geode.distributed.AbstractLauncher.ServiceState.TO_STRING_STATUS_MESSAGE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ServerLauncher.ServerState}.
+ */
+public class ServerStateTest {
+
+ private String classpath;
+ private String gemFireVersion;
+ private String host;
+ private String javaVersion;
+ private String jvmArguments;
+ private String serviceLocation;
+ private String logFile;
+ private String memberName;
+ private Integer pid;
+ private String port;
+ private String statusDescription;
+ private String statusMessage;
+ private Long timestampTime;
+ private Long uptime;
+ private String workingDirectory;
+
+ @BeforeEach
+ public void setUp() {
+ classpath = "test_classpath";
+ gemFireVersion = "test_gemfireVersion";
+ host = "test_host";
+ javaVersion = "test_javaVersion";
+ jvmArguments = "test_jvmArguments";
+ serviceLocation = "test_location";
+ logFile = "test_logfile";
+ memberName = "test_memberName";
+ pid = 6398;
+ port = "test_port";
+ statusDescription = AbstractLauncher.Status.NOT_RESPONDING.getDescription();
+ statusMessage = "test_statusMessage";
+ timestampTime = 1450728233024L;
+ uptime = 16291L;
+ workingDirectory = "test_workingDirectory";
+ }
+
+
+ @Test
+ public void fromJsonWithEmptyStringThrowsIllegalArgumentException() {
+ // given: empty string
+ String emptyString = "";
+
+ // when: passed to fromJson
+ Throwable thrown = catchThrowable(() -> fromJson(emptyString));
+
+ assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
+ .hasCauseInstanceOf(NullPointerException.class);
+ assertThat(thrown.getCause()).isInstanceOf(NullPointerException.class).hasNoCause();
Review Comment:
AssertJ added in some more methods like `hasRootCauseInstanceOf` that help a lot in these cases. I'm coding this off of memory but I think it ends up looking like:
```
assertThat(thrown)
.isInstanceOf(IllegalArgumentException.class)
.hasRootCauseInstanceOf(NullPointerException.class);
```
You probably wouldn't need any sort of assertion about there not being any intermediate causes.
--
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: notifications-unsubscribe@geode.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org