Skip to content

Commit 0df9cdb

Browse files
committed
refactor: rename package name
1 parent cdbb37c commit 0df9cdb

File tree

166 files changed

+1408
-1787
lines changed

Some content is hidden

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

166 files changed

+1408
-1787
lines changed

src/main/java/unicon/matthews/MongoConfig.java renamed to src/main/java/org/apereo/openlrw/MongoConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package unicon.matthews;
1+
package org.apereo.openlrw;
22

33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.context.annotation.Bean;

src/main/java/unicon/matthews/OpenLRW.java renamed to src/main/java/org/apereo/openlrw/OpenLRW.java

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
package unicon.matthews;
2-
3-
import java.time.LocalDateTime;
4-
import java.util.Collections;
5-
import java.util.Optional;
6-
import java.util.UUID;
7-
import java.util.concurrent.ExecutorService;
8-
import java.util.concurrent.Executors;
9-
10-
import javax.annotation.PostConstruct;
1+
package org.apereo.openlrw;
112

3+
import com.fasterxml.jackson.databind.DeserializationFeature;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
5+
import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
6+
import org.apereo.model.oneroster.Org;
7+
import org.apereo.model.oneroster.OrgType;
8+
import org.apereo.model.oneroster.Status;
9+
import org.apereo.openlrw.admin.AdminUser;
10+
import org.apereo.openlrw.admin.AdminUserConfig;
11+
import org.apereo.openlrw.admin.service.AdminUserService;
12+
import org.apereo.openlrw.oneroster.service.OrgService;
13+
import org.apereo.openlrw.tenant.Tenant;
14+
import org.apereo.openlrw.tenant.service.TenantService;
1215
import org.springframework.beans.factory.annotation.Autowired;
1316
import org.springframework.boot.SpringApplication;
1417
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -18,27 +21,22 @@
1821
import org.springframework.scheduling.annotation.EnableAsync;
1922
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
2023
import org.springframework.web.filter.CommonsRequestLoggingFilter;
21-
2224
import springfox.documentation.builders.ApiInfoBuilder;
2325
import springfox.documentation.builders.PathSelectors;
2426
import springfox.documentation.builders.RequestHandlerSelectors;
2527
import springfox.documentation.service.ApiInfo;
2628
import springfox.documentation.spi.DocumentationType;
2729
import springfox.documentation.spring.web.plugins.Docket;
2830
import springfox.documentation.swagger2.annotations.EnableSwagger2;
29-
import unicon.matthews.admin.AdminUser;
30-
import unicon.matthews.admin.AdminUserConfig;
31-
import unicon.matthews.admin.service.AdminUserService;
32-
import unicon.matthews.oneroster.Org;
33-
import unicon.matthews.oneroster.OrgType;
34-
import unicon.matthews.oneroster.Status;
35-
import unicon.matthews.oneroster.service.OrgService;
36-
import unicon.matthews.tenant.Tenant;
37-
import unicon.matthews.tenant.service.TenantService;
3831

39-
import com.fasterxml.jackson.databind.DeserializationFeature;
40-
import com.fasterxml.jackson.databind.ObjectMapper;
41-
import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
32+
import javax.annotation.PostConstruct;
33+
import java.time.Instant;
34+
import java.time.LocalDateTime;
35+
import java.util.Collections;
36+
import java.util.Optional;
37+
import java.util.UUID;
38+
import java.util.concurrent.ExecutorService;
39+
import java.util.concurrent.Executors;
4240

4341

