Revert "[MSHADE-406] Fix filename shading"

This reverts commit a104e66.

Author: nielsbasjes

src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

@@ -497,11 +497,11 @@ private void logSummaryOfDuplicates(MultiValuedMap<Collection<File>, String> ove
             int max = 10;
 
             for (int i = 0; i < Math.min(max, all.size()); i++) {
-                logger.warn("  - {}", all.get(i));
+                logger.warn("  - " + all.get(i));
             }
 
             if (all.size() > max) {
-                logger.warn("  - {}  more...", all.size() - max);
+                logger.warn("  - " + (all.size() - max) + " more...");
             }
         }
     }
@@ -554,7 +554,7 @@ private void addRemappedClass(
                 jos.putNextEntry(entry);
                 IOUtil.copy(is, jos);
             } catch (ZipException e) {
-                logger.debug("We have a duplicate {} in {}", name, jar);
+                logger.debug("We have a duplicate " + name + " in " + jar);
             }
 
             return;
@@ -583,27 +583,28 @@ private void addRemappedClass(
             throw new MojoExecutionException("Error in ASM processing class " + name, ise);
         }
 
-        String mappedName = packageMapper.map(name, true, false);
-
         // If nothing was relocated by ShadeClassRemapper, write the original class, otherwise the transformed one
         final byte[] renamedClass;
         if (cv.remapped) {
-            logger.debug("Rewrote class bytecode: {} to {}", name, mappedName);
+            logger.debug("Rewrote class bytecode: " + name);
             renamedClass = cw.toByteArray();
         } else {
-            logger.debug("Keeping original class bytecode: {}", name);
+            logger.debug("Keeping original class bytecode: " + name);
             renamedClass = originalClass;
         }
 
+        // Need to take the .class off for remapping evaluation
+        String mappedName = packageMapper.map(name.substring(0, name.indexOf('.')), true, false);
+
         try {
             // Now we put it back on so the class file is written out with the right extension.
-            JarEntry entry = new JarEntry(mappedName);
+            JarEntry entry = new JarEntry(mappedName + ".class");
             entry.setTime(time);
             jos.putNextEntry(entry);
 
             jos.write(renamedClass);
         } catch (ZipException e) {
-            logger.debug("We have a duplicate {} in {}", mappedName, jar);
+            logger.debug("We have a duplicate " + mappedName + " in " + jar);
         }
     }