Rename DefaultEnvRewriter -> DefaultEnvWriter

2 files changed, 20 insertions, 20 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriter.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriter.java
index df324a77a87..83ac3eeeaf4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriter.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriter.java
@@ -21,23 +21,23 @@ import static java.util.stream.Collectors.joining;
  *
  * @author bjorncs
  */
-public class DefaultEnvRewriter {
+public class DefaultEnvWriter {
 
     private final Map<String, Operation> operations = new LinkedHashMap<>();
 
-    public DefaultEnvRewriter addOverride(String name, String value) {
+    public DefaultEnvWriter addOverride(String name, String value) {
         return addOperation("override", name, value);
     }
 
-    public DefaultEnvRewriter addFallback(String name, String value) {
+    public DefaultEnvWriter addFallback(String name, String value) {
         return addOperation("fallback", name, value);
     }
 
-    public DefaultEnvRewriter addUnset(String name) {
+    public DefaultEnvWriter addUnset(String name) {
         return addOperation("unset", name, null);
     }
 
-    private DefaultEnvRewriter addOperation(String action, String name, String value) {
+    private DefaultEnvWriter addOperation(String action, String name, String value) {
         if (operations.containsKey(name)) {
             throw new IllegalArgumentException(String.format("Operation on variable '%s' already added", name));
         }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriterTest.java
index 8314eaa684d..5d687c06e94 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriterTest.java
@@ -18,42 +18,42 @@ import static org.junit.Assert.assertTrue;
 /**
  * @author bjorncs
  */
-public class DefaultEnvRewriterTest {
+public class DefaultEnvWriterTest {
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    private static final Path EXAMPLE_FILE = Paths.get(DefaultEnvRewriterTest.class.getResource("/default-env-example.txt").getFile());
-    private static final Path EXPECTED_RESULT_FILE = Paths.get(DefaultEnvRewriterTest.class.getResource("/default-env-rewritten.txt").getFile());
+    private static final Path EXAMPLE_FILE = Paths.get(DefaultEnvWriterTest.class.getResource("/default-env-example.txt").getFile());
+    private static final Path EXPECTED_RESULT_FILE = Paths.get(DefaultEnvWriterTest.class.getResource("/default-env-rewritten.txt").getFile());
 
     @Test
     public void default_env_is_correctly_rewritten() throws IOException {
         Path tempFile = temporaryFolder.newFile().toPath();
         Files.copy(EXAMPLE_FILE, tempFile, REPLACE_EXISTING);
 
-        DefaultEnvRewriter rewriter = new DefaultEnvRewriter();
-        rewriter.addOverride("VESPA_HOSTNAME", "my-new-hostname");
-        rewriter.addFallback("VESPA_CONFIGSERVER", "new-fallback-configserver");
-        rewriter.addOverride("VESPA_TLS_CONFIG_FILE", "/override/path/to/config.file");
+        DefaultEnvWriter writer = new DefaultEnvWriter();
+        writer.addOverride("VESPA_HOSTNAME", "my-new-hostname");
+        writer.addFallback("VESPA_CONFIGSERVER", "new-fallback-configserver");
+        writer.addOverride("VESPA_TLS_CONFIG_FILE", "/override/path/to/config.file");
 
-        boolean modified = rewriter.updateFile(tempFile);
+        boolean modified = writer.updateFile(tempFile);
 
         assertTrue(modified);
         assertEquals(Files.readString(EXPECTED_RESULT_FILE), Files.readString(tempFile));
 
-        modified = rewriter.updateFile(tempFile);
+        modified = writer.updateFile(tempFile);
         assertFalse(modified);
         assertEquals(Files.readString(EXPECTED_RESULT_FILE), Files.readString(tempFile));
     }
 
     @Test
     public void generates_default_env_content() throws IOException {
-        DefaultEnvRewriter rewriter = new DefaultEnvRewriter();
-        rewriter.addOverride("VESPA_HOSTNAME", "my-new-hostname");
-        rewriter.addFallback("VESPA_CONFIGSERVER", "new-fallback-configserver");
-        rewriter.addOverride("VESPA_TLS_CONFIG_FILE", "/override/path/to/config.file");
-        rewriter.addUnset("VESPA_LEGACY_OPTION");
-        String generatedContent = rewriter.generateContent();
+        DefaultEnvWriter writer = new DefaultEnvWriter();
+        writer.addOverride("VESPA_HOSTNAME", "my-new-hostname");
+        writer.addFallback("VESPA_CONFIGSERVER", "new-fallback-configserver");
+        writer.addOverride("VESPA_TLS_CONFIG_FILE", "/override/path/to/config.file");
+        writer.addUnset("VESPA_LEGACY_OPTION");
+        String generatedContent = writer.generateContent();
         assertEquals(Files.readString(EXPECTED_RESULT_FILE), generatedContent);
     }
 }
\ No newline at end of file