4442
/**
@@ -88,7 +86,7 @@ public void init() {
8886
defaultTenant = tenantService.save(defaultTenant);
8987

9088
Org defaultOrg = new Org.Builder()
91-
.withDateLastModified(LocalDateTime.now())
89+
.withDateLastModified(Instant.now())
9290
.withMetadata(Collections.singletonMap(Vocabulary.TENANT, defaultTenant.getId()))
9391
.withName("DEFAULT_ORG")
9492
.withSourcedId(UUID.randomUUID().toString())

src/main/java/unicon/matthews/Vocabulary.java renamed to src/main/java/org/apereo/openlrw/Vocabulary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package unicon.matthews;
1+
package org.apereo.openlrw;
22

33
public interface Vocabulary {
44
static final String TENANT = "https://matthews/tenant";

src/main/java/unicon/matthews/admin/AdminUser.java renamed to src/main/java/org/apereo/openlrw/admin/AdminUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package unicon.matthews.admin;
1+
package org.apereo.openlrw.admin;
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/unicon/matthews/admin/AdminUserAuthenticationProvider.java renamed to src/main/java/org/apereo/openlrw/admin/AdminUserAuthenticationProvider.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package unicon.matthews.admin;
2-
3-
import java.util.Collections;
4-
import java.util.List;
1+
package org.apereo.openlrw.admin;
52

3+
import org.apereo.openlrw.admin.service.AdminUserService;
4+
import org.apereo.openlrw.oneroster.service.OrgService;
5+
import org.apereo.openlrw.security.model.UserContext;
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
88
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,9 +14,8 @@
1414
import org.springframework.stereotype.Component;
1515
import org.springframework.util.Assert;
1616

17-
import unicon.matthews.admin.service.AdminUserService;
18-
import unicon.matthews.oneroster.service.OrgService;
19-
import unicon.matthews.security.model.UserContext;
17+
import java.util.Collections;
18+
import java.util.List;
2019

2120
@Component
2221
public class AdminUserAuthenticationProvider implements AuthenticationProvider {

src/main/java/unicon/matthews/admin/AdminUserAuthenticationToken.java renamed to src/main/java/org/apereo/openlrw/admin/AdminUserAuthenticationToken.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package unicon.matthews.admin;
2-
3-
import java.util.Collection;
1+
package org.apereo.openlrw.admin;
42

53
import org.springframework.security.authentication.AbstractAuthenticationToken;
64
import org.springframework.security.core.GrantedAuthority;
75

6+
import java.util.Collection;
7+
88
public class AdminUserAuthenticationToken extends AbstractAuthenticationToken {
99

1010
private static final long serialVersionUID = 1L;

src/main/java/unicon/matthews/admin/AdminUserConfig.java renamed to src/main/java/org/apereo/openlrw/admin/AdminUserConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package unicon.matthews.admin;
1+
package org.apereo.openlrw.admin;
22

33
import org.springframework.boot.context.properties.ConfigurationProperties;
44
import org.springframework.context.annotation.Configuration;

src/main/java/unicon/matthews/admin/AdminUserProcessingFilter.java renamed to src/main/java/org/apereo/openlrw/admin/AdminUserProcessingFilter.java

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
package unicon.matthews.admin;
2-
3-
import java.io.IOException;
4-
5-
import javax.servlet.FilterChain;
6-
import javax.servlet.ServletException;
7-
import javax.servlet.http.HttpServletRequest;
8-
import javax.servlet.http.HttpServletResponse;
1+
package org.apereo.openlrw.admin;
92

3+
import com.fasterxml.jackson.databind.ObjectMapper;
104
import org.apache.commons.lang3.StringUtils;
5+
import org.apereo.openlrw.common.WebUtil;
6+
import org.apereo.openlrw.security.auth.ajax.AjaxLoginProcessingFilter;
7+
import org.apereo.openlrw.security.auth.ajax.LoginRequest;
8+
import org.apereo.openlrw.security.exception.AuthMethodNotSupportedException;
119
import org.slf4j.Logger;
1210
import org.slf4j.LoggerFactory;
1311
import org.springframework.http.HttpMethod;
@@ -19,12 +17,11 @@
1917
import org.springframework.security.web.authentication.AuthenticationFailureHandler;
2018
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
2119

22-
import unicon.matthews.common.WebUtil;
23-
import unicon.matthews.security.auth.ajax.AjaxLoginProcessingFilter;
24-
import unicon.matthews.security.auth.ajax.LoginRequest;
25-
import unicon.matthews.security.exception.AuthMethodNotSupportedException;
26-
27-
import com.fasterxml.jackson.databind.ObjectMapper;
20+
import javax.servlet.FilterChain;
21+
import javax.servlet.ServletException;
22+
import javax.servlet.http.HttpServletRequest;
23+
import javax.servlet.http.HttpServletResponse;
24+
import java.io.IOException;
2825

2926
public class AdminUserProcessingFilter extends AbstractAuthenticationProcessingFilter {
3027
private static Logger logger = LoggerFactory.getLogger(AjaxLoginProcessingFilter.class);

src/main/java/unicon/matthews/admin/endpoint/AdminUserController.java renamed to src/main/java/org/apereo/openlrw/admin/endpoint/AdminUserController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
package unicon.matthews.admin.endpoint;
1+
package org.apereo.openlrw.admin.endpoint;
22

33
import io.swagger.annotations.Api;
44
import io.swagger.annotations.ApiOperation;
5+
import org.apereo.openlrw.admin.AdminUser;
6+
import org.apereo.openlrw.admin.endpoint.input.UserDTO;
7+
import org.apereo.openlrw.admin.service.AdminUserService;
58
import org.slf4j.Logger;
69
import org.slf4j.LoggerFactory;
710
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,9 +15,6 @@
1215
import org.springframework.web.bind.annotation.RequestMapping;
1316
import org.springframework.web.bind.annotation.RequestMethod;
1417
import org.springframework.web.bind.annotation.RestController;
15-
import unicon.matthews.admin.AdminUser;
16-
import unicon.matthews.admin.endpoint.input.UserDTO;
17-
import unicon.matthews.admin.service.AdminUserService;
1818

1919
@RestController
2020
@RequestMapping("/api/adminuser")

src/main/java/unicon/matthews/admin/endpoint/input/UserDTO.java renamed to src/main/java/org/apereo/openlrw/admin/endpoint/input/UserDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package unicon.matthews.admin.endpoint.input;
1+
package org.apereo.openlrw.admin.endpoint.input;
22

33
import io.swagger.annotations.ApiModel;
44
import io.swagger.annotations.ApiModelProperty;

0 commit comments

Comments
 (0)