/*
 * Copyright 2013-2017 Real Logic Ltd.
 *
 * 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.agrona.generation;

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Objects;

import static java.io.File.separatorChar;

/**
 * {@link OutputManager} for managing the creation of Java source files as the target of code generation.
 * The character encoding for the {@link java.io.Writer} is UTF-8.
 */
public class PackageOutputManager implements OutputManager
{
    private final File outputDir;

    /**
     * Create a new {@link OutputManager} for generating Java source files into a given package.
     *
     * @param baseDirName for the generated source code.
     * @param packageName for the generated source code relative to the baseDirName.
     * @throws java.io.IOException if an error occurs during output.
     */
    public PackageOutputManager(final String baseDirName, final String packageName) throws IOException
    {
        Objects.requireNonNull(baseDirName, "baseDirName");
        Objects.requireNonNull(packageName, "packageName");

        final String dirName =
            (baseDirName.endsWith("" + separatorChar) ?
                baseDirName : (baseDirName + separatorChar)) + packageName.replace('.', separatorChar);

        outputDir = new File(dirName);
        if (!outputDir.exists())
        {
            if (!outputDir.mkdirs())
            {
                throw new IllegalStateException("Unable to create directory: " + dirName);
            }
        }
    }

    /**
     * Create a new output which will be a Java source file in the given package.
     * <p>
     * The {@link java.io.Writer} should be closed once the caller has finished with it. The Writer is
     * buffer for efficient IO operations.
     *
     * @param name the name of the Java class.
     * @return a {@link java.io.Writer} to which the source code should be written.
     */
    public Writer createOutput(final String name) throws IOException
    {
        final File targetFile = new File(outputDir, name + ".java");

        return Files.newBufferedWriter(targetFile.toPath(), StandardCharsets.UTF_8);
    }
}

@@ -1617,24 +1617,100 @@
 ageName%22);%0A%0A
+        final char lastChar = baseDirName.charAt(baseDirName.length() - 1);%0A
         fina
@@ -1745,33 +1745,19 @@
    (
-baseDirName.endsWith(%22%22 +
+lastChar ==
  sep
@@ -1770,27 +1770,10 @@
 Char
-)
  ?
-%0A               
  bas
@@ -1783,17 +1783,16 @@
 rName : 
-(
 baseDirN
@@ -1815,11 +1815,26 @@
 har)
-)
  +
+%0A               
  pac

Simplify directory name creation in PackageOutputManager.