Skip to content

Commit 38804b8

Browse files
ci/cd : sonatype verification
1 parent 329bd64 commit 38804b8

File tree

80 files changed

+253
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+253
-256
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Complete separation of the library (API) and the client for testing it
55
```xml
66
<dependency>
7-
<groupId>io.github.patternknife.securityhelper.oauth2.api</groupId>
7+
<groupId>com.github.patternknife.securityhelper.oauth2.api</groupId>
88
<artifactId>spring-security-oauth2-password-jpa-implementation</artifactId>
9-
<version>2.8.0</version>
9+
<version>2.8.1</version>
1010
</dependency>
1111
```
1212
* Set up the same access & refresh token APIs on both ``/oauth2/token`` and on our controller layer such as ``/api/v1/traditional-oauth/token``, both of which function same and have `the same request & response payloads for success and errors`. (However, ``/oauth2/token`` is the standard that "spring-authorization-server" provides.)
@@ -77,8 +77,8 @@ mvnw clean install # Integration tests are done here, which creates docs by Spri
7777

7878
```java
7979

80-
// ADD 'io.github.patternknife.securityhelper.oauth2.api'
81-
@SpringBootApplication(scanBasePackages = {"com.patternknife.securityhelper.oauth2.client", "io.github.patternknife.securityhelper.oauth2.api"})
80+
// ADD 'com.github.patternknife.securityhelper.oauth2.api'
81+
@SpringBootApplication(scanBasePackages = {"com.patternknife.securityhelper.oauth2.client", "com.github.patternknife.securityhelper.oauth2.api"})
8282
public class SpringSecurityOauth2PasswordJpaImplApplication {
8383

8484
public static void main(String[] args) {
@@ -90,25 +90,25 @@ public class SpringSecurityOauth2PasswordJpaImplApplication {
9090

9191
```java
9292
@Configuration
93-
// ADD 'io.github.patternknife.securityhelper.oauth2.api.config.security'
93+
// ADD 'com.github.patternknife.securityhelper.oauth2.api.config.security'
9494
@EnableJpaRepositories(
9595
basePackages = {"com.patternknife.securityhelper.oauth2.client.domain",
9696
"com.patternknife.securityhelper.oauth2.client.config.securityimpl",
97-
"io.github.patternknife.securityhelper.oauth2.api.config.security"},
97+
"com.github.patternknife.securityhelper.oauth2.api.config.security"},
9898
entityManagerFactoryRef = "commonEntityManagerFactory",
9999
transactionManagerRef= "commonTransactionManager"
100100
)
101101
public class CommonDataSourceConfiguration {
102102

103103

104-
// ADD 'io.github.patternknife.securityhelper.oauth2.api.config.security'
104+
// ADD 'com.github.patternknife.securityhelper.oauth2.api.config.security'
105105
@Primary
106106
@Bean(name = "commonEntityManagerFactory")
107107
public LocalContainerEntityManagerFactoryBean commonEntityManagerFactory(EntityManagerFactoryBuilder builder) {
108108
return builder
109109
.dataSource(commonDataSource())
110110
.packages("com.patternknife.securityhelper.oauth2.client.domain",
111-
"io.github.patternknife.securityhelper.oauth2.api.config.security")
111+
"com.github.patternknife.securityhelper.oauth2.api.config.security")
112112
.persistenceUnit("commonEntityManager")
113113
.build();
114114
}

client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>com.patternknife.securityhelper.oauth2.client</groupId>
99
<artifactId>spring-security-oauth2-password-jpa-implementation-client</artifactId>
10-
<version>2.8.0</version>
10+
<version>2.8.1</version>
1111
<packaging>jar</packaging>
1212

1313
<properties>
@@ -46,9 +46,9 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
4646
<dependencies>
4747

4848
<dependency>
49-
<groupId>io.github.patternknife.securityhelper.oauth2.api</groupId>
49+
<groupId>com.github.patternknife.securityhelper.oauth2.api</groupId>
5050
<artifactId>spring-security-oauth2-password-jpa-implementation</artifactId>
51-
<version>2.8.0</version>
51+
<version>2.8.1</version>
5252
</dependency>
5353

5454
<!-- DB -->

client/src/main/java/com/patternknife/securityhelper/oauth2/client/SpringSecurityOauth2PasswordJpaImplApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.TimeZone;
88

99

10-
@SpringBootApplication(scanBasePackages = {"com.patternknife.securityhelper.oauth2.client", "io.github.patternknife.securityhelper.oauth2.api"})
10+
@SpringBootApplication(scanBasePackages = {"com.patternknife.securityhelper.oauth2.client", "com.github.patternknife.securityhelper.oauth2.api"})
1111
public class SpringSecurityOauth2PasswordJpaImplApplication {
1212

1313
@PostConstruct

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/database/CommonDataSourceConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@EnableJpaRepositories(
2323
basePackages = {"com.patternknife.securityhelper.oauth2.client.domain",
2424
"com.patternknife.securityhelper.oauth2.client.config.securityimpl",
25-
"io.github.patternknife.securityhelper.oauth2.api.config.security"},
25+
"com.github.patternknife.securityhelper.oauth2.api.config.security"},
2626
entityManagerFactoryRef = "commonEntityManagerFactory",
2727
transactionManagerRef= "commonTransactionManager"
2828
)
@@ -49,7 +49,7 @@ public LocalContainerEntityManagerFactoryBean commonEntityManagerFactory(EntityM
4949
return builder
5050
.dataSource(commonDataSource())
5151
.packages("com.patternknife.securityhelper.oauth2.client.domain",
52-
"io.github.patternknife.securityhelper.oauth2.api.config.security")
52+
"com.github.patternknife.securityhelper.oauth2.api.config.security")
5353
.persistenceUnit("commonEntityManager")
5454
.build();
5555
}

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/GlobalExceptionHandler.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
import com.patternknife.securityhelper.oauth2.client.config.response.error.dto.CustomErrorResponsePayload;
55

