elharo commented on code in PR #1208: URL: https://github.com/apache/maven/pull/1208#discussion_r1310379975
########## maven-core/src/main/java/org/apache/maven/utils/dag/DAG.java: ########## @@ -0,0 +1,239 @@ +/* + * 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. + */ +package org.apache.maven.utils.dag; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * DAG = Directed Acyclic Graph + * + * @author <a href="michal.mac...@dimatics.com">Michal Maczka</a> + * + * TODO this class should be renamed from DAG to Dag + */ +public class DAG implements Cloneable, Serializable { + // ------------------------------------------------------------ + // Fields + // ------------------------------------------------------------ + /** + * Nodes will be kept in two data structures at the same time for faster processing + */ + /** + * Maps vertex's label to vertex + */ + private Map<String, Vertex> vertexMap = new HashMap<>(); + + /** + * Conatin list of all vertices + */ + private List<Vertex> vertexList = new ArrayList<>(); + + // ------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------ + + /** + * + */ + public DAG() { + super(); + } + + // ------------------------------------------------------------ + // Accessors + // ------------------------------------------------------------ + + /** + * @return the vertices + */ + public List<Vertex> getVertices() { + return vertexList; + } + + /** + * @deprecated instead use {@link #getVertices()} + * @return the vertices + */ + @Deprecated + public List<Vertex> getVerticies() { + return getVertices(); + } + + public Set<String> getLabels() { + return vertexMap.keySet(); + } + + // ------------------------------------------------------------ + // Implementation + // ------------------------------------------------------------ + + /** + * Adds vertex to DAG. If vertex of given label already exist in DAG no vertex is added + * + * @param label The label of the Vertex + * @return New vertex if vertex of given label was not present in the DAG or existing vertex if vertex of given + * label was already added to DAG + */ + public Vertex addVertex(final String label) { + Vertex retValue = null; + + // check if vertex is already in DAG + if (vertexMap.containsKey(label)) { + retValue = vertexMap.get(label); + } else { + retValue = new Vertex(label); + + vertexMap.put(label, retValue); + + vertexList.add(retValue); + } + + return retValue; + } + + public void addEdge(final String from, final String to) throws CycleDetectedException { + final Vertex v1 = addVertex(from); + + final Vertex v2 = addVertex(to); + + addEdge(v1, v2); + } + + public void addEdge(final Vertex from, final Vertex to) throws CycleDetectedException { + + from.addEdgeTo(to); + + to.addEdgeFrom(from); + + final List<String> cycle = CycleDetector.introducesCycle(to); + + if (cycle != null) { + // remove edge which introduced cycle + + removeEdge(from, to); + + final String msg = "Edge between '" + from + "' and '" + to + "' introduces to cycle in the graph"; + + throw new CycleDetectedException(msg, cycle); + } + } + + public void removeEdge(final String from, final String to) { + final Vertex v1 = addVertex(from); + + final Vertex v2 = addVertex(to); + + removeEdge(v1, v2); + } + + public void removeEdge(final Vertex from, final Vertex to) { + from.removeEdgeTo(to); + + to.removeEdgeFrom(from); + } + + public Vertex getVertex(final String label) { + final Vertex retValue = vertexMap.get(label); + + return retValue; + } + + public boolean hasEdge(final String label1, final String label2) { + final Vertex v1 = getVertex(label1); + + final Vertex v2 = getVertex(label2); + + final boolean retValue = v1.getChildren().contains(v2); + + return retValue; + } + + /** + * @param label see name + * @return the childs + */ + public List<String> getChildLabels(final String label) { + final Vertex vertex = getVertex(label); + + return vertex.getChildLabels(); + } + + /** + * @param label see name + * @return the parents + */ + public List<String> getParentLabels(final String label) { + final Vertex vertex = getVertex(label); + + return vertex.getParentLabels(); + } + + /** + * @see java.lang.Object#clone() + */ + @Override + public Object clone() throws CloneNotSupportedException { + // this is what's failing.. + final Object retValue = super.clone(); + + return retValue; + } + + /** + * Indicates if there is at least one edge leading to or from vertex of given label + * @param label the label + * @return <code>true</code> if this vertex is connected with other vertex,<code>false</code> otherwise + */ + public boolean isConnected(final String label) { + final Vertex vertex = getVertex(label); + + final boolean retValue = vertex.isConnected(); + + return retValue; + } + + /** + * Return the list of labels of successor in order decided by topological sort + * + * @param label The label of the vertex whose predecessors are searched Review Comment: nit: the ########## maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java: ########## @@ -44,7 +43,17 @@ public MavenPluginMavenPrerequisiteChecker(RuntimeInformation runtimeInformation @Override public void accept(PluginDescriptor pluginDescriptor) { String requiredMavenVersion = pluginDescriptor.getRequiredMavenVersion(); - if (StringUtils.isNotBlank(requiredMavenVersion)) { + + boolean isBlankVersion = true; + if (requiredMavenVersion != null) { + for (int i = 0; i < requiredMavenVersion.length(); i++) { Review Comment: just use String.trim ########## maven-core/src/main/java/org/apache/maven/utils/dag/DAG.java: ########## @@ -0,0 +1,239 @@ +/* + * 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. + */ +package org.apache.maven.utils.dag; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * DAG = Directed Acyclic Graph + * + * @author <a href="michal.mac...@dimatics.com">Michal Maczka</a> + * + * TODO this class should be renamed from DAG to Dag + */ +public class DAG implements Cloneable, Serializable { + // ------------------------------------------------------------ + // Fields + // ------------------------------------------------------------ + /** + * Nodes will be kept in two data structures at the same time for faster processing + */ + /** + * Maps vertex's label to vertex + */ + private Map<String, Vertex> vertexMap = new HashMap<>(); + + /** + * Conatin list of all vertices + */ + private List<Vertex> vertexList = new ArrayList<>(); + + // ------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------ + + /** + * + */ + public DAG() { + super(); + } + + // ------------------------------------------------------------ + // Accessors + // ------------------------------------------------------------ + + /** + * @return the vertices + */ + public List<Vertex> getVertices() { + return vertexList; + } + + /** + * @deprecated instead use {@link #getVertices()} + * @return the vertices + */ + @Deprecated + public List<Vertex> getVerticies() { + return getVertices(); + } + + public Set<String> getLabels() { + return vertexMap.keySet(); + } + + // ------------------------------------------------------------ + // Implementation + // ------------------------------------------------------------ + + /** + * Adds vertex to DAG. If vertex of given label already exist in DAG no vertex is added + * + * @param label The label of the Vertex + * @return New vertex if vertex of given label was not present in the DAG or existing vertex if vertex of given + * label was already added to DAG + */ + public Vertex addVertex(final String label) { + Vertex retValue = null; + + // check if vertex is already in DAG + if (vertexMap.containsKey(label)) { + retValue = vertexMap.get(label); + } else { + retValue = new Vertex(label); + + vertexMap.put(label, retValue); + + vertexList.add(retValue); + } + + return retValue; + } + + public void addEdge(final String from, final String to) throws CycleDetectedException { + final Vertex v1 = addVertex(from); + + final Vertex v2 = addVertex(to); + + addEdge(v1, v2); + } + + public void addEdge(final Vertex from, final Vertex to) throws CycleDetectedException { + + from.addEdgeTo(to); + + to.addEdgeFrom(from); + + final List<String> cycle = CycleDetector.introducesCycle(to); + + if (cycle != null) { + // remove edge which introduced cycle + + removeEdge(from, to); + + final String msg = "Edge between '" + from + "' and '" + to + "' introduces to cycle in the graph"; + + throw new CycleDetectedException(msg, cycle); + } + } + + public void removeEdge(final String from, final String to) { + final Vertex v1 = addVertex(from); + + final Vertex v2 = addVertex(to); + + removeEdge(v1, v2); + } + + public void removeEdge(final Vertex from, final Vertex to) { + from.removeEdgeTo(to); + + to.removeEdgeFrom(from); + } + + public Vertex getVertex(final String label) { + final Vertex retValue = vertexMap.get(label); + + return retValue; + } + + public boolean hasEdge(final String label1, final String label2) { + final Vertex v1 = getVertex(label1); + + final Vertex v2 = getVertex(label2); + + final boolean retValue = v1.getChildren().contains(v2); + + return retValue; + } + + /** + * @param label see name + * @return the childs + */ + public List<String> getChildLabels(final String label) { + final Vertex vertex = getVertex(label); + + return vertex.getChildLabels(); + } + + /** + * @param label see name + * @return the parents + */ + public List<String> getParentLabels(final String label) { + final Vertex vertex = getVertex(label); + + return vertex.getParentLabels(); + } + + /** + * @see java.lang.Object#clone() + */ + @Override + public Object clone() throws CloneNotSupportedException { + // this is what's failing.. + final Object retValue = super.clone(); + + return retValue; + } + + /** + * Indicates if there is at least one edge leading to or from vertex of given label + * @param label the label + * @return <code>true</code> if this vertex is connected with other vertex,<code>false</code> otherwise + */ + public boolean isConnected(final String label) { + final Vertex vertex = getVertex(label); + + final boolean retValue = vertex.isConnected(); + + return retValue; + } + + /** + * Return the list of labels of successor in order decided by topological sort + * + * @param label The label of the vertex whose predecessors are searched + * @return The list of labels. Returned list contains also the label passed as parameter to this method. This label Review Comment: nit: the ########## maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java: ########## @@ -194,7 +193,17 @@ public PluginDescriptor getPluginDescriptor( PluginDescriptor descriptor = extractPluginDescriptor(pluginArtifact, plugin); - if (StringUtils.isBlank(descriptor.getRequiredMavenVersion())) { + boolean isBlankVersion = true; + if (descriptor.getRequiredMavenVersion() != null) { + for (int i = 0; i < descriptor.getRequiredMavenVersion().length(); i++) { Review Comment: just call String.trim and see if the result is empty or use SttingUtils.isBlank from Apache Commons Lang ########## maven-core/src/main/java/org/apache/maven/utils/dag/DAG.java: ########## @@ -0,0 +1,239 @@ +/* + * 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. + */ +package org.apache.maven.utils.dag; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * DAG = Directed Acyclic Graph + * + * @author <a href="michal.mac...@dimatics.com">Michal Maczka</a> + * + * TODO this class should be renamed from DAG to Dag + */ +public class DAG implements Cloneable, Serializable { + // ------------------------------------------------------------ + // Fields + // ------------------------------------------------------------ + /** + * Nodes will be kept in two data structures at the same time for faster processing + */ + /** + * Maps vertex's label to vertex + */ + private Map<String, Vertex> vertexMap = new HashMap<>(); + + /** + * Conatin list of all vertices + */ + private List<Vertex> vertexList = new ArrayList<>(); + + // ------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------ + + /** + * + */ + public DAG() { + super(); + } + + // ------------------------------------------------------------ + // Accessors + // ------------------------------------------------------------ + + /** + * @return the vertices + */ + public List<Vertex> getVertices() { + return vertexList; + } + + /** + * @deprecated instead use {@link #getVertices()} + * @return the vertices + */ + @Deprecated + public List<Vertex> getVerticies() { + return getVertices(); + } + + public Set<String> getLabels() { + return vertexMap.keySet(); + } + + // ------------------------------------------------------------ + // Implementation + // ------------------------------------------------------------ + + /** + * Adds vertex to DAG. If vertex of given label already exist in DAG no vertex is added + * + * @param label The label of the Vertex + * @return New vertex if vertex of given label was not present in the DAG or existing vertex if vertex of given + * label was already added to DAG + */ + public Vertex addVertex(final String label) { + Vertex retValue = null; + + // check if vertex is already in DAG + if (vertexMap.containsKey(label)) { + retValue = vertexMap.get(label); + } else { + retValue = new Vertex(label); + + vertexMap.put(label, retValue); + + vertexList.add(retValue); + } + + return retValue; + } + + public void addEdge(final String from, final String to) throws CycleDetectedException { + final Vertex v1 = addVertex(from); + + final Vertex v2 = addVertex(to); + + addEdge(v1, v2); + } + + public void addEdge(final Vertex from, final Vertex to) throws CycleDetectedException { + + from.addEdgeTo(to); + + to.addEdgeFrom(from); + + final List<String> cycle = CycleDetector.introducesCycle(to); + + if (cycle != null) { + // remove edge which introduced cycle + + removeEdge(from, to); + + final String msg = "Edge between '" + from + "' and '" + to + "' introduces to cycle in the graph"; + + throw new CycleDetectedException(msg, cycle); + } + } + + public void removeEdge(final String from, final String to) { + final Vertex v1 = addVertex(from); + + final Vertex v2 = addVertex(to); + + removeEdge(v1, v2); + } + + public void removeEdge(final Vertex from, final Vertex to) { + from.removeEdgeTo(to); + + to.removeEdgeFrom(from); + } + + public Vertex getVertex(final String label) { + final Vertex retValue = vertexMap.get(label); + + return retValue; + } + + public boolean hasEdge(final String label1, final String label2) { + final Vertex v1 = getVertex(label1); + + final Vertex v2 = getVertex(label2); + + final boolean retValue = v1.getChildren().contains(v2); + + return retValue; + } + + /** + * @param label see name + * @return the childs + */ + public List<String> getChildLabels(final String label) { + final Vertex vertex = getVertex(label); + + return vertex.getChildLabels(); + } + + /** + * @param label see name + * @return the parents + */ + public List<String> getParentLabels(final String label) { + final Vertex vertex = getVertex(label); + + return vertex.getParentLabels(); + } + + /** + * @see java.lang.Object#clone() + */ + @Override + public Object clone() throws CloneNotSupportedException { + // this is what's failing.. + final Object retValue = super.clone(); + + return retValue; + } + + /** + * Indicates if there is at least one edge leading to or from vertex of given label + * @param label the label Review Comment: nit: blank line -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@maven.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
