Skip to content

Commit 373399a

Browse files
committed
simple interface implementation
1 parent 378a982 commit 373399a

File tree

9 files changed

+87
-19
lines changed

9 files changed

+87
-19
lines changed

src/main/java/org/audit4j/core/AuditManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*
3434
* @since 1.0.0
3535
*/
36-
public final class AuditManager {
36+
public final class AuditManager implements IAuditManager {
3737

3838
/**
3939
* Instantiates a new audit manager.
@@ -121,7 +121,7 @@ public static AuditManager getInstance() {
121121
* @deprecated
122122
*/
123123
@Deprecated
124-
public static AuditManager getConfigurationInstance(Configuration configuration) {
124+
public static IAuditManager getConfigurationInstance(Configuration configuration) {
125125
Context.setConfig(configuration);
126126
return getInstance();
127127
}
@@ -138,7 +138,7 @@ public static AuditManager getConfigurationInstance(Configuration configuration)
138138
* @since 2.3.0
139139
*/
140140
@Deprecated
141-
public static AuditManager initWithConfiguration(Configuration configuration) {
141+
public static IAuditManager initWithConfiguration(Configuration configuration) {
142142
Context.setConfig(configuration);
143143
return getInstance();
144144
}
@@ -154,7 +154,7 @@ public static AuditManager initWithConfiguration(Configuration configuration) {
154154
*
155155
* @since 2.3.1
156156
*/
157-
public static AuditManager startWithConfiguration(Configuration configuration) {
157+
public static IAuditManager startWithConfiguration(Configuration configuration) {
158158
Context.setConfig(configuration);
159159
return getInstance();
160160
}
@@ -171,7 +171,7 @@ public static AuditManager startWithConfiguration(Configuration configuration) {
171171
* @return the audit manager
172172
* @since 2.3.1
173173
*/
174-
public static AuditManager startWithConfiguration(String configFilePath) {
174+
public static IAuditManager startWithConfiguration(String configFilePath) {
175175
Context.setConfigFilePath(configFilePath);
176176
return getInstance();
177177
}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package org.audit4j.core;
2+
3+
import org.audit4j.core.dto.AnnotationAuditEvent;
4+
import org.audit4j.core.dto.AuditEvent;
5+
6+
import java.lang.reflect.Method;
7+
8+
/**
9+
* IAuditManager. This interface describes actions available for AuditManager
10+
* implementations.
11+
*
12+
* @since ?.?.?
13+
*/
14+
public interface IAuditManager {
15+
16+
/**
17+
* Audit.
18+
*
19+
* @param event
20+
* the event
21+
* @return true, if successful
22+
*/
23+
boolean audit(AuditEvent event);
24+
25+
/**
26+
* Audit with annotation.
27+
*
28+
* @param clazz
29+
* the clazz
30+
* @param method
31+
* the method
32+
* @param args
33+
* the args
34+
* @return true, if successful
35+
*
36+
*/
37+
boolean audit(Class<?> clazz, Method method, Object[] args);
38+
39+
/**
40+
* Audit.
41+
*
42+
* @param annotationEvent
43+
* the annotation event
44+
* @return true, if successful
45+
*/
46+
boolean audit(AnnotationAuditEvent annotationEvent);
47+
48+
// /**
49+
// * Enable.
50+
// */
51+
// void enable();
52+
//
53+
// /**
54+
// * Disable.
55+
// */
56+
// void disable();
57+
//
58+
// /**
59+
// * Shutdown.
60+
// */
61+
// void shutdown();
62+
}

src/test/java/org/audit4j/core/Int/event/annotation/ClassAnnotationTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.audit4j.core.AuditManager;
66
import org.audit4j.core.Configuration;
7+
import org.audit4j.core.IAuditManager;
78
import org.audit4j.core.Mock.ClassAnnotationMock;
89
import org.audit4j.core.Mock.TestSuperObjectMock;
910
import org.audit4j.core.dto.AnnotationAuditEvent;
@@ -20,7 +21,7 @@ public void setup() {
2021

2122
@Test
2223
public void testAnnotation_selection_all() {
23-
AuditManager manager = AuditManager.startWithConfiguration(Configuration.DEFAULT);
24+
IAuditManager manager = AuditManager.startWithConfiguration(Configuration.DEFAULT);
2425
Method annoMethod = null;
2526
try {
2627
annoMethod = ClassAnnotationMock.class.getMethod("testClassAnnotation_selection_all", String.class);
@@ -39,7 +40,7 @@ public void testAnnotation_selection_all() {
3940

4041
@Test
4142
public void testAnnotation_complex() {
42-
AuditManager manager = AuditManager.startWithConfiguration(Configuration.DEFAULT);
43+
IAuditManager manager = AuditManager.startWithConfiguration(Configuration.DEFAULT);
4344
Method annoMethod = null;
4445
try {
4546
annoMethod = ClassAnnotationMock.class.getMethod("testClassAnnotation_Complex", String.class,

src/test/java/org/audit4j/core/Int/event/annotation/DeIdentifyAnnotationTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.lang.reflect.Method;
44

55
import org.audit4j.core.AuditManager;
6+
import org.audit4j.core.IAuditManager;
67
import org.audit4j.core.Mock.MethodAnnotationMock;
78
import org.junit.After;
89
import org.junit.Before;
@@ -17,7 +18,7 @@ public void setup() {
1718

1819
@Test
1920
public void testAnnotation_selection_marked_deidentify() {
20-
AuditManager manager = AuditManager.getInstance();
21+
IAuditManager manager = AuditManager.getInstance();
2122
Method annoMethod = null;
2223
try {
2324
annoMethod = MethodAnnotationMock.class.getMethod("testAnnotation_selection_marked_deidentify",
@@ -38,7 +39,7 @@ public void testAnnotation_selection_marked_deidentify() {
3839

3940
@Test
4041
public void testAnnotation_selection_marked_deidentify_from_left() {
41-
AuditManager manager = AuditManager.getInstance();
42+
IAuditManager manager = AuditManager.getInstance();
4243
Method annoMethod = null;
4344
try {
4445
annoMethod = MethodAnnotationMock.class.getMethod("testAnnotation_selection_marked_deidentify_from_left",
@@ -59,7 +60,7 @@ public void testAnnotation_selection_marked_deidentify_from_left() {
5960

6061
@Test
6162
public void testAnnotation_selection_marked_deidentify_from_right() {
62-
AuditManager manager = AuditManager.getInstance();
63+
IAuditManager manager = AuditManager.getInstance();
6364
Method annoMethod = null;
6465
try {
6566
annoMethod = MethodAnnotationMock.class.getMethod("testAnnotation_selection_marked_deidentify_from_right",

src/test/java/org/audit4j/core/Int/event/annotation/IgnoreAuditAnnotationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.lang.reflect.Method;
44

55
import org.audit4j.core.AuditManager;
6+
import org.audit4j.core.IAuditManager;
67
import org.audit4j.core.Mock.ClassAnnotationMock;
78
import org.audit4j.core.util.Log;
89
import org.audit4j.core.util.StopWatch;
@@ -19,7 +20,7 @@ public void setup() {
1920

2021
@Test
2122
public void testIgnoreAuditAnnotation() {
22-
AuditManager manager = AuditManager.getInstance();
23+
IAuditManager manager = AuditManager.getInstance();
2324
Method annoMethod = null;
2425
try {
2526
annoMethod = ClassAnnotationMock.class.getMethod("testClassAnnotation_Ignore", String.class);

src/test/java/org/audit4j/core/Int/filter/AuditEventFilterIntTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.audit4j.core.AuditManager;
66
import org.audit4j.core.Configuration;
7+
import org.audit4j.core.IAuditManager;
78
import org.audit4j.core.Int.IntTestBase;
89
import org.audit4j.core.Mock.AuditEventFilterMock;
910
import org.audit4j.core.dto.AuditEvent;
@@ -21,7 +22,7 @@ public void before() {
2122

2223
@Test
2324
public void testFilter_filter() throws InterruptedException {
24-
AuditManager manager = AuditManager.getInstance();
25+
IAuditManager manager = AuditManager.getInstance();
2526
AuditEvent event = getSampleAuditEvent();
2627
event.setAction("Filter");
2728
manager.audit(event);
@@ -31,7 +32,7 @@ public void testFilter_filter() throws InterruptedException {
3132

3233
@Test
3334
public void testFilter_not_filter() throws InterruptedException {
34-
AuditManager manager = AuditManager.getInstance();
35+
IAuditManager manager = AuditManager.getInstance();
3536
AuditEvent event = getSampleAuditEvent();
3637
event.setAction("NOTFilter");
3738
manager.audit(event);

src/test/java/org/audit4j/core/Int/option/ScanAnnotationOptionIntTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import org.audit4j.core.AuditManager;
88
import org.audit4j.core.Configuration;
9+
import org.audit4j.core.IAuditManager;
910
import org.audit4j.core.Int.IntTestBase;
1011
import org.junit.After;
1112
import org.junit.Before;
@@ -23,7 +24,7 @@ public void before() {
2324
@Test
2425
public void testFilter_filter_accepts() throws InterruptedException {
2526
watchStart("testFilter_filter_accepts");
26-
AuditManager manager = AuditManager.getInstance();
27+
IAuditManager manager = AuditManager.getInstance();
2728
boolean status = manager.audit(getSampleAnnotationEvent());
2829
watchStop();
2930
assertTrue(status);
@@ -33,7 +34,7 @@ public void testFilter_filter_accepts() throws InterruptedException {
3334
@Test
3435
public void testFilter_filter_denied() throws InterruptedException {
3536
watchStart("testFilter_filter_denied");
36-
AuditManager manager = AuditManager.getInstance();
37+
IAuditManager manager = AuditManager.getInstance();
3738
boolean status = manager.audit(getSampleNullAnnotationEvent());
3839
watchStop();
3940
// assertFalse(status);
@@ -42,6 +43,6 @@ public void testFilter_filter_denied() throws InterruptedException {
4243

4344
@After
4445
public void after() {
45-
AuditManager.getInstance().shutdown();
46+
AuditManager.shutdown();
4647
}
4748
}

src/test/java/org/audit4j/core/TroubleshootManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void testTroubleshootEvent_Orign() {
4747
public void testTroubleshootEvent_NULL_ACTOR_NULL_METADATA() {
4848
Configuration config = getDefaultConfiguration();
4949
config.setMetaData(null);
50-
AuditManager manager = AuditManager.getConfigurationInstance(config);
50+
IAuditManager manager = AuditManager.getConfigurationInstance(config);
5151
AuditEvent event = getSampleAuditEvent();
5252
// Set Actor as null
5353
event.setActor(null);

src/test/java/org/audit4j/core/smoke/SmokeTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.concurrent.TimeUnit;
44

55
import org.audit4j.core.AuditManager;
6+
import org.audit4j.core.IAuditManager;
67
import org.audit4j.core.dto.AuditEvent;
78
import org.audit4j.core.dto.EventBuilder;
89
import org.audit4j.core.util.Log;
@@ -23,7 +24,7 @@ public void smokeTestAuditEvent() throws InterruptedException {
2324
watch.stop();
2425
Log.info(watch.getTotalTime());
2526
watch.start();
26-
AuditManager manager = AuditManager.getInstance();
27+
IAuditManager manager = AuditManager.getInstance();
2728
//manager.audit(event);
2829

2930
watch.stop();
@@ -37,7 +38,7 @@ public void smokeTestAuditEvent() throws InterruptedException {
3738
}
3839

3940
public static void main(String[] args) {
40-
AuditManager manager = AuditManager.getInstance();
41+
IAuditManager manager = AuditManager.getInstance();
4142
int count = 0;
4243
while (count < 100000) {
4344
EventBuilder builder = new EventBuilder();

0 commit comments

Comments
 (0)