Skip to content

Package refactoring #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2015
Merged

Package refactoring #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db35ca8
Upgrade with seed refactoring
Nov 3, 2015
5f519a2
Refactor packages:
Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/src/it/java/org/seedstack/audit/internal/AuditedAnnotationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

import org.junit.Test;
import org.junit.runner.RunWith;
import org.seedstack.audit.api.Audited;
import org.seedstack.audit.Audited;
import org.seedstack.seed.it.SeedITRunner;
import org.seedstack.seed.it.api.ITBind;
import org.seedstack.seed.security.api.WithUser;
import org.seedstack.seed.security.api.exceptions.AuthorizationException;
import org.seedstack.seed.it.ITBind;
import org.seedstack.seed.security.WithUser;
import org.seedstack.seed.security.AuthorizationException;

import javax.inject.Inject;

Expand Down
6 changes: 3 additions & 3 deletions core/src/it/java/org/seedstack/audit/internal/ConsoleTrailWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*/
package org.seedstack.audit.internal;

import org.seedstack.audit.api.AuditEvent;
import org.seedstack.audit.AuditEvent;
import org.seedstack.audit.spi.TrailWriter;
import org.seedstack.seed.el.api.ELContextBuilder;
import org.seedstack.seed.el.api.ELService;
import org.seedstack.seed.el.ELContextBuilder;
import org.seedstack.seed.el.ELService;

import javax.el.ELContext;
import javax.inject.Inject;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/seedstack/audit/internal/AuditConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.ArrayUtils;
import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.audit.spi.TrailWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/seedstack/audit/internal/AuditContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.HashSet;
import java.util.Set;

import org.seedstack.audit.api.Trail;
import org.seedstack.audit.Trail;

/**
* Local thread context for audit interceptor
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/seedstack/audit/internal/AuditModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import com.google.inject.spi.InjectionListener;
import com.google.inject.spi.TypeEncounter;
import com.google.inject.spi.TypeListener;
import org.seedstack.audit.api.AuditService;
import org.seedstack.audit.api.Audited;
import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.audit.AuditService;
import org.seedstack.audit.Audited;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.audit.spi.TrailWriter;

import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/seedstack/audit/internal/AuditPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import io.nuun.kernel.api.plugin.request.ClasspathScanRequest;
import io.nuun.kernel.core.AbstractPlugin;
import org.apache.commons.configuration.Configuration;
import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.audit.spi.TrailWriter;
import org.seedstack.seed.core.internal.application.ApplicationPlugin;

Expand Down
14 changes: 7 additions & 7 deletions core/src/main/java/org/seedstack/audit/internal/AuditedInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.lang.StringUtils;
import org.seedstack.audit.api.AuditService;
import org.seedstack.audit.api.Trail;
import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.audit.api.Audited;
import org.seedstack.seed.el.api.ELContextBuilder;
import org.seedstack.seed.el.api.ELContextBuilder.ELPropertyProvider;
import org.seedstack.seed.el.api.ELService;
import org.seedstack.audit.AuditService;
import org.seedstack.audit.Trail;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.audit.Audited;
import org.seedstack.seed.el.ELContextBuilder;
import org.seedstack.seed.el.ELContextBuilder.ELPropertyProvider;
import org.seedstack.seed.el.ELService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/org/seedstack/audit/internal/DefaultAuditService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
*/
package org.seedstack.audit.internal;

import org.seedstack.audit.api.*;
import org.seedstack.audit.*;
import org.seedstack.audit.spi.TrailWriter;
import org.seedstack.seed.core.api.Application;
import org.seedstack.seed.security.api.SecuritySupport;
import org.seedstack.seed.security.api.principals.Principals;
import org.seedstack.seed.security.api.principals.SimplePrincipalProvider;
import org.seedstack.seed.Application;
import org.seedstack.seed.security.SecuritySupport;
import org.seedstack.seed.security.principals.Principals;
import org.seedstack.seed.security.principals.SimplePrincipalProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/seedstack/audit/internal/SecurityTrailExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/
package org.seedstack.audit.internal;

import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.seed.security.api.exceptions.AuthorizationException;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.seed.security.AuthorizationException;

