// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.config.server.filedistribution;

import com.yahoo.config.FileReference;
import com.yahoo.config.application.api.FileRegistry;

import java.util.List;

public class CombinedLegacyRegistry implements FileRegistry {
    private final FileDBRegistry legacy;
    private final FileDBRegistry future;

    CombinedLegacyRegistry(FileDBRegistry legacy, FileDBRegistry future) {
        this.legacy = legacy;
        this.future = future;
    }
    @Override
    public FileReference addFile(String relativePath) {
        FileReference reference = legacy.addFile(relativePath);
        // TODO: Enable when system tested future.addFile(relativePath, reference);
        return reference;
    }

    @Override
    public String fileSourceHost() {
        return future.fileSourceHost();
    }

    @Override
    public List<Entry> export() {
        return future.export();
    }
}

// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.config.server.filedistribution;

import com.yahoo.config.FileReference;
import com.yahoo.config.application.api.FileRegistry;

import java.util.List;

public class CombinedLegacyRegistry implements FileRegistry {
    private final FileDBRegistry legacy;
    private final FileDBRegistry future;

    CombinedLegacyRegistry(FileDBRegistry legacy, FileDBRegistry future) {
        this.legacy = legacy;
        this.future = future;
    }
    @Override
    public FileReference addFile(String relativePath) {
        FileReference reference = legacy.addFile(relativePath);
        return future.addFile(relativePath, reference);
    }

    @Override
    public String fileSourceHost() {
        return future.fileSourceHost();
    }

    @Override
    public List<Entry> export() {
        return future.export();
    }
}

--- 
+++ 
@@ -17,7 +17,8 @@
     @Override
     public FileReference addFile(String relativePath) {
         FileReference reference = legacy.addFile(relativePath);
-        return future.addFile(relativePath, reference);
+        // TODO: Enable when system tested future.addFile(relativePath, reference);
+        return reference;
     }
 
     @Override
Disable double addFile as legacy code has not been verified yet.
