Repository: maven Updated Branches: refs/heads/master ceae92265 -> dbecf3b5c
Rename package so it has same structure as settings and model Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/dbecf3b5 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/dbecf3b5 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/dbecf3b5 Branch: refs/heads/master Commit: dbecf3b5cd4ab969284e237a5f705346267bbc07 Parents: ceae922 Author: Robert Scholte <[email protected]> Authored: Thu Dec 25 15:55:13 2014 +0100 Committer: Robert Scholte <[email protected]> Committed: Thu Dec 25 15:55:13 2014 +0100 ---------------------------------------------------------------------- .../building/DefaultToolchainsBuilder.java | 4 +- .../building/io/DefaultToolchainsReader.java | 115 ------------------- .../building/io/ToolchainsParseException.java | 94 --------------- .../toolchain/building/io/ToolchainsReader.java | 83 ------------- .../toolchain/io/DefaultToolchainsReader.java | 115 +++++++++++++++++++ .../toolchain/io/ToolchainsParseException.java | 94 +++++++++++++++ .../maven/toolchain/io/ToolchainsReader.java | 83 +++++++++++++ 7 files changed, 294 insertions(+), 294 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/dbecf3b5/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java index ad3363c..397f0ce 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java @@ -31,8 +31,8 @@ import org.apache.maven.building.Problem; import org.apache.maven.building.ProblemCollector; import org.apache.maven.building.ProblemCollectorFactory; import org.apache.maven.building.Source; -import org.apache.maven.toolchain.building.io.ToolchainsParseException; -import org.apache.maven.toolchain.building.io.ToolchainsReader; +import org.apache.maven.toolchain.io.ToolchainsParseException; +import org.apache.maven.toolchain.io.ToolchainsReader; import org.apache.maven.toolchain.merge.MavenToolchainMerger; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.TrackableBase; http://git-wip-us.apache.org/repos/asf/maven/blob/dbecf3b5/maven-core/src/main/java/org/apache/maven/toolchain/building/io/DefaultToolchainsReader.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/io/DefaultToolchainsReader.java deleted file mode 100644 index 616fe60..0000000 --- a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/DefaultToolchainsReader.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.apache.maven.toolchain.building.io; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.util.Map; - -import javax.inject.Named; -import javax.inject.Singleton; - -import org.apache.maven.toolchain.model.PersistedToolchains; -import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - -/** - * Handles deserialization of toolchains from the default textual format. - * - * @author Robert Scholte - * @since 3.2.6 - */ -@Named -@Singleton -public class DefaultToolchainsReader - implements ToolchainsReader -{ - - @Override - public PersistedToolchains read( File input, Map<String, ?> options ) - throws IOException - { - if ( input == null ) - { - throw new IllegalArgumentException( "input file missing" ); - } - - return read( ReaderFactory.newXmlReader( input ), options ); - } - - @Override - public PersistedToolchains read( Reader input, Map<String, ?> options ) - throws IOException - { - if ( input == null ) - { - throw new IllegalArgumentException( "input reader missing" ); - } - - try - { - MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader(); - return r.read( input, isStrict( options ) ); - } - catch ( XmlPullParserException e ) - { - throw new ToolchainsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); - } - finally - { - IOUtil.close( input ); - } - } - - @Override - public PersistedToolchains read( InputStream input, Map<String, ?> options ) - throws IOException - { - if ( input == null ) - { - throw new IllegalArgumentException( "input stream missing" ); - } - - try - { - MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader(); - return r.read( input, isStrict( options ) ); - } - catch ( XmlPullParserException e ) - { - throw new ToolchainsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); - } - finally - { - IOUtil.close( input ); - } - } - - private boolean isStrict( Map<String, ?> options ) - { - Object value = ( options != null ) ? options.get( IS_STRICT ) : null; - return value == null || Boolean.parseBoolean( value.toString() ); - } - -} http://git-wip-us.apache.org/repos/asf/maven/blob/dbecf3b5/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsParseException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsParseException.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsParseException.java deleted file mode 100644 index b35b3c7..0000000 --- a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsParseException.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.apache.maven.toolchain.building.io; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -import java.io.IOException; - -/** - * Signals a failure to parse the toolchains due to invalid syntax (e.g. non-wellformed XML or unknown elements). - * - * @author Robert Scholte - * @since 3.2.6 - */ -public class ToolchainsParseException - extends IOException -{ - - /** - * The one-based index of the line containing the error. - */ - private final int lineNumber; - - /** - * The one-based index of the column containing the error. - */ - private final int columnNumber; - - /** - * Creates a new parser exception with the specified details. - * - * @param message The error message, may be {@code null}. - * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. - * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. - */ - public ToolchainsParseException( String message, int lineNumber, int columnNumber ) - { - super( message ); - this.lineNumber = lineNumber; - this.columnNumber = columnNumber; - } - - /** - * Creates a new parser exception with the specified details. - * - * @param message The error message, may be {@code null}. - * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. - * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. - * @param cause The nested cause of this error, may be {@code null}. - */ - public ToolchainsParseException( String message, int lineNumber, int columnNumber, Throwable cause ) - { - super( message ); - initCause( cause ); - this.lineNumber = lineNumber; - this.columnNumber = columnNumber; - } - - /** - * Gets the one-based index of the line containing the error. - * - * @return The one-based index of the line containing the error or a non-positive value if unknown. - */ - public int getLineNumber() - { - return lineNumber; - } - - /** - * Gets the one-based index of the column containing the error. - * - * @return The one-based index of the column containing the error or non-positive value if unknown. - */ - public int getColumnNumber() - { - return columnNumber; - } - -} http://git-wip-us.apache.org/repos/asf/maven/blob/dbecf3b5/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsReader.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsReader.java deleted file mode 100644 index 850fdd3..0000000 --- a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsReader.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.apache.maven.toolchain.building.io; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.util.Map; - -import org.apache.maven.toolchain.model.PersistedToolchains; - -/** - * Handles deserialization of toolchains from some kind of textual format like XML. - * - * @author Robert Scholte - * @since 3.2.6 - */ -public interface ToolchainsReader -{ - - /** - * The key for the option to enable strict parsing. This option is of type {@link Boolean} and defaults to {@code - * true}. If {@code false}, unknown elements will be ignored instead of causing a failure. - */ - String IS_STRICT = "org.apache.maven.toolchains.io.isStrict"; - - /** - * Reads the toolchains from the specified file. - * - * @param input The file to deserialize the toolchains from, must not be {@code null}. - * @param options The options to use for deserialization, may be {@code null} to use the default values. - * @return The deserialized toolchains, never {@code null}. - * @throws IOException If the toolchains could not be deserialized. - * @throws ToolchainsParseException If the input format could not be parsed. - */ - PersistedToolchains read( File input, Map<String, ?> options ) - throws IOException, ToolchainsParseException; - - /** - * Reads the toolchains from the specified character reader. The reader will be automatically closed before the method - * returns. - * - * @param input The reader to deserialize the toolchains from, must not be {@code null}. - * @param options The options to use for deserialization, may be {@code null} to use the default values. - * @return The deserialized toolchains, never {@code null}. - * @throws IOException If the toolchains could not be deserialized. - * @throws ToolchainsParseException If the input format could not be parsed. - */ - PersistedToolchains read( Reader input, Map<String, ?> options ) - throws IOException, ToolchainsParseException; - - /** - * Reads the toolchains from the specified byte stream. The stream will be automatically closed before the method - * returns. - * - * @param input The stream to deserialize the toolchains from, must not be {@code null}. - * @param options The options to use for deserialization, may be {@code null} to use the default values. - * @return The deserialized toolchains, never {@code null}. - * @throws IOException If the toolchains could not be deserialized. - * @throws ToolchainsParseException If the input format could not be parsed. - */ - PersistedToolchains read( InputStream input, Map<String, ?> options ) - throws IOException, ToolchainsParseException; - -} http://git-wip-us.apache.org/repos/asf/maven/blob/dbecf3b5/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java new file mode 100644 index 0000000..f3f3dd7 --- /dev/null +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java @@ -0,0 +1,115 @@ +package org.apache.maven.toolchain.io; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.util.Map; + +import javax.inject.Named; +import javax.inject.Singleton; + +import org.apache.maven.toolchain.model.PersistedToolchains; +import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; +import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; + +/** + * Handles deserialization of toolchains from the default textual format. + * + * @author Robert Scholte + * @since 3.2.6 + */ +@Named +@Singleton +public class DefaultToolchainsReader + implements ToolchainsReader +{ + + @Override + public PersistedToolchains read( File input, Map<String, ?> options ) + throws IOException + { + if ( input == null ) + { + throw new IllegalArgumentException( "input file missing" ); + } + + return read( ReaderFactory.newXmlReader( input ), options ); + } + + @Override + public PersistedToolchains read( Reader input, Map<String, ?> options ) + throws IOException + { + if ( input == null ) + { + throw new IllegalArgumentException( "input reader missing" ); + } + + try + { + MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader(); + return r.read( input, isStrict( options ) ); + } + catch ( XmlPullParserException e ) + { + throw new ToolchainsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); + } + finally + { + IOUtil.close( input ); + } + } + + @Override + public PersistedToolchains read( InputStream input, Map<String, ?> options ) + throws IOException + { + if ( input == null ) + { + throw new IllegalArgumentException( "input stream missing" ); + } + + try + { + MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader(); + return r.read( input, isStrict( options ) ); + } + catch ( XmlPullParserException e ) + { + throw new ToolchainsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); + } + finally + { + IOUtil.close( input ); + } + } + + private boolean isStrict( Map<String, ?> options ) + { + Object value = ( options != null ) ? options.get( IS_STRICT ) : null; + return value == null || Boolean.parseBoolean( value.toString() ); + } + +} http://git-wip-us.apache.org/repos/asf/maven/blob/dbecf3b5/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java new file mode 100644 index 0000000..9a5f96f --- /dev/null +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java @@ -0,0 +1,94 @@ +package org.apache.maven.toolchain.io; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.io.IOException; + +/** + * Signals a failure to parse the toolchains due to invalid syntax (e.g. non-wellformed XML or unknown elements). + * + * @author Robert Scholte + * @since 3.2.6 + */ +public class ToolchainsParseException + extends IOException +{ + + /** + * The one-based index of the line containing the error. + */ + private final int lineNumber; + + /** + * The one-based index of the column containing the error. + */ + private final int columnNumber; + + /** + * Creates a new parser exception with the specified details. + * + * @param message The error message, may be {@code null}. + * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. + * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. + */ + public ToolchainsParseException( String message, int lineNumber, int columnNumber ) + { + super( message ); + this.lineNumber = lineNumber; + this.columnNumber = columnNumber; + } + + /** + * Creates a new parser exception with the specified details. + * + * @param message The error message, may be {@code null}. + * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. + * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. + * @param cause The nested cause of this error, may be {@code null}. + */ + public ToolchainsParseException( String message, int lineNumber, int columnNumber, Throwable cause ) + { + super( message ); + initCause( cause ); + this.lineNumber = lineNumber; + this.columnNumber = columnNumber; + } + + /** + * Gets the one-based index of the line containing the error. + * + * @return The one-based index of the line containing the error or a non-positive value if unknown. + */ + public int getLineNumber() + { + return lineNumber; + } + + /** + * Gets the one-based index of the column containing the error. + * + * @return The one-based index of the column containing the error or non-positive value if unknown. + */ + public int getColumnNumber() + { + return columnNumber; + } + +} http://git-wip-us.apache.org/repos/asf/maven/blob/dbecf3b5/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java new file mode 100644 index 0000000..f856f51 --- /dev/null +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java @@ -0,0 +1,83 @@ +package org.apache.maven.toolchain.io; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.util.Map; + +import org.apache.maven.toolchain.model.PersistedToolchains; + +/** + * Handles deserialization of toolchains from some kind of textual format like XML. + * + * @author Robert Scholte + * @since 3.2.6 + */ +public interface ToolchainsReader +{ + + /** + * The key for the option to enable strict parsing. This option is of type {@link Boolean} and defaults to {@code + * true}. If {@code false}, unknown elements will be ignored instead of causing a failure. + */ + String IS_STRICT = "org.apache.maven.toolchains.io.isStrict"; + + /** + * Reads the toolchains from the specified file. + * + * @param input The file to deserialize the toolchains from, must not be {@code null}. + * @param options The options to use for deserialization, may be {@code null} to use the default values. + * @return The deserialized toolchains, never {@code null}. + * @throws IOException If the toolchains could not be deserialized. + * @throws ToolchainsParseException If the input format could not be parsed. + */ + PersistedToolchains read( File input, Map<String, ?> options ) + throws IOException, ToolchainsParseException; + + /** + * Reads the toolchains from the specified character reader. The reader will be automatically closed before the method + * returns. + * + * @param input The reader to deserialize the toolchains from, must not be {@code null}. + * @param options The options to use for deserialization, may be {@code null} to use the default values. + * @return The deserialized toolchains, never {@code null}. + * @throws IOException If the toolchains could not be deserialized. + * @throws ToolchainsParseException If the input format could not be parsed. + */ + PersistedToolchains read( Reader input, Map<String, ?> options ) + throws IOException, ToolchainsParseException; + + /** + * Reads the toolchains from the specified byte stream. The stream will be automatically closed before the method + * returns. + * + * @param input The stream to deserialize the toolchains from, must not be {@code null}. + * @param options The options to use for deserialization, may be {@code null} to use the default values. + * @return The deserialized toolchains, never {@code null}. + * @throws IOException If the toolchains could not be deserialized. + * @throws ToolchainsParseException If the input format could not be parsed. + */ + PersistedToolchains read( InputStream input, Map<String, ?> options ) + throws IOException, ToolchainsParseException; + +}