66
import com.patternknife.securityhelper.oauth2.client.config.response.error.message.GeneralErrorMessage;
7-
import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.handler.SecurityKnifeExceptionHandler;
8-
import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.util.ExceptionKnifeUtils;
9-
import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorResponsePayload;
10-
import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.exception.KnifeOauth2AuthenticationException;
11-
import io.github.patternknife.securityhelper.oauth2.api.config.security.message.DefaultSecurityUserExceptionMessage;
12-
import io.github.patternknife.securityhelper.oauth2.api.config.security.message.ISecurityUserExceptionMessageService;
13-
import io.github.patternknife.securityhelper.oauth2.api.config.security.util.OrderConstants;
7+
import com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.util.ExceptionKnifeUtils;
8+
import com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorResponsePayload;
9+
import com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.exception.KnifeOauth2AuthenticationException;
10+
import com.github.patternknife.securityhelper.oauth2.api.config.security.message.DefaultSecurityUserExceptionMessage;
11+
import com.github.patternknife.securityhelper.oauth2.api.config.security.message.ISecurityUserExceptionMessageService;
12+
import com.github.patternknife.securityhelper.oauth2.api.config.security.util.OrderConstants;
1413
import lombok.RequiredArgsConstructor;;
15-
import org.springframework.core.Ordered;
1614
import org.springframework.core.annotation.Order;
1715
import org.springframework.http.HttpStatus;
1816
import org.springframework.http.ResponseEntity;
@@ -27,9 +25,9 @@
2725
/*
2826
*
2927
* Customize the exception payload by implementing this, which replaces
30-
* 'io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.handler.SecurityKnifeExceptionHandler'
28+
* 'com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.handler.SecurityKnifeExceptionHandler'
3129
*
32-
* Once you create 'GlobalExceptionHandler', you should insert the following two (authenticationException, authorizationException) as default. Otherwise, 'unhandledExceptionHandler' is prior to 'io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.handler.SecurityKnifeExceptionHandler'.
30+
* Once you create 'GlobalExceptionHandler', you should insert the following two (authenticationException, authorizationException) as default. Otherwise, 'unhandledExceptionHandler' is prior to 'com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.handler.SecurityKnifeExceptionHandler'.
3331
* "OrderConstants.SECURITY_KNIFE_EXCEPTION_HANDLER_ORDER - 1" means this is prior to "SecurityKnifeExceptionHandler"
3432
* */
3533
@Order(OrderConstants.SECURITY_KNIFE_EXCEPTION_HANDLER_ORDER - 1)

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/dto/CustomErrorResponsePayload.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
import com.fasterxml.jackson.annotation.JsonIgnore;
5-
import io.github.patternknife.securityhelper.oauth2.api.config.util.TimestampUtil;
6-
import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorMessages;
5+
import com.github.patternknife.securityhelper.oauth2.api.config.util.TimestampUtil;
6+
import com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorMessages;
77

88
import lombok.ToString;
99
import org.apache.commons.lang3.StringUtils;

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/exception/ErrorMessagesContainedException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.patternknife.securityhelper.oauth2.client.config.response.error.exception;
22

3-
import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorMessages;
3+
import com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorMessages;
44

55
public abstract class ErrorMessagesContainedException extends RuntimeException {
66

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/exception/data/ResourceNotFoundException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.patternknife.securityhelper.oauth2.client.config.response.error.exception.data;
22

3-
import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorMessages;
3+
import com.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorMessages;
44
import com.patternknife.securityhelper.oauth2.client.config.response.error.exception.ErrorMessagesContainedException;
55
import org.springframework.http.HttpStatus;
66
import org.springframework.web.bind.annotation.ResponseStatus;

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/exception/util/EncodingProcessException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.patternknife.securityhelper.oauth2.client.config.response.error.exception.util;
22

3-
import io.github.patternknife.securityhelper.oauth2.api.config.security.message.ExceptionMessageInterface;
3+
import com.github.patternknife.securityhelper.oauth2.api.config.security.message.ExceptionMessageInterface;
44
import org.springframework.http.HttpStatus;
55
import org.springframework.web.bind.annotation.ResponseStatus;
66

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/message/GeneralErrorMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.patternknife.securityhelper.oauth2.client.config.response.error.message;
22

3-
import io.github.patternknife.securityhelper.oauth2.api.config.security.message.ExceptionMessageInterface;
3+
import com.github.patternknife.securityhelper.oauth2.api.config.security.message.ExceptionMessageInterface;
44
import lombok.Getter;
55
import org.springframework.http.HttpStatus;
66

0 commit comments

Comments
 (0)