From fcc4319f84115e2eb0e9141aa88dd29343eddf6a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 23 Nov 2023 14:23:27 +0100
Subject: [PATCH] OZG-4589 rename logging
---
.../java/de/ozgcloud/common/logging/AspectPointcuts.java | 5 -----
.../logging/{KopLogging.java => OzgCloudLogging.java} | 2 +-
.../{KopLoggingAspect.java => OzgCloudLoggingAspect.java} | 2 +-
...gingInterceptor.java => OzgCloudLoggingInterceptor.java} | 4 ++--
...rceptorTest.java => OzgCloudLoggingInterceptorTest.java} | 6 +++---
5 files changed, 7 insertions(+), 12 deletions(-)
rename kop-common-lib/src/main/java/de/ozgcloud/common/logging/{KopLogging.java => OzgCloudLogging.java} (97%)
rename kop-common-lib/src/main/java/de/ozgcloud/common/logging/{KopLoggingAspect.java => OzgCloudLoggingAspect.java} (96%)
rename kop-common-lib/src/main/java/de/ozgcloud/common/logging/{KopLoggingInterceptor.java => OzgCloudLoggingInterceptor.java} (96%)
rename kop-common-lib/src/test/java/de/ozgcloud/common/logging/{KopLoggingInterceptorTest.java => OzgCloudLoggingInterceptorTest.java} (94%)
diff --git a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/AspectPointcuts.java b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/AspectPointcuts.java
index 8880ec5..60884b7 100644
--- a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/AspectPointcuts.java
+++ b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/AspectPointcuts.java
@@ -32,11 +32,6 @@ public class AspectPointcuts {
// aspect pointcut - no implementation needed
}
- @Pointcut("within(de.itvsh..*)")
- void anythingInKOP() {
- // aspect pointcut - no implementation needed
- }
-
@Pointcut("within(de.ozgcloud..*)")
void anythingInOzgCloud() {
// aspect pointcut - no implementation needed
diff --git a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLogging.java b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLogging.java
similarity index 97%
rename from kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLogging.java
rename to kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLogging.java
index 8decb72..9895370 100644
--- a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLogging.java
+++ b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLogging.java
@@ -36,6 +36,6 @@ import static java.lang.annotation.RetentionPolicy.*;
@Retention(RUNTIME)
@Documented
@InterceptorBinding
-public @interface KopLogging {
+public @interface OzgCloudLogging {
}
diff --git a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLoggingAspect.java b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLoggingAspect.java
similarity index 96%
rename from kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLoggingAspect.java
rename to kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLoggingAspect.java
index 354f75e..fbf298a 100644
--- a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLoggingAspect.java
+++ b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLoggingAspect.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
@Aspect
@Component
-public class KopLoggingAspect extends AspectPointcuts {
+public class OzgCloudLoggingAspect extends AspectPointcuts {
@Before("anyPublicServiceMethod()")
public void onServiceMethod(JoinPoint joinPoint) {
diff --git a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLoggingInterceptor.java b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLoggingInterceptor.java
similarity index 96%
rename from kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLoggingInterceptor.java
rename to kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLoggingInterceptor.java
index 527bdf8..84a93c6 100644
--- a/kop-common-lib/src/main/java/de/ozgcloud/common/logging/KopLoggingInterceptor.java
+++ b/kop-common-lib/src/main/java/de/ozgcloud/common/logging/OzgCloudLoggingInterceptor.java
@@ -28,10 +28,10 @@ import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
-@KopLogging
+@OzgCloudLogging
@Priority(10)
@Interceptor
-public class KopLoggingInterceptor {
+public class OzgCloudLoggingInterceptor {
@AroundInvoke
Object logging(InvocationContext context) throws Exception {
diff --git a/kop-common-lib/src/test/java/de/ozgcloud/common/logging/KopLoggingInterceptorTest.java b/kop-common-lib/src/test/java/de/ozgcloud/common/logging/OzgCloudLoggingInterceptorTest.java
similarity index 94%
rename from kop-common-lib/src/test/java/de/ozgcloud/common/logging/KopLoggingInterceptorTest.java
rename to kop-common-lib/src/test/java/de/ozgcloud/common/logging/OzgCloudLoggingInterceptorTest.java
index c469291..c1f1c02 100644
--- a/kop-common-lib/src/test/java/de/ozgcloud/common/logging/KopLoggingInterceptorTest.java
+++ b/kop-common-lib/src/test/java/de/ozgcloud/common/logging/OzgCloudLoggingInterceptorTest.java
@@ -33,14 +33,14 @@ import org.mockito.Mock;
import org.mockito.MockedStatic;
import de.ozgcloud.common.logging.AspectLoggingUtils;
-import de.ozgcloud.common.logging.KopLoggingInterceptor;
+import de.ozgcloud.common.logging.OzgCloudLoggingInterceptor;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-class KopLoggingInterceptorTest {
+class OzgCloudLoggingInterceptorTest {
- private final KopLoggingInterceptor interceptor = new KopLoggingInterceptor();
+ private final OzgCloudLoggingInterceptor interceptor = new OzgCloudLoggingInterceptor();
@DisplayName("Logging")
@Nested
--
GitLab