/**
* The implementation of trail exception handler for the security.
Expand Down
49 changes: 0 additions & 49 deletions core/src/test/java/org/seedstack/audit/api/HostTest.java
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions core/src/test/java/org/seedstack/audit/api/TrailTest.java
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions core/src/test/java/org/seedstack/audit/internal/AuditConfigurerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@
import org.apache.commons.configuration.Configuration;
import org.junit.Before;
import org.junit.Test;
import org.seedstack.audit.api.AuditEvent;
import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.audit.internal.AuditConfigurer;
import org.seedstack.audit.internal.SecurityTrailExceptionHandler;
import org.seedstack.audit.AuditEvent;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.audit.spi.TrailWriter;

public class AuditConfigurerTest {
Expand Down
3 changes: 1 addition & 2 deletions core/src/test/java/org/seedstack/audit/internal/AuditContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
import static org.mockito.Mockito.mock;

import org.junit.Test;
import org.seedstack.audit.api.Trail;
import org.seedstack.audit.internal.AuditContext;
import org.seedstack.audit.Trail;

public class AuditContextTest {

Expand Down
7 changes: 2 additions & 5 deletions core/src/test/java/org/seedstack/audit/internal/AuditModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.internal.util.reflection.Whitebox;
import org.seedstack.audit.api.AuditEvent;
import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.audit.internal.AuditConfigurer;
import org.seedstack.audit.internal.AuditModule;
import org.seedstack.audit.internal.SecurityTrailExceptionHandler;
import org.seedstack.audit.AuditEvent;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.audit.spi.TrailWriter;

import com.google.inject.Binder;
Expand Down
13 changes: 6 additions & 7 deletions core/src/test/java/org/seedstack/audit/internal/AuditedInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.internal.util.reflection.Whitebox;
import org.seedstack.audit.api.AuditService;
import org.seedstack.audit.api.TrailExceptionHandler;
import org.seedstack.audit.api.Audited;
import org.seedstack.audit.internal.AuditedInterceptor;
import org.seedstack.seed.el.api.ELContextBuilder;
import org.seedstack.seed.el.api.ELContextBuilder.ELPropertyProvider;
import org.seedstack.seed.el.api.ELService;
import org.seedstack.audit.AuditService;
import org.seedstack.audit.TrailExceptionHandler;
import org.seedstack.audit.Audited;
import org.seedstack.seed.el.ELContextBuilder;
import org.seedstack.seed.el.ELContextBuilder.ELPropertyProvider;
import org.seedstack.seed.el.ELService;

public class AuditedInterceptorTest {

Expand Down
13 changes: 6 additions & 7 deletions core/src/test/java/org/seedstack/audit/internal/DefaultAuditServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.internal.util.reflection.Whitebox;
import org.seedstack.audit.api.AuditEvent;
import org.seedstack.audit.api.Host;
import org.seedstack.audit.api.Trail;
import org.seedstack.audit.internal.DefaultAuditService;
import org.seedstack.audit.AuditEvent;
import org.seedstack.audit.Host;
import org.seedstack.audit.Trail;
import org.seedstack.audit.spi.TrailWriter;
import org.seedstack.seed.core.api.Application;
import org.seedstack.seed.security.api.SecuritySupport;
import org.seedstack.seed.security.api.principals.Principals;
import org.seedstack.seed.Application;
import org.seedstack.seed.security.SecuritySupport;
import org.seedstack.seed.security.principals.Principals;

public class DefaultAuditServiceTest {

Expand Down
6 changes: 3 additions & 3 deletions logback/src/it/java/org/seedstack/business/audit/IntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

import org.junit.Test;
import org.junit.runner.RunWith;
import org.seedstack.audit.api.Audited;
import org.seedstack.audit.Audited;
import org.seedstack.seed.it.SeedITRunner;
import org.seedstack.seed.it.api.ITBind;
import org.seedstack.seed.security.api.WithUser;
import org.seedstack.seed.it.ITBind;
import org.seedstack.seed.security.WithUser;

@RunWith(SeedITRunner.class)
public class IntegrationTest {
Expand Down
2 changes: 1 addition & 1 deletion logback/src/it/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</appender>
<appender name="AUDIT_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.seedstack.audit.infrastructure.logback.AuditLogbackLayout" />
<layout class="org.seedstack.audit.logback.AuditLogbackLayout" />
</encoder>
</appender>

Expand Down
10 changes: 5 additions & 5 deletions ...structure/logback/AuditLogbackLayout.java → ...ack/audit/logback/AuditLogbackLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package org.seedstack.audit.infrastructure.logback;
package org.seedstack.audit.logback;

import javax.el.ELContext;
import javax.inject.Inject;

import org.seedstack.audit.api.AuditEvent;
import org.seedstack.seed.core.api.Configuration;
import org.seedstack.seed.el.api.ELContextBuilder;
import org.seedstack.seed.el.api.ELService;
import org.seedstack.audit.AuditEvent;
import org.seedstack.seed.Configuration;
import org.seedstack.seed.el.ELContextBuilder;
import org.seedstack.seed.el.ELService;

import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.CoreConstants;
Expand Down
4 changes: 2 additions & 2 deletions ...structure/logback/LogbackTrailWriter.java → ...ack/audit/logback/LogbackTrailWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package org.seedstack.audit.infrastructure.logback;
package org.seedstack.audit.logback;

import org.seedstack.audit.api.AuditEvent;
import org.seedstack.audit.AuditEvent;
import org.seedstack.audit.spi.TrailWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions .../internal/logback/AuditLogbackModule.java → .../logback/internal/AuditLogbackModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package org.seedstack.audit.internal.logback;
package org.seedstack.audit.logback.internal;

import org.seedstack.audit.infrastructure.logback.AuditLogbackLayout;
import org.seedstack.audit.logback.AuditLogbackLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion .../internal/logback/AuditLogbackPlugin.java → .../logback/internal/AuditLogbackPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package org.seedstack.audit.internal.logback;
package org.seedstack.audit.logback.internal;


import io.nuun.kernel.core.AbstractPlugin;
Expand Down
5 changes: 3 additions & 2 deletions ...org/seedstack/audit/api/package-info.java → ...seedstack/audit/logback/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

/**
* Provides classes for auditing the functional behavior of an application.
* Provides a audit implementation with logback.
*
* @author pierre.thirouin@ext.mpsa.com (Pierre Thirouin)
*/
package org.seedstack.audit.api;
package org.seedstack.audit.logback;
2 changes: 1 addition & 1 deletion logback/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.seedstack.audit.internal.logback.AuditLogbackPlugin
org.seedstack.audit.logback.internal.AuditLogbackPlugin
Loading