diff --git a/README.md b/README.md index bb4b18b..f545d5f 100644 --- a/README.md +++ b/README.md @@ -179,15 +179,15 @@ Fist add `ejmask-spring-core` to your dependency list. ```xml - com.ebay.pmt2.ejmask - ejmask-spring-autoconfig + com.ebay.ejmask + ejmask-spring-autoconfig ``` -then simply add `com.ebay.pmt2.ejmask.spring.core` to your spring context scanning. +then simply add `com.ebay.ejmask.spring.core` to your spring context scanning. ```xml - + ``` #### AutoConfiguration @@ -196,8 +196,8 @@ If your application is built on spring boot you can skip the above step by simpl ```xml - com.ebay.pmt2.ejmask - ejmask-spring-boot + com.ebay.ejmask + ejmask-spring-boot ``` @@ -220,16 +220,16 @@ Alternatively you can pull it from the central Maven repositories: ```xml - com.ebay.pmt2.ejmask - ejmask-bom - 1.0.0 + com.ebay.ejmask + ejmask-bom + 1.0.0 ``` ### Using in your Gradle Project. ```groovy -compile group: 'com.ebay.pmt2.ejmask', name: 'ejmask-bom', version: '1.0.0' +compile group: 'com.ebay.ejmask', name: 'ejmask-bom', version: '1.0.0' ``` ## Roadmap diff --git a/ejmask-api/pom.xml b/ejmask-api/pom.xml index 186903a..b3f9195 100644 --- a/ejmask-api/pom.xml +++ b/ejmask-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-parent 0.0.0-SNAPSHOT diff --git a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IContentProcessor.java b/ejmask-api/src/main/java/com/ebay/ejmask/api/IContentProcessor.java similarity index 59% rename from ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IContentProcessor.java rename to ejmask-api/src/main/java/com/ebay/ejmask/api/IContentProcessor.java index f9a8f0c..a2e6fcf 100644 --- a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IContentProcessor.java +++ b/ejmask-api/src/main/java/com/ebay/ejmask/api/IContentProcessor.java @@ -1,19 +1,21 @@ -package com.ebay.pmt2.ejmask.api; +package com.ebay.ejmask.api; -/** - * Copyright (c) 2023 eBay Inc. - *

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

