[GitHub] [maven-resolver] cstamas commented on a diff in pull request #167: [MRESOLVER-252] Make LRM path composition reusable

2022-04-15 Thread GitBox


cstamas commented on code in PR #167:
URL: https://github.com/apache/maven-resolver/pull/167#discussion_r851408728


##
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactPathComposer.java:
##
@@ -0,0 +1,110 @@
+package org.eclipse.aether.internal.impl;
+
+/*
+ * 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 javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.metadata.Metadata;
+
+/**
+ * Default implementation of {@link ArtifactPathComposer}.
+ *
+ * @since TBD
+ */
+@Singleton
+@Named
+public final class DefaultArtifactPathComposer implements ArtifactPathComposer
+{
+@Override
+public String getPathForArtifact( Artifact artifact, boolean local )
+{
+StringBuilder path = new StringBuilder( 128 );
+
+path.append( artifact.getGroupId().replace( '.', '/' ) ).append( '/' );
+
+path.append( artifact.getArtifactId() ).append( '/' );
+
+path.append( artifact.getBaseVersion() ).append( '/' );
+
+path.append( artifact.getArtifactId() ).append( '-' );
+if ( local )
+{
+path.append( artifact.getBaseVersion() );
+}
+else
+{
+path.append( artifact.getVersion() );
+}
+
+if ( artifact.getClassifier().length() > 0 )
+{
+path.append( '-' ).append( artifact.getClassifier() );
+}
+
+if ( artifact.getExtension().length() > 0 )
+{
+path.append( '.' ).append( artifact.getExtension() );
+}
+
+return path.toString();
+}
+
+@Override
+public String getPathForMetadata( Metadata metadata, String repositoryKey )
+{
+StringBuilder path = new StringBuilder( 128 );
+
+if ( metadata.getGroupId().length() > 0 )
+{
+path.append( metadata.getGroupId().replace( '.', '/' ) ).append( 
'/' );
+
+if ( metadata.getArtifactId().length() > 0 )
+{
+path.append( metadata.getArtifactId() ).append( '/' );
+
+if ( metadata.getVersion().length() > 0 )
+{
+path.append( metadata.getVersion() ).append( '/' );
+}
+}
+}
+
+path.append( insertRepositoryKey( metadata.getType(), repositoryKey ) 
);
+
+return path.toString();
+}
+
+private String insertRepositoryKey( String filename, String repositoryKey )
+{
+String result;
+int idx = filename.indexOf( '.' );

Review Comment:
   Renamed variable to be clear, that this is "metadata type", which is in case 
fixed to `maven-metadata.xml`, so yes, there is only one dot.



##
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactPathComposer.java:
##
@@ -0,0 +1,110 @@
+package org.eclipse.aether.internal.impl;
+
+/*
+ * 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 javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.metadata.Metadata;
+
+/**
+ * Default implementation of {@link ArtifactPathComposer}.
+ *
+ * @since TBD
+ */
+@Singleton
+@Named
+public final class DefaultArtifactPathComposer implements ArtifactPathComposer
+{
+@Override
+public String getPathForArtifact( Artifact artifact, boolean local )
+{
+ 

[GitHub] [maven-resolver] cstamas commented on a diff in pull request #167: [MRESOLVER-252] Make LRM path composition reusable

2022-04-15 Thread GitBox


cstamas commented on code in PR #167:
URL: https://github.com/apache/maven-resolver/pull/167#discussion_r851408451


##
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactPathComposer.java:
##
@@ -0,0 +1,53 @@
+package org.eclipse.aether.internal.impl;
+
+/*
+ * 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 org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.metadata.Metadata;
+
+/**
+ * Composes {@link Artifact} and {@link Metadata} relative paths to be used in
+ * {@link org.eclipse.aether.repository.LocalRepositoryManager}.
+ *
+ * @since TBD
+ */
+public interface ArtifactPathComposer
+{
+/**
+ * Gets the relative path for a locally installed (local=true) or remotely 
cached (local=false) artifact.
+ *
+ * @param artifact The artifact for which to determine the path, must not 
be {@code null}.
+ * @param local{@code true} if artifact is locally installed or {@code 
false} if artifact is remotely cached.
+ * @return A relative path representing artifact path.
+ */
+String getPathForArtifact( Artifact artifact, boolean local );
+
+/**
+ * Gets the relative path for locally installed (repositoryKey=local) or 
remotely cached metadata. The
+ * {@code repositoryKey} should be used at caller discretion, it merely 
denotes the origin of the metadata, while
+ * value "local" usually means local origin, but again, this is not a must 
or enforced, just how things happened
+ * so far.
+ *
+ * @param metadata  The metadata for which to determine the path, must 
not be {@code null}.
+ * @param repositoryKey The repository key, where {@code "local"} denotes 
locally installed one.

Review Comment:
   Nope, cannot. Fixed.



-- 
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



[GitHub] [maven-resolver] cstamas commented on a diff in pull request #167: [MRESOLVER-252] Make LRM path composition reusable

2022-04-15 Thread GitBox


cstamas commented on code in PR #167:
URL: https://github.com/apache/maven-resolver/pull/167#discussion_r851408316


##
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactPathComposer.java:
##
@@ -0,0 +1,53 @@
+package org.eclipse.aether.internal.impl;
+
+/*
+ * 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 org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.metadata.Metadata;
+
+/**
+ * Composes {@link Artifact} and {@link Metadata} relative paths to be used in
+ * {@link org.eclipse.aether.repository.LocalRepositoryManager}.
+ *
+ * @since TBD
+ */
+public interface ArtifactPathComposer

Review Comment:
   fixed



-- 
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



[GitHub] [maven-resolver] cstamas commented on a diff in pull request #167: [MRESOLVER-252] Make LRM path composition reusable

2022-04-15 Thread GitBox


cstamas commented on code in PR #167:
URL: https://github.com/apache/maven-resolver/pull/167#discussion_r851221360


##
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactPathComposer.java:
##
@@ -0,0 +1,53 @@
+package org.eclipse.aether.internal.impl;
+
+/*
+ * 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 org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.metadata.Metadata;
+
+/**
+ * Composes {@link Artifact} and {@link Metadata} relative paths to be used in
+ * {@link org.eclipse.aether.repository.LocalRepositoryManager}.
+ *
+ * @since TBD
+ */
+public interface ArtifactPathComposer

Review Comment:
   LocalPathComposer?



-- 
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