Formatted project
Change-Id: I6993ddfab02e06541b4138040280a4777c719562
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java
index 9a2579c..77a578d 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java
@@ -33,8 +33,8 @@
@SuppressWarnings("unchecked")
public List<AccessScope> retrieveAccessScopes () {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AccessScope> query =
- builder.createQuery(AccessScope.class);
+ CriteriaQuery<AccessScope> query = builder
+ .createQuery(AccessScope.class);
Root<AccessScope> root = query.from(AccessScope.class);
query.select(root);
Query q = entityManager.createQuery(query);
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java
index b2fec0b..35b2b75 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java
@@ -65,8 +65,8 @@
ParameterChecker.checkObjectValue(authenticationTime,
"authentication time");
- ZonedDateTime now =
- ZonedDateTime.now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
+ ZonedDateTime now = ZonedDateTime
+ .now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
ZonedDateTime expiry;
AccessToken accessToken = new AccessToken();
@@ -91,16 +91,17 @@
entityManager.persist(accessToken);
}
- public void storeAccessToken (AccessToken accessToken)
- throws KustvaktException {
+ public void storeAccessToken (AccessToken accessToken)
+ throws KustvaktException {
ParameterChecker.checkObjectValue(accessToken, "access token");
entityManager.persist(accessToken);
}
+
public AccessToken updateAccessToken (AccessToken accessToken)
throws KustvaktException {
ParameterChecker.checkObjectValue(accessToken, "access_token");
- AccessToken cachedToken =
- (AccessToken) this.getCacheValue(accessToken.getToken());
+ AccessToken cachedToken = (AccessToken) this
+ .getCacheValue(accessToken.getToken());
if (cachedToken != null) {
this.removeCacheEntry(accessToken.getToken());
}
@@ -118,8 +119,8 @@
}
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AccessToken> query =
- builder.createQuery(AccessToken.class);
+ CriteriaQuery<AccessToken> query = builder
+ .createQuery(AccessToken.class);
Root<AccessToken> root = query.from(AccessToken.class);
query.select(root);
query.where(builder.equal(root.get(AccessToken_.token), accessToken));
@@ -145,8 +146,8 @@
}
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AccessToken> query =
- builder.createQuery(AccessToken.class);
+ CriteriaQuery<AccessToken> query = builder
+ .createQuery(AccessToken.class);
Root<AccessToken> root = query.from(AccessToken.class);
Predicate condition = builder.and(
@@ -172,12 +173,12 @@
OAuth2Client client = clientDao.retrieveClientById(clientId);
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AccessToken> query =
- builder.createQuery(AccessToken.class);
+ CriteriaQuery<AccessToken> query = builder
+ .createQuery(AccessToken.class);
Root<AccessToken> root = query.from(AccessToken.class);
- Predicate condition =
- builder.equal(root.get(AccessToken_.client), client);
+ Predicate condition = builder.equal(root.get(AccessToken_.client),
+ client);
if (username != null && !username.isEmpty()) {
condition = builder.and(condition,
builder.equal(root.get(AccessToken_.userId), username));
@@ -194,8 +195,8 @@
ParameterChecker.checkStringValue(username, "username");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AccessToken> query =
- builder.createQuery(AccessToken.class);
+ CriteriaQuery<AccessToken> query = builder
+ .createQuery(AccessToken.class);
Root<AccessToken> root = query.from(AccessToken.class);
root.fetch(AccessToken_.client);
@@ -222,11 +223,11 @@
List<AccessToken> invalidAccessTokens = retrieveInvalidAccessTokens();
invalidAccessTokens.forEach(token -> entityManager.remove(token));
}
-
+
public List<AccessToken> retrieveInvalidAccessTokens () {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AccessToken> query =
- builder.createQuery(AccessToken.class);
+ CriteriaQuery<AccessToken> query = builder
+ .createQuery(AccessToken.class);
Root<AccessToken> root = query.from(AccessToken.class);
Predicate condition = builder.or(
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java
index b66037b..ed7f218 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java
@@ -63,8 +63,8 @@
authorization.setUserAuthenticationTime(authenticationTime);
authorization.setNonce(nonce);
- ZonedDateTime now =
- ZonedDateTime.now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
+ ZonedDateTime now = ZonedDateTime
+ .now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
authorization.setCreatedDate(now);
authorization.setExpiryDate(
now.plusSeconds(config.getAuthorizationCodeExpiry()));
@@ -79,12 +79,12 @@
ParameterChecker.checkStringValue(code, "code");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<Authorization> query =
- builder.createQuery(Authorization.class);
+ CriteriaQuery<Authorization> query = builder
+ .createQuery(Authorization.class);
Root<Authorization> root = query.from(Authorization.class);
- Predicate restrictions =
- builder.equal(root.get(Authorization_.code), code);
+ Predicate restrictions = builder.equal(root.get(Authorization_.code),
+ code);
query.select(root);
query.where(restrictions);
@@ -111,12 +111,12 @@
public List<Authorization> retrieveAuthorizationsByClientId (
String clientId) {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<Authorization> query =
- builder.createQuery(Authorization.class);
+ CriteriaQuery<Authorization> query = builder
+ .createQuery(Authorization.class);
Root<Authorization> root = query.from(Authorization.class);
- Predicate restrictions =
- builder.equal(root.get(Authorization_.clientId), clientId);
+ Predicate restrictions = builder
+ .equal(root.get(Authorization_.clientId), clientId);
query.select(root);
query.where(restrictions);
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java
index 5f74aed..20453fd 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java
@@ -58,8 +58,8 @@
authorization.setUserAuthenticationTime(authenticationTime);
authorization.setNonce(nonce);
- ZonedDateTime now =
- ZonedDateTime.now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
+ ZonedDateTime now = ZonedDateTime
+ .now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
authorization.setCreatedDate(now);
authorization.setExpiryDate(
now.plusSeconds(config.getAuthorizationCodeExpiry()));
@@ -87,8 +87,8 @@
throws KustvaktException {
this.storeInCache(authorization.getCode(), authorization);
- Authorization auth =
- (Authorization) this.getCacheValue(authorization.getCode());
+ Authorization auth = (Authorization) this
+ .getCacheValue(authorization.getCode());
return auth;
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java
index b2dfb39..46bc06b 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java
@@ -53,8 +53,8 @@
ParameterChecker.checkStringValue(installedBy, "installedBy");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<InstalledPlugin> query =
- builder.createQuery(InstalledPlugin.class);
+ CriteriaQuery<InstalledPlugin> query = builder
+ .createQuery(InstalledPlugin.class);
Root<InstalledPlugin> root = query.from(InstalledPlugin.class);
query.select(root);
@@ -82,8 +82,8 @@
ParameterChecker.checkStringValue(installedBy, "installedBy");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<InstalledPlugin> query =
- builder.createQuery(InstalledPlugin.class);
+ CriteriaQuery<InstalledPlugin> query = builder
+ .createQuery(InstalledPlugin.class);
Root<InstalledPlugin> root = query.from(InstalledPlugin.class);
query.select(root);
@@ -104,8 +104,8 @@
public void uninstallPlugin (String superClientId, String clientId,
String username) throws KustvaktException {
- InstalledPlugin plugin =
- retrieveInstalledPlugin(superClientId, clientId, username);
+ InstalledPlugin plugin = retrieveInstalledPlugin(superClientId,
+ clientId, username);
entityManager.remove(plugin);
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java
index 9aa7bb8..0e118d5 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java
@@ -85,19 +85,21 @@
client.setPermitted(true);
}
if (refreshTokenExpiry <= 0) {
- if (type.equals(OAuth2ClientType.CONFIDENTIAL)){
+ if (type.equals(OAuth2ClientType.CONFIDENTIAL)) {
refreshTokenExpiry = config.getRefreshTokenLongExpiry();
}
}
- else if (type.equals(OAuth2ClientType.PUBLIC)){
- throw new KustvaktException(StatusCodes.INVALID_REFRESH_TOKEN_EXPIRY,
+ else if (type.equals(OAuth2ClientType.PUBLIC)) {
+ throw new KustvaktException(
+ StatusCodes.INVALID_REFRESH_TOKEN_EXPIRY,
"Custom refresh token expiry is only applicable for confidential clients");
}
- else if (refreshTokenExpiry > 31536000 ){
- throw new KustvaktException(StatusCodes.INVALID_REFRESH_TOKEN_EXPIRY,
+ else if (refreshTokenExpiry > 31536000) {
+ throw new KustvaktException(
+ StatusCodes.INVALID_REFRESH_TOKEN_EXPIRY,
"Maximum refresh token expiry is 31536000 seconds (1 year)");
}
-
+
client.setRefreshTokenExpiry(refreshTokenExpiry);
entityManager.persist(client);
}
@@ -108,8 +110,8 @@
ParameterChecker.checkStringValue(clientId, "client_id");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<OAuth2Client> query =
- builder.createQuery(OAuth2Client.class);
+ CriteriaQuery<OAuth2Client> query = builder
+ .createQuery(OAuth2Client.class);
Root<OAuth2Client> root = query.from(OAuth2Client.class);
query.select(root);
@@ -148,12 +150,12 @@
ParameterChecker.checkStringValue(username, "username");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<OAuth2Client> query =
- builder.createQuery(OAuth2Client.class);
+ CriteriaQuery<OAuth2Client> query = builder
+ .createQuery(OAuth2Client.class);
Root<OAuth2Client> client = query.from(OAuth2Client.class);
- Join<OAuth2Client, RefreshToken> refreshToken =
- client.join(OAuth2Client_.refreshTokens);
+ Join<OAuth2Client, RefreshToken> refreshToken = client
+ .join(OAuth2Client_.refreshTokens);
Predicate condition = builder.and(
builder.equal(refreshToken.get(RefreshToken_.userId), username),
builder.equal(refreshToken.get(RefreshToken_.isRevoked), false),
@@ -174,12 +176,12 @@
ParameterChecker.checkStringValue(username, "username");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<OAuth2Client> query =
- builder.createQuery(OAuth2Client.class);
+ CriteriaQuery<OAuth2Client> query = builder
+ .createQuery(OAuth2Client.class);
Root<OAuth2Client> client = query.from(OAuth2Client.class);
- Join<OAuth2Client, AccessToken> accessToken =
- client.join(OAuth2Client_.accessTokens);
+ Join<OAuth2Client, AccessToken> accessToken = client
+ .join(OAuth2Client_.accessTokens);
Predicate condition = builder.and(
builder.equal(accessToken.get(AccessToken_.userId), username),
builder.equal(accessToken.get(AccessToken_.isRevoked), false),
@@ -200,8 +202,8 @@
ParameterChecker.checkStringValue(username, "username");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<OAuth2Client> query =
- builder.createQuery(OAuth2Client.class);
+ CriteriaQuery<OAuth2Client> query = builder
+ .createQuery(OAuth2Client.class);
Root<OAuth2Client> client = query.from(OAuth2Client.class);
query.select(client);
@@ -215,12 +217,12 @@
public List<OAuth2Client> retrievePlugins (boolean isPermittedOnly)
throws KustvaktException {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<OAuth2Client> query =
- builder.createQuery(OAuth2Client.class);
+ CriteriaQuery<OAuth2Client> query = builder
+ .createQuery(OAuth2Client.class);
Root<OAuth2Client> client = query.from(OAuth2Client.class);
- Predicate restrictions =
- builder.isNotNull(client.get(OAuth2Client_.SOURCE));
+ Predicate restrictions = builder
+ .isNotNull(client.get(OAuth2Client_.SOURCE));
if (isPermittedOnly) {
restrictions = builder.and(restrictions,
builder.isTrue(client.get(OAuth2Client_.IS_PERMITTED)));
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java
index 0c68485..19da4ff 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java
@@ -50,8 +50,8 @@
ParameterChecker.checkObjectValue(client, "client");
ParameterChecker.checkObjectValue(scopes, "scopes");
- ZonedDateTime now =
- ZonedDateTime.now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
+ ZonedDateTime now = ZonedDateTime
+ .now(ZoneId.of(Attributes.DEFAULT_TIME_ZONE));
RefreshToken token = new RefreshToken();
token.setToken(refreshToken);
@@ -79,8 +79,8 @@
ParameterChecker.checkStringValue(token, "refresh_token");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<RefreshToken> query =
- builder.createQuery(RefreshToken.class);
+ CriteriaQuery<RefreshToken> query = builder
+ .createQuery(RefreshToken.class);
Root<RefreshToken> root = query.from(RefreshToken.class);
root.fetch(RefreshToken_.client);
@@ -97,8 +97,8 @@
ParameterChecker.checkStringValue(username, "username");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<RefreshToken> query =
- builder.createQuery(RefreshToken.class);
+ CriteriaQuery<RefreshToken> query = builder
+ .createQuery(RefreshToken.class);
Root<RefreshToken> root = query.from(RefreshToken.class);
Predicate condition = builder.and(
@@ -122,12 +122,12 @@
OAuth2Client client = clientDao.retrieveClientById(clientId);
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<RefreshToken> query =
- builder.createQuery(RefreshToken.class);
+ CriteriaQuery<RefreshToken> query = builder
+ .createQuery(RefreshToken.class);
Root<RefreshToken> root = query.from(RefreshToken.class);
- Predicate condition =
- builder.equal(root.get(RefreshToken_.client), client);
+ Predicate condition = builder.equal(root.get(RefreshToken_.client),
+ client);
if (username != null && !username.isEmpty()) {
condition = builder.and(condition,
builder.equal(root.get(RefreshToken_.userId), username));
@@ -144,8 +144,8 @@
ParameterChecker.checkStringValue(username, "username");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<RefreshToken> query =
- builder.createQuery(RefreshToken.class);
+ CriteriaQuery<RefreshToken> query = builder
+ .createQuery(RefreshToken.class);
Root<RefreshToken> root = query.from(RefreshToken.class);
root.fetch(RefreshToken_.client);
@@ -172,11 +172,11 @@
List<RefreshToken> invalidRefreshTokens = retrieveInvalidRefreshTokens();
invalidRefreshTokens.forEach(token -> entityManager.remove(token));
}
-
+
public List<RefreshToken> retrieveInvalidRefreshTokens () {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<RefreshToken> query =
- builder.createQuery(RefreshToken.class);
+ CriteriaQuery<RefreshToken> query = builder
+ .createQuery(RefreshToken.class);
Root<RefreshToken> root = query.from(RefreshToken.class);
Predicate condition = builder.or(