- * https://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. +/* + * * + * * Copyright (c) 2023 eBay Inc. + * * + * * Licensed 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 + * * + * * https://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. + * */ /** @@ -28,7 +30,7 @@ public interface IContentProcessor { /** * Return Name of the pre-processor for debugging * - * @return Name of preprocessor + * @return Name of processor */ String getName(); diff --git a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IFilter.java b/ejmask-api/src/main/java/com/ebay/ejmask/api/IFilter.java similarity index 97% rename from ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IFilter.java rename to ejmask-api/src/main/java/com/ebay/ejmask/api/IFilter.java index 9d94c98..81a8494 100644 --- a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IFilter.java +++ b/ejmask-api/src/main/java/com/ebay/ejmask/api/IFilter.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.api; +package com.ebay.ejmask.api; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/ILogProvider.java b/ejmask-api/src/main/java/com/ebay/ejmask/api/ILogProvider.java similarity index 97% rename from ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/ILogProvider.java rename to ejmask-api/src/main/java/com/ebay/ejmask/api/ILogProvider.java index e09b615..abd4bf1 100644 --- a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/ILogProvider.java +++ b/ejmask-api/src/main/java/com/ebay/ejmask/api/ILogProvider.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.api; +package com.ebay.ejmask.api; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IPatternBuilder.java b/ejmask-api/src/main/java/com/ebay/ejmask/api/IPatternBuilder.java similarity index 97% rename from ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IPatternBuilder.java rename to ejmask-api/src/main/java/com/ebay/ejmask/api/IPatternBuilder.java index e4c8d71..2f7897d 100644 --- a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/IPatternBuilder.java +++ b/ejmask-api/src/main/java/com/ebay/ejmask/api/IPatternBuilder.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.api; +package com.ebay.ejmask.api; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/MaskingPattern.java b/ejmask-api/src/main/java/com/ebay/ejmask/api/MaskingPattern.java similarity index 98% rename from ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/MaskingPattern.java rename to ejmask-api/src/main/java/com/ebay/ejmask/api/MaskingPattern.java index e263b82..18e4092 100644 --- a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/MaskingPattern.java +++ b/ejmask-api/src/main/java/com/ebay/ejmask/api/MaskingPattern.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.api; +package com.ebay.ejmask.api; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/ProcessorResult.java b/ejmask-api/src/main/java/com/ebay/ejmask/api/ProcessorResult.java similarity index 97% rename from ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/ProcessorResult.java rename to ejmask-api/src/main/java/com/ebay/ejmask/api/ProcessorResult.java index af3b178..9944a84 100644 --- a/ejmask-api/src/main/java/com/ebay/pmt2/ejmask/api/ProcessorResult.java +++ b/ejmask-api/src/main/java/com/ebay/ejmask/api/ProcessorResult.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.api; +package com.ebay.ejmask.api; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-bom/pom.xml b/ejmask-bom/pom.xml index f8ff9b6..f9322b2 100644 --- a/ejmask-bom/pom.xml +++ b/ejmask-bom/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-parent 0.0.0-SNAPSHOT ../pom.xml @@ -19,32 +19,32 @@ - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-api ${project.parent.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-core ${project.parent.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-extensions ${project.parent.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring-core ${project.parent.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring-boot ${project.parent.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring-autoconfig ${project.parent.version} diff --git a/ejmask-core/pom.xml b/ejmask-core/pom.xml index 3f0244e..4255c21 100644 --- a/ejmask-core/pom.xml +++ b/ejmask-core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-parent 0.0.0-SNAPSHOT @@ -11,7 +11,7 @@ - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-api ${project.version} diff --git a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/AbstractIT.java b/ejmask-core/src/it/java/com/ebay/ejmask/core/AbstractIT.java similarity index 99% rename from ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/AbstractIT.java rename to ejmask-core/src/it/java/com/ebay/ejmask/core/AbstractIT.java index 1e0146d..f30a0fd 100644 --- a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/AbstractIT.java +++ b/ejmask-core/src/it/java/com/ebay/ejmask/core/AbstractIT.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.RandomStringUtils; diff --git a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/DummyProcessor.java b/ejmask-core/src/it/java/com/ebay/ejmask/core/DummyProcessor.java similarity index 74% rename from ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/DummyProcessor.java rename to ejmask-core/src/it/java/com/ebay/ejmask/core/DummyProcessor.java index 8656712..d90c586 100644 --- a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/DummyProcessor.java +++ b/ejmask-core/src/it/java/com/ebay/ejmask/core/DummyProcessor.java @@ -1,7 +1,7 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.ProcessorResult; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.ProcessorResult; /** * @author prakv diff --git a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/GroupedIT.java b/ejmask-core/src/it/java/com/ebay/ejmask/core/GroupedIT.java similarity index 98% rename from ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/GroupedIT.java rename to ejmask-core/src/it/java/com/ebay/ejmask/core/GroupedIT.java index 7ecd1bb..4c9444a 100644 --- a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/GroupedIT.java +++ b/ejmask-core/src/it/java/com/ebay/ejmask/core/GroupedIT.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; import org.junit.jupiter.api.BeforeAll; diff --git a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/TestData.java b/ejmask-core/src/it/java/com/ebay/ejmask/core/TestData.java similarity index 88% rename from ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/TestData.java rename to ejmask-core/src/it/java/com/ebay/ejmask/core/TestData.java index fa00536..e437653 100644 --- a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/TestData.java +++ b/ejmask-core/src/it/java/com/ebay/ejmask/core/TestData.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/UnGroupedIT.java b/ejmask-core/src/it/java/com/ebay/ejmask/core/UnGroupedIT.java similarity index 98% rename from ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/UnGroupedIT.java rename to ejmask-core/src/it/java/com/ebay/ejmask/core/UnGroupedIT.java index ceabc78..69631cb 100644 --- a/ejmask-core/src/it/java/com/ebay/pmt2/ejmask/core/UnGroupedIT.java +++ b/ejmask-core/src/it/java/com/ebay/ejmask/core/UnGroupedIT.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; import org.junit.jupiter.api.BeforeEach; diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/BaseFilter.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/BaseFilter.java similarity index 95% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/BaseFilter.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/BaseFilter.java index d0dab21..11bd130 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/BaseFilter.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/BaseFilter.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; /** * Copyright (c) 2023 eBay Inc. @@ -16,9 +16,9 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IFilter; -import com.ebay.pmt2.ejmask.api.IPatternBuilder; -import com.ebay.pmt2.ejmask.core.util.CommonUtils; +import com.ebay.ejmask.api.IFilter; +import com.ebay.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.core.util.CommonUtils; /** * Default implementation of IFilter for easy extension. diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/BuilderInitializerException.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/BuilderInitializerException.java similarity index 96% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/BuilderInitializerException.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/BuilderInitializerException.java index 8166144..c48602b 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/BuilderInitializerException.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/BuilderInitializerException.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/EJMask.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/EJMask.java similarity index 96% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/EJMask.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/EJMask.java index 296f5e3..e0f17b3 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/EJMask.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/EJMask.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; /** * Copyright (c) 2023 eBay Inc. @@ -16,11 +16,11 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.MaskingPattern; -import com.ebay.pmt2.ejmask.api.ProcessorResult; -import com.ebay.pmt2.ejmask.core.util.CommonUtils; -import com.ebay.pmt2.ejmask.core.util.ExecutorUtil; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.MaskingPattern; +import com.ebay.ejmask.api.ProcessorResult; +import com.ebay.ejmask.core.util.CommonUtils; +import com.ebay.ejmask.core.util.ExecutorUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/EJMaskInitializer.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/EJMaskInitializer.java similarity index 97% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/EJMaskInitializer.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/EJMaskInitializer.java index 530024a..1be875c 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/EJMaskInitializer.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/EJMaskInitializer.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; /** * Copyright (c) 2023 eBay Inc. @@ -16,12 +16,12 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.IFilter; -import com.ebay.pmt2.ejmask.api.IPatternBuilder; -import com.ebay.pmt2.ejmask.api.MaskingPattern; -import com.ebay.pmt2.ejmask.core.util.CommonUtils; -import com.ebay.pmt2.ejmask.core.util.LoggerUtil; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.IFilter; +import com.ebay.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.api.MaskingPattern; +import com.ebay.ejmask.core.util.CommonUtils; +import com.ebay.ejmask.core.util.LoggerUtil; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/Filter.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/Filter.java similarity index 96% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/Filter.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/Filter.java index 952c125..7133fb0 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/Filter.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/Filter.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; /** * Copyright (c) 2023 eBay Inc. @@ -16,7 +16,7 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.api.IPatternBuilder; import java.util.LinkedList; import java.util.List; diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/CommonUtils.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/CommonUtils.java similarity index 99% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/CommonUtils.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/util/CommonUtils.java index ff647ad..836b5a2 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/CommonUtils.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/CommonUtils.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core.util; +package com.ebay.ejmask.core.util; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/DefaultLogProvider.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/DefaultLogProvider.java similarity index 93% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/DefaultLogProvider.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/util/DefaultLogProvider.java index fa6746d..ef0c6b2 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/DefaultLogProvider.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/DefaultLogProvider.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core.util; +package com.ebay.ejmask.core.util; /** * Copyright (c) 2023 eBay Inc. @@ -16,7 +16,7 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.ILogProvider; +import com.ebay.ejmask.api.ILogProvider; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/ExecutorUtil.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/ExecutorUtil.java similarity index 98% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/ExecutorUtil.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/util/ExecutorUtil.java index 4918808..7c4a27a 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/ExecutorUtil.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/ExecutorUtil.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core.util; +package com.ebay.ejmask.core.util; /** * Copyright (c) 2023 eBay Inc. diff --git a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/LoggerUtil.java b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/LoggerUtil.java similarity index 95% rename from ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/LoggerUtil.java rename to ejmask-core/src/main/java/com/ebay/ejmask/core/util/LoggerUtil.java index 809aebc..82b13fb 100644 --- a/ejmask-core/src/main/java/com/ebay/pmt2/ejmask/core/util/LoggerUtil.java +++ b/ejmask-core/src/main/java/com/ebay/ejmask/core/util/LoggerUtil.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core.util; +package com.ebay.ejmask.core.util; /** * Copyright (c) 2023 eBay Inc. @@ -16,7 +16,7 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.ILogProvider; +import com.ebay.ejmask.api.ILogProvider; /** * customizable logging util diff --git a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskBaseTest.java b/ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskBaseTest.java similarity index 92% rename from ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskBaseTest.java rename to ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskBaseTest.java index 217b75d..2d6b7c3 100644 --- a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskBaseTest.java +++ b/ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskBaseTest.java @@ -1,6 +1,6 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; -import com.ebay.pmt2.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.IContentProcessor; import org.junit.jupiter.api.AfterEach; import java.lang.reflect.Field; diff --git a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskInitializerTest.java b/ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskInitializerTest.java similarity index 98% rename from ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskInitializerTest.java rename to ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskInitializerTest.java index 161b160..5f44b49 100644 --- a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskInitializerTest.java +++ b/ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskInitializerTest.java @@ -1,9 +1,9 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.IFilter; -import com.ebay.pmt2.ejmask.api.IPatternBuilder; -import com.ebay.pmt2.ejmask.api.MaskingPattern; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.IFilter; +import com.ebay.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.api.MaskingPattern; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskTest.java b/ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskTest.java similarity index 98% rename from ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskTest.java rename to ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskTest.java index b246b45..c48d500 100644 --- a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/EJMaskTest.java +++ b/ejmask-core/src/test/java/com/ebay/ejmask/core/EJMaskTest.java @@ -1,9 +1,9 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.MaskingPattern; -import com.ebay.pmt2.ejmask.api.ProcessorResult; -import com.ebay.pmt2.ejmask.core.util.CommonUtils; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.MaskingPattern; +import com.ebay.ejmask.api.ProcessorResult; +import com.ebay.ejmask.core.util.CommonUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/JsonPatternBuilder.java b/ejmask-core/src/test/java/com/ebay/ejmask/core/JsonPatternBuilder.java similarity index 94% rename from ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/JsonPatternBuilder.java rename to ejmask-core/src/test/java/com/ebay/ejmask/core/JsonPatternBuilder.java index 5cab296..fde579c 100644 --- a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/JsonPatternBuilder.java +++ b/ejmask-core/src/test/java/com/ebay/ejmask/core/JsonPatternBuilder.java @@ -1,7 +1,7 @@ -package com.ebay.pmt2.ejmask.core; +package com.ebay.ejmask.core; -import com.ebay.pmt2.ejmask.api.IPatternBuilder; -import com.ebay.pmt2.ejmask.core.util.CommonUtils; +import com.ebay.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.core.util.CommonUtils; class JsonPatternBuilder implements IPatternBuilder { diff --git a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/util/ExecutorUtilTest.java b/ejmask-core/src/test/java/com/ebay/ejmask/core/util/ExecutorUtilTest.java similarity index 95% rename from ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/util/ExecutorUtilTest.java rename to ejmask-core/src/test/java/com/ebay/ejmask/core/util/ExecutorUtilTest.java index 5a54292..68a066e 100644 --- a/ejmask-core/src/test/java/com/ebay/pmt2/ejmask/core/util/ExecutorUtilTest.java +++ b/ejmask-core/src/test/java/com/ebay/ejmask/core/util/ExecutorUtilTest.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.core.util; +package com.ebay.ejmask.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ejmask-extensions/pom.xml b/ejmask-extensions/pom.xml index 45c22e4..18d193e 100644 --- a/ejmask-extensions/pom.xml +++ b/ejmask-extensions/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-parent 0.0.0-SNAPSHOT @@ -11,7 +11,7 @@ - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-core ${project.version} diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/AbstractRegexPatternBuilder.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/AbstractRegexPatternBuilder.java similarity index 93% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/AbstractRegexPatternBuilder.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/AbstractRegexPatternBuilder.java index 0833f76..e45459d 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/AbstractRegexPatternBuilder.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/AbstractRegexPatternBuilder.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder; +package com.ebay.ejmask.extenstion.builder; /** * Copyright (c) 2023 eBay Inc. @@ -16,8 +16,8 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IPatternBuilder; -import com.ebay.pmt2.ejmask.core.util.CommonUtils; +import com.ebay.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.core.util.CommonUtils; import java.util.HashSet; diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/header/HeaderFieldPatternBuilder.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/header/HeaderFieldPatternBuilder.java similarity index 94% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/header/HeaderFieldPatternBuilder.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/header/HeaderFieldPatternBuilder.java index 5b36d91..ecbff60 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/header/HeaderFieldPatternBuilder.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/header/HeaderFieldPatternBuilder.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.header; +package com.ebay.ejmask.extenstion.builder.header; /** * Copyright (c) 2023 eBay Inc. @@ -16,7 +16,7 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.extenstion.builder.AbstractRegexPatternBuilder; +import com.ebay.ejmask.extenstion.builder.AbstractRegexPatternBuilder; /** * An implementation of IPatternBuilder to support sensitive Header Fields diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFieldPatternBuilder.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonFieldPatternBuilder.java similarity index 94% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFieldPatternBuilder.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonFieldPatternBuilder.java index a5a2eef..894bc17 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFieldPatternBuilder.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonFieldPatternBuilder.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.json; +package com.ebay.ejmask.extenstion.builder.json; /** * Copyright (c) 2023 eBay Inc. *

