Internal

Author: cstamas

src/main/java/org/codehaus/plexus/components/cipher/PlexusCipher.java

@@ -16,10 +16,6 @@
  * @author Oleg Gusakov
  */
 public interface PlexusCipher {
-    String ENCRYPTED_STRING_DECORATION_START = "{";
-
-    String ENCRYPTED_STRING_DECORATION_STOP = "}";
-
     /**
      * encrypt given string with the given passPhrase and encode it into base64
      *

src/main/java/org/codehaus/plexus/components/cipher/DefaultPlexusCipher.java renamed to src/main/java/org/codehaus/plexus/components/cipher/internal/DefaultPlexusCipher.java

@@ -10,7 +10,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.codehaus.plexus.components.cipher;
+package org.codehaus.plexus.components.cipher.internal;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
@@ -22,6 +22,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.codehaus.plexus.components.cipher.PlexusCipher;
+import org.codehaus.plexus.components.cipher.PlexusCipherException;
+
 /**
  * Default implementation of {@link PlexusCipher}. This class is thread safe.
  *
@@ -31,6 +34,8 @@
 @Named
 public class DefaultPlexusCipher implements PlexusCipher {
     private static final Pattern ENCRYPTED_STRING_PATTERN = Pattern.compile(".*?[^\\\\]?\\{(.*?[^\\\\])\\}.*");
+    private static final String ENCRYPTED_STRING_DECORATION_START = "{";
+    private static final String ENCRYPTED_STRING_DECORATION_STOP = "}";
 
     private final PBECipher _cipher;
 

src/main/java/org/codehaus/plexus/components/cipher/PBECipher.java renamed to src/main/java/org/codehaus/plexus/components/cipher/internal/PBECipher.java

@@ -17,7 +17,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 under the License.
  */
 
-package org.codehaus.plexus.components.cipher;
+package org.codehaus.plexus.components.cipher.internal;
 
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
@@ -36,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.security.spec.KeySpec;
 import java.util.Base64;
 
+import org.codehaus.plexus.components.cipher.PlexusCipherException;
+
 /**
  * This class is thread-safe.
  *

src/test/java/org/codehaus/plexus/components/cipher/DefaultPlexusCipherTest.java renamed to src/test/java/org/codehaus/plexus/components/cipher/internal/DefaultPlexusCipherTest.java

@@ -10,8 +10,10 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.codehaus.plexus.components.cipher;
+package org.codehaus.plexus.components.cipher.internal;
 
+import org.codehaus.plexus.components.cipher.PlexusCipher;
+import org.codehaus.plexus.components.cipher.PlexusCipherException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -154,18 +156,14 @@ void testDecrypt() {
     @Test
     void testDecorate() {
         String res = pc.decorate("aaa");
-        assertEquals(
-                PlexusCipher.ENCRYPTED_STRING_DECORATION_START + "aaa" + PlexusCipher.ENCRYPTED_STRING_DECORATION_STOP,
-                res,
-                "Decoration failed");
+        assertEquals("{aaa}", res, "Decoration failed");
     }
 
     // -------------------------------------------------------------
 
     @Test
     void testUnDecorate() throws Exception {
-        String res = pc.unDecorate(
-                PlexusCipher.ENCRYPTED_STRING_DECORATION_START + "aaa" + PlexusCipher.ENCRYPTED_STRING_DECORATION_STOP);
+        String res = pc.unDecorate("{aaa}");
         assertEquals("aaa", res, "Decoration failed");
     }
 

src/test/java/org/codehaus/plexus/components/cipher/PBECipherTest.java renamed to src/test/java/org/codehaus/plexus/components/cipher/internal/PBECipherTest.java

@@ -17,7 +17,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 under the License.
  */
 
-package org.codehaus.plexus.components.cipher;
+package org.codehaus.plexus.components.cipher.internal;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;