/*
 * Copyright (c) 2010. The Codehaus. All Rights Reserved.
 *
 *   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 org.codehaus.httpcache4j;

import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import org.codehaus.httpcache4j.util.DirectivesParser;

import java.io.Serializable;
import java.util.*;

/**
 * @author <a href="mailto:hamnis@codehaus.org">Erlend Hamnaberg</a>
 * @version $Revision: $
 */
public class Directives implements Iterable<Directive>, Serializable {
    private final Map<String, Directive> directives;

    public Directives(Iterable<Directive> directives) {
        Map<String, Directive> directivesMap = new LinkedHashMap<String, Directive>();
        for (Directive directive : directives) {
            directivesMap.put(directive.getName(), directive);
        }
        this.directives = Collections.unmodifiableMap(directivesMap);
    }

    public Directives() {
        directives = Collections.emptyMap();
    }

    @Deprecated
    /**
     * @deprecated Use {@link DirectivesParser} or {@link org.codehaus.httpcache4j.util.AuthDirectivesParser} instead.
     */
    public Directives(String value) {
        this(DirectivesParser.parse(value));
    }

    public boolean hasDirective(String key) {
        return directives.containsKey(key);
    }

    public String get(String key) {
        Directive directive = directives.get(key);
        if (directive == null) {
            return "";
        }
        return directive.getValue();
    }

    public Directive getAsDirective(String key) {
        return directives.get(key);
    }

    public int size() {
        return directives.size();
    }

    /**
     * @return a new Immutable iterator
     */
    public Iterator<Directive> iterator() {
        return ImmutableList.copyOf(directives.values()).iterator();
    }
    
    @Override
    public String toString() {
        return Joiner.on(", ").join(directives.values());
    }

    public Directives add(Directive directive) {
        ImmutableList.Builder<Directive> dirs = ImmutableList.builder();
        dirs.addAll(this);
        dirs.add(directive);
        return new Directives(dirs.build());
    }
}

@@ -1506,249 +1506,8 @@
  %7D%0A%0A
-    @Deprecated%0A    /**%0A     * @deprecated Use %7B@link DirectivesParser%7D or %7B@link org.codehaus.httpcache4j.util.AuthDirectivesParser%7D instead.%0A     */%0A    public Directives(String value) %7B%0A        this(DirectivesParser.parse(value));%0A    %7D%0A%0A
     

Remove deprecated method