@@ -15,7 +15,7 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.extenstion.builder.AbstractRegexPatternBuilder; +import com.ebay.ejmask.extenstion.builder.AbstractRegexPatternBuilder; /** * An implementation of IPatternBuilder to support sensitive JSON field, whose value need to be partially masked. diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFullValuePatternBuilder.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonFullValuePatternBuilder.java similarity index 94% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFullValuePatternBuilder.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonFullValuePatternBuilder.java index 9d44c73..0cc414b 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFullValuePatternBuilder.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonFullValuePatternBuilder.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.json; +package com.ebay.ejmask.extenstion.builder.json; /** * Copyright (c) 2023 eBay Inc. *

@@ -15,7 +15,7 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.extenstion.builder.AbstractRegexPatternBuilder; +import com.ebay.ejmask.extenstion.builder.AbstractRegexPatternBuilder; /** * An implementation of IPatternBuilder to support high sensitive JSON field, whose value need to be fully masked. diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonRelativeFieldPatternBuilder.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonRelativeFieldPatternBuilder.java similarity index 95% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonRelativeFieldPatternBuilder.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonRelativeFieldPatternBuilder.java index b3d9132..f936635 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonRelativeFieldPatternBuilder.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/json/JsonRelativeFieldPatternBuilder.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.json; +package com.ebay.ejmask.extenstion.builder.json; /** * Copyright (c) 2023 eBay Inc. @@ -16,8 +16,8 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IPatternBuilder; -import com.ebay.pmt2.ejmask.core.util.CommonUtils; +import com.ebay.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.core.util.CommonUtils; /** * An implementation of IPatternBuilder to support sensitive JSON field, whose diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/xml/XmlFieldPattenBuilder.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/xml/XmlFieldPattenBuilder.java similarity index 94% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/xml/XmlFieldPattenBuilder.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/xml/XmlFieldPattenBuilder.java index 8e448c7..df143b1 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/builder/xml/XmlFieldPattenBuilder.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/builder/xml/XmlFieldPattenBuilder.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.xml; +package com.ebay.ejmask.extenstion.builder.xml; /** * Copyright (c) 2023 eBay Inc. @@ -16,7 +16,7 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.extenstion.builder.AbstractRegexPatternBuilder; +import com.ebay.ejmask.extenstion.builder.AbstractRegexPatternBuilder; /** * XML Field Patten Builder diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/filter/AuthHeaderFilter.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/filter/AuthHeaderFilter.java similarity index 83% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/filter/AuthHeaderFilter.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/filter/AuthHeaderFilter.java index 1b2f714..58d2a83 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/filter/AuthHeaderFilter.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/filter/AuthHeaderFilter.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.filter; +package com.ebay.ejmask.extenstion.filter; /** * Copyright (c) 2023 eBay Inc. @@ -16,8 +16,8 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.core.BaseFilter; -import com.ebay.pmt2.ejmask.extenstion.builder.header.HeaderFieldPatternBuilder; +import com.ebay.ejmask.core.BaseFilter; +import com.ebay.ejmask.extenstion.builder.header.HeaderFieldPatternBuilder; /** * Auth header filter diff --git a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/preprocessor/ContentSlicerPreProcessor.java b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/processor/ContentSlicerProcessor.java similarity index 62% rename from ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/preprocessor/ContentSlicerPreProcessor.java rename to ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/processor/ContentSlicerProcessor.java index 729a992..cb23b9e 100644 --- a/ejmask-extensions/src/main/java/com/ebay/pmt2/ejmask/extenstion/preprocessor/ContentSlicerPreProcessor.java +++ b/ejmask-extensions/src/main/java/com/ebay/ejmask/extenstion/processor/ContentSlicerProcessor.java @@ -1,32 +1,34 @@ -package com.ebay.pmt2.ejmask.extenstion.preprocessor; +package com.ebay.ejmask.extenstion.processor; -/** - * Copyright (c) 2023 eBay Inc. - *

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

- * https://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. +/* + * * + * * Copyright (c) 2023 eBay Inc. + * * + * * Licensed 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 + * * + * * https://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 com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.ProcessorResult; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.ProcessorResult; /** - * Content size has huge impact on overall masking logic. This preprocessor is + * Content size has huge impact on overall masking logic. This processor is * to enable resizing of content before actual regex search and replacement * starts * * @author prakv */ -public class ContentSlicerPreProcessor implements IContentProcessor { +public class ContentSlicerProcessor implements IContentProcessor { private static final String NAME = "ejmask.content-slicer"; private static final int MAX_STRING_LIMIT = 10000; @@ -38,7 +40,7 @@ public class ContentSlicerPreProcessor implements IContentProcessor { /** * Create new instance of ContentSlicerPreProcessor */ - public ContentSlicerPreProcessor() { + public ContentSlicerProcessor() { this(DEFAULT_ORDER - 1, MAX_STRING_LIMIT, DOC_SIZE); } @@ -49,7 +51,7 @@ public ContentSlicerPreProcessor() { * @param maxStringLimit as content size limit * @param newSize as new content size */ - public ContentSlicerPreProcessor(int priority, int maxStringLimit, int newSize) { + public ContentSlicerProcessor(int priority, int maxStringLimit, int newSize) { this.order = priority; this.maxContentSize = maxStringLimit; this.newSize = newSize; @@ -58,7 +60,7 @@ public ContentSlicerPreProcessor(int priority, int maxStringLimit, int newSize) /** * Return Name of the pre-processor for debugging * - * @return Name of preprocessor + * @return Name of processor */ @Override public String getName() { diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/AbstractRegexPatternBuilderTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/AbstractRegexPatternBuilderTest.java similarity index 98% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/AbstractRegexPatternBuilderTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/AbstractRegexPatternBuilderTest.java index 43896b9..cf97498 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/AbstractRegexPatternBuilderTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/AbstractRegexPatternBuilderTest.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder; +package com.ebay.ejmask.extenstion.builder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/header/HeaderFieldPatternBuilderTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/header/HeaderFieldPatternBuilderTest.java similarity index 99% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/header/HeaderFieldPatternBuilderTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/header/HeaderFieldPatternBuilderTest.java index 88258e9..2f0edf9 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/header/HeaderFieldPatternBuilderTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/header/HeaderFieldPatternBuilderTest.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.header; +package com.ebay.ejmask.extenstion.builder.header; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/FullValueMaskJsonPatternBuilderTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/FullValueMaskJsonPatternBuilderTest.java similarity index 99% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/FullValueMaskJsonPatternBuilderTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/FullValueMaskJsonPatternBuilderTest.java index 73e9bae..b8d0533 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/FullValueMaskJsonPatternBuilderTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/FullValueMaskJsonPatternBuilderTest.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.json; +package com.ebay.ejmask.extenstion.builder.json; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFieldPatternBuilderTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/JsonFieldPatternBuilderTest.java similarity index 99% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFieldPatternBuilderTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/JsonFieldPatternBuilderTest.java index 68d59e1..6d7bf8c 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonFieldPatternBuilderTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/JsonFieldPatternBuilderTest.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.json; +package com.ebay.ejmask.extenstion.builder.json; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonRelatveFieldPattenBuilderTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/JsonRelatveFieldPattenBuilderTest.java similarity index 98% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonRelatveFieldPattenBuilderTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/JsonRelatveFieldPattenBuilderTest.java index 4ce6feb..52ce181 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/json/JsonRelatveFieldPattenBuilderTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/json/JsonRelatveFieldPattenBuilderTest.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.json; +package com.ebay.ejmask.extenstion.builder.json; import org.junit.jupiter.api.Assertions; diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/xml/XmlFieldPattenBuilderTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/xml/XmlFieldPattenBuilderTest.java similarity index 97% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/xml/XmlFieldPattenBuilderTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/xml/XmlFieldPattenBuilderTest.java index 58dedcc..89e883e 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/builder/xml/XmlFieldPattenBuilderTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/builder/xml/XmlFieldPattenBuilderTest.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.extenstion.builder.xml; +package com.ebay.ejmask.extenstion.builder.xml; import org.junit.jupiter.api.Assertions; diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/filter/AuthHeaderFilterTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/filter/AuthHeaderFilterTest.java similarity index 90% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/filter/AuthHeaderFilterTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/filter/AuthHeaderFilterTest.java index 5e4bb95..8e44ac9 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/filter/AuthHeaderFilterTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/filter/AuthHeaderFilterTest.java @@ -1,7 +1,7 @@ -package com.ebay.pmt2.ejmask.extenstion.filter; +package com.ebay.ejmask.extenstion.filter; -import com.ebay.pmt2.ejmask.api.IPatternBuilder; -import com.ebay.pmt2.ejmask.extenstion.builder.header.HeaderFieldPatternBuilder; +import com.ebay.ejmask.api.IPatternBuilder; +import com.ebay.ejmask.extenstion.builder.header.HeaderFieldPatternBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/preprocessor/ContentSlicerPreProcessorTest.java b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/processor/ContentSlicerPreProcessorTest.java similarity index 89% rename from ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/preprocessor/ContentSlicerPreProcessorTest.java rename to ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/processor/ContentSlicerPreProcessorTest.java index f72bb73..eea36a7 100644 --- a/ejmask-extensions/src/test/java/com/ebay/pmt2/ejmask/extenstion/preprocessor/ContentSlicerPreProcessorTest.java +++ b/ejmask-extensions/src/test/java/com/ebay/ejmask/extenstion/processor/ContentSlicerPreProcessorTest.java @@ -1,6 +1,6 @@ -package com.ebay.pmt2.ejmask.extenstion.preprocessor; +package com.ebay.ejmask.extenstion.processor; -import com.ebay.pmt2.ejmask.api.ProcessorResult; +import com.ebay.ejmask.api.ProcessorResult; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -10,7 +10,7 @@ */ public class ContentSlicerPreProcessorTest { - final ContentSlicerPreProcessor instance = new ContentSlicerPreProcessor(); + final ContentSlicerProcessor instance = new ContentSlicerProcessor(); /** * Test of getName method, of class ContentSlicerPreProcessor. diff --git a/ejmask-spring/ejmask-spring-autoconfig/pom.xml b/ejmask-spring/ejmask-spring-autoconfig/pom.xml index a6ec687..012455c 100644 --- a/ejmask-spring/ejmask-spring-autoconfig/pom.xml +++ b/ejmask-spring/ejmask-spring-autoconfig/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring 0.0.0-SNAPSHOT @@ -11,17 +11,17 @@ - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-api ${project.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring-core ${project.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring-boot ${project.version} diff --git a/ejmask-spring/ejmask-spring-autoconfig/src/main/resources/META-INF/spring.factories b/ejmask-spring/ejmask-spring-autoconfig/src/main/resources/META-INF/spring.factories index b167471..0b6222e 100644 --- a/ejmask-spring/ejmask-spring-autoconfig/src/main/resources/META-INF/spring.factories +++ b/ejmask-spring/ejmask-spring-autoconfig/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.ebay.pmt2.ejmask.spring.boot.autoconfig.EJMaskAutoConfig \ No newline at end of file +com.ebay.ejmask.spring.boot.autoconfig.EJMaskAutoConfig \ No newline at end of file diff --git a/ejmask-spring/ejmask-spring-boot/pom.xml b/ejmask-spring/ejmask-spring-boot/pom.xml index 7b8d29d..15293de 100644 --- a/ejmask-spring/ejmask-spring-boot/pom.xml +++ b/ejmask-spring/ejmask-spring-boot/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring 0.0.0-SNAPSHOT @@ -11,12 +11,12 @@ - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring-core ${project.version} - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-extensions ${project.version} diff --git a/ejmask-spring/ejmask-spring-boot/src/it/java/com/ebay/pmt2/ejmask/spring/boot/autoconfig/EJMaskAutoConfigIT.java b/ejmask-spring/ejmask-spring-boot/src/it/java/com/ebay/ejmask/spring/boot/autoconfig/EJMaskAutoConfigIT.java similarity index 97% rename from ejmask-spring/ejmask-spring-boot/src/it/java/com/ebay/pmt2/ejmask/spring/boot/autoconfig/EJMaskAutoConfigIT.java rename to ejmask-spring/ejmask-spring-boot/src/it/java/com/ebay/ejmask/spring/boot/autoconfig/EJMaskAutoConfigIT.java index 1ade2fd..06dc287 100644 --- a/ejmask-spring/ejmask-spring-boot/src/it/java/com/ebay/pmt2/ejmask/spring/boot/autoconfig/EJMaskAutoConfigIT.java +++ b/ejmask-spring/ejmask-spring-boot/src/it/java/com/ebay/ejmask/spring/boot/autoconfig/EJMaskAutoConfigIT.java @@ -1,7 +1,7 @@ -package com.ebay.pmt2.ejmask.spring.boot.autoconfig; +package com.ebay.ejmask.spring.boot.autoconfig; -import com.ebay.pmt2.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.IContentProcessor; import org.junit.Assert; import org.junit.experimental.runners.Enclosed; import org.junit.jupiter.api.Test; diff --git a/ejmask-spring/ejmask-spring-boot/src/main/java/com/ebay/pmt2/ejmask/spring/boot/autoconfig/EJMaskAutoConfig.java b/ejmask-spring/ejmask-spring-boot/src/main/java/com/ebay/ejmask/spring/boot/autoconfig/EJMaskAutoConfig.java similarity index 81% rename from ejmask-spring/ejmask-spring-boot/src/main/java/com/ebay/pmt2/ejmask/spring/boot/autoconfig/EJMaskAutoConfig.java rename to ejmask-spring/ejmask-spring-boot/src/main/java/com/ebay/ejmask/spring/boot/autoconfig/EJMaskAutoConfig.java index eb2c6ea..6b9ccc2 100644 --- a/ejmask-spring/ejmask-spring-boot/src/main/java/com/ebay/pmt2/ejmask/spring/boot/autoconfig/EJMaskAutoConfig.java +++ b/ejmask-spring/ejmask-spring-boot/src/main/java/com/ebay/ejmask/spring/boot/autoconfig/EJMaskAutoConfig.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.spring.boot.autoconfig; +package com.ebay.ejmask.spring.boot.autoconfig; /** * Copyright (c) 2023 eBay Inc. @@ -16,9 +16,9 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.extenstion.preprocessor.ContentSlicerPreProcessor; -import com.ebay.pmt2.ejmask.spring.core.EJMaskSpringCoreContextConfiguration; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.extenstion.processor.ContentSlicerProcessor; +import com.ebay.ejmask.spring.core.EJMaskSpringCoreContextConfiguration; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -56,7 +56,7 @@ public class EJMaskAutoConfig { @Bean @Scope(value = "singleton", proxyMode = ScopedProxyMode.DEFAULT) @ConditionalOnProperty(prefix = "ejmask.processor.", name = "content-slicer", havingValue = "enabled") - public IContentProcessor getContentSlicerPreProcessor() { - return new ContentSlicerPreProcessor(this.contentSlicerPriority, this.contentSlicerMaxStringLimit, this.contentSlicerNewSize); + public IContentProcessor getContentSlicerProcessor() { + return new ContentSlicerProcessor(this.contentSlicerPriority, this.contentSlicerMaxStringLimit, this.contentSlicerNewSize); } } diff --git a/ejmask-spring/ejmask-spring-core/pom.xml b/ejmask-spring/ejmask-spring-core/pom.xml index a9b9c3d..9837768 100644 --- a/ejmask-spring/ejmask-spring-core/pom.xml +++ b/ejmask-spring/ejmask-spring-core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-spring 0.0.0-SNAPSHOT @@ -11,7 +11,7 @@ - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-core ${project.version} @@ -26,7 +26,7 @@ - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-extensions ${project.version} test diff --git a/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/AbstractIT.java b/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/AbstractIT.java similarity index 75% rename from ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/AbstractIT.java rename to ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/AbstractIT.java index a1aad7b..5914fed 100644 --- a/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/AbstractIT.java +++ b/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/AbstractIT.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.spring.core; +package com.ebay.ejmask.spring.core; import org.junit.Ignore; @@ -9,6 +9,6 @@ */ @Ignore public abstract class AbstractIT { - + } diff --git a/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/EJMaskSpringCoreContextConfigurationIT.java b/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/EJMaskSpringCoreContextConfigurationIT.java similarity index 99% rename from ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/EJMaskSpringCoreContextConfigurationIT.java rename to ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/EJMaskSpringCoreContextConfigurationIT.java index 9c43446..f99f003 100644 --- a/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/EJMaskSpringCoreContextConfigurationIT.java +++ b/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/EJMaskSpringCoreContextConfigurationIT.java @@ -1,8 +1,8 @@ -package com.ebay.pmt2.ejmask.spring.core; +package com.ebay.ejmask.spring.core; -import com.ebay.pmt2.ejmask.core.EJMask; -import com.ebay.pmt2.ejmask.core.EJMaskInitializer; +import com.ebay.ejmask.core.EJMask; +import com.ebay.ejmask.core.EJMaskInitializer; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.RandomStringUtils; diff --git a/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/FilterContextConfiguration.java b/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/FilterContextConfiguration.java similarity index 91% rename from ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/FilterContextConfiguration.java rename to ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/FilterContextConfiguration.java index f0c0126..da3586e 100644 --- a/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/pmt2/ejmask/spring/core/FilterContextConfiguration.java +++ b/ejmask-spring/ejmask-spring-core/src/it/java/com/ebay/ejmask/spring/core/FilterContextConfiguration.java @@ -1,14 +1,14 @@ -package com.ebay.pmt2.ejmask.spring.core; - -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.IFilter; -import com.ebay.pmt2.ejmask.api.MaskingPattern; -import com.ebay.pmt2.ejmask.core.BaseFilter; -import com.ebay.pmt2.ejmask.extenstion.builder.header.HeaderFieldPatternBuilder; -import com.ebay.pmt2.ejmask.extenstion.builder.json.JsonFieldPatternBuilder; -import com.ebay.pmt2.ejmask.extenstion.builder.json.JsonFullValuePatternBuilder; -import com.ebay.pmt2.ejmask.extenstion.builder.json.JsonRelativeFieldPatternBuilder; -import com.ebay.pmt2.ejmask.extenstion.preprocessor.ContentSlicerPreProcessor; +package com.ebay.ejmask.spring.core; + +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.IFilter; +import com.ebay.ejmask.api.MaskingPattern; +import com.ebay.ejmask.core.BaseFilter; +import com.ebay.ejmask.extenstion.builder.header.HeaderFieldPatternBuilder; +import com.ebay.ejmask.extenstion.builder.json.JsonFieldPatternBuilder; +import com.ebay.ejmask.extenstion.builder.json.JsonFullValuePatternBuilder; +import com.ebay.ejmask.extenstion.builder.json.JsonRelativeFieldPatternBuilder; +import com.ebay.ejmask.extenstion.processor.ContentSlicerProcessor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -19,13 +19,13 @@ import java.util.List; @Configuration("FilterContextConfiguration") -@ComponentScan("com.ebay.pmt2.ejmask.spring.core") +@ComponentScan("com.ebay.ejmask.spring.core") public class FilterContextConfiguration { @Bean @Scope(value = "singleton", proxyMode = ScopedProxyMode.DEFAULT) public IContentProcessor getContentSlicerPreProcessor() { - return new ContentSlicerPreProcessor(); + return new ContentSlicerProcessor(); } /** diff --git a/ejmask-spring/ejmask-spring-core/src/main/java/com/ebay/pmt2/ejmask/spring/core/EJMaskSpringCoreContextConfiguration.java b/ejmask-spring/ejmask-spring-core/src/main/java/com/ebay/ejmask/spring/core/EJMaskSpringCoreContextConfiguration.java similarity index 86% rename from ejmask-spring/ejmask-spring-core/src/main/java/com/ebay/pmt2/ejmask/spring/core/EJMaskSpringCoreContextConfiguration.java rename to ejmask-spring/ejmask-spring-core/src/main/java/com/ebay/ejmask/spring/core/EJMaskSpringCoreContextConfiguration.java index 7fcc378..55ac751 100644 --- a/ejmask-spring/ejmask-spring-core/src/main/java/com/ebay/pmt2/ejmask/spring/core/EJMaskSpringCoreContextConfiguration.java +++ b/ejmask-spring/ejmask-spring-core/src/main/java/com/ebay/ejmask/spring/core/EJMaskSpringCoreContextConfiguration.java @@ -1,4 +1,4 @@ -package com.ebay.pmt2.ejmask.spring.core; +package com.ebay.ejmask.spring.core; /** * Copyright (c) 2023 eBay Inc. @@ -16,11 +16,11 @@ * limitations under the License. */ -import com.ebay.pmt2.ejmask.api.IContentProcessor; -import com.ebay.pmt2.ejmask.api.IFilter; -import com.ebay.pmt2.ejmask.api.MaskingPattern; -import com.ebay.pmt2.ejmask.core.EJMaskInitializer; -import com.ebay.pmt2.ejmask.core.util.LoggerUtil; +import com.ebay.ejmask.api.IContentProcessor; +import com.ebay.ejmask.api.IFilter; +import com.ebay.ejmask.api.MaskingPattern; +import com.ebay.ejmask.core.EJMaskInitializer; +import com.ebay.ejmask.core.util.LoggerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/ejmask-spring/pom.xml b/ejmask-spring/pom.xml index c360c1b..17c9f9c 100644 --- a/ejmask-spring/pom.xml +++ b/ejmask-spring/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-parent 0.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1160913..4efc6e5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.ebay.pmt2.ejmask + com.ebay.ejmask ejmask-parent 0.0.0-SNAPSHOT diff --git a/spotbugs-exclusions.xml b/spotbugs-exclusions.xml index cccb156..6ad7814 100644 --- a/spotbugs-exclusions.xml +++ b/spotbugs-exclusions.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd"> - +