extract common rest code on client side

Author: simschla

lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed 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 com.diffplug.spotless.npm;
+
+abstract class BaseNpmRestService {
+
+	protected final SimpleRestClient restClient;
+
+	BaseNpmRestService(String baseUrl) {
+		this.restClient = SimpleRestClient.forBaseUrl(baseUrl);
+	}
+
+	public String shutdown() {
+		return restClient.post("/shutdown");
+	}
+
+}

lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class PrettierRestService {
-
-	private final SimpleRestClient restClient;
+public class PrettierRestService extends BaseNpmRestService {
 
 	PrettierRestService(String baseUrl) {
-		this.restClient = SimpleRestClient.forBaseUrl(baseUrl);
+		super(baseUrl);
 	}
 
 	public String resolveConfig(File prettierConfigPath, Map<String, Object> prettierConfigOptions) {
@@ -48,9 +46,4 @@ public String format(String fileContent, String configOptionsJsonString) {
 
 		return restClient.postJson("/prettier/format", jsonProperties);
 	}
-
-	public String shutdown() {
-		return restClient.post("/shutdown");
-	}
-
 }

lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class TsFmtRestService {
-
-	private final SimpleRestClient restClient;
+public class TsFmtRestService extends BaseNpmRestService {
 
 	TsFmtRestService(String baseUrl) {
-		this.restClient = SimpleRestClient.forBaseUrl(baseUrl);
+		super(baseUrl);
 	}
 
 	public String format(String fileContent, Map<String, Object> configOptions) {
@@ -35,9 +33,4 @@ public String format(String fileContent, Map<String, Object> configOptions) {
 
 		return restClient.postJson("/tsfmt/format", jsonProperties);
 	}
-
-	public String shutdown() {
-		return restClient.post("/shutdown");
-	}
-
 }