Merge pull request #17 from johnjstuart/main

Update brand to BNY
BNYMellon · Jun 28, 2024 · 516dff4 · 516dff4
2 parents 7804ff8 + 5531006
commit 516dff4
Show file tree

Hide file tree

Showing 191 changed files with 615 additions and 644 deletions.
diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD
@@ -1,9 +1,9 @@
-Thank you for visiting BNY Mellon's GitHub.
+Thank you for visiting BNY's GitHub.
 
 We currently do not accept external code contributions. 
 
 We appreciate any potential issues or concerns reported by the community, and may elect to address them at our sole discretion.
 
 Thank you for your interest!
 
-BNY Mellon
+BNY
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.training.spring.boot</groupId>
+    <groupId>bny.training.spring.boot</groupId>
     <artifactId>parent</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>

diff --git a/spring-boot-with-admin/admin/pom.xml b/spring-boot-with-admin/admin/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.training.spring.boot</groupId>
+    <groupId>bny.training.spring.boot</groupId>
     <artifactId>admin</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>

diff --git a/...oot/admin/SpringBootAdminApplication.java → ...oot/admin/SpringBootAdminApplication.java b/...oot/admin/SpringBootAdminApplication.java → ...oot/admin/SpringBootAdminApplication.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.admin;
+package bny.training.spring.boot.admin;
 
-import bnymellon.training.spring.boot.admin.config.SecurityConfiguration;
+import bny.training.spring.boot.admin.config.SecurityConfiguration;
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

diff --git a/...t/admin/config/SecurityConfiguration.java → ...t/admin/config/SecurityConfiguration.java b/...t/admin/config/SecurityConfiguration.java → ...t/admin/config/SecurityConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.admin.config;
+package bny.training.spring.boot.admin.config;
 
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;

diff --git a/...dmin/SpringBootAdminApplicationTests.java → ...dmin/SpringBootAdminApplicationTests.java b/...dmin/SpringBootAdminApplicationTests.java → ...dmin/SpringBootAdminApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.admin;
+package bny.training.spring.boot.admin;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/spring-boot-with-admin/notification/pom.xml b/spring-boot-with-admin/notification/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-	<groupId>bnymellon.training.spring.boot</groupId>
+	<groupId>bny.training.spring.boot</groupId>
 	<artifactId>notification</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>

diff --git a/...notification/NotificationApplication.java → ...notification/NotificationApplication.java b/...notification/NotificationApplication.java → ...notification/NotificationApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification;
+package bny.training.spring.boot.notification;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages = "bnymellon.training.spring.boot")
+@SpringBootApplication(scanBasePackages = "bny.training.spring.boot")
 public class NotificationApplication {
 
     public static void main(String[] args) {

diff --git a/...n/controller/NotificationAPIContract.java → ...n/controller/NotificationAPIContract.java b/...n/controller/NotificationAPIContract.java → ...n/controller/NotificationAPIContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.controller;
+package bny.training.spring.boot.notification.controller;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.model.Todo;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/...ntroller/NotificationAPIContractImpl.java → ...ntroller/NotificationAPIContractImpl.java b/...ntroller/NotificationAPIContractImpl.java → ...ntroller/NotificationAPIContractImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.controller;
+package bny.training.spring.boot.notification.controller;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.service.NotificationService;
+import bny.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.service.NotificationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;

diff --git a/.../spring/boot/notification/model/Todo.java → .../spring/boot/notification/model/Todo.java b/.../spring/boot/notification/model/Todo.java → .../spring/boot/notification/model/Todo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model;
+package bny.training.spring.boot.notification.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...notification/model/response/Metadata.java → ...notification/model/response/Metadata.java b/...notification/model/response/Metadata.java → ...notification/model/response/Metadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...t/notification/model/response/Status.java → ...t/notification/model/response/Status.java b/...t/notification/model/response/Status.java → ...t/notification/model/response/Status.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...odel/response/TodoCollectionResponse.java → ...odel/response/TodoCollectionResponse.java b/...odel/response/TodoCollectionResponse.java → ...odel/response/TodoCollectionResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.model.Todo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;

diff --git a/...fication/model/response/TodoResponse.java → ...fication/model/response/TodoResponse.java b/...fication/model/response/TodoResponse.java → ...fication/model/response/TodoResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
 public interface TodoResponse {
 }
diff --git a/...fication/service/NotificationService.java → ...fication/service/NotificationService.java b/...fication/service/NotificationService.java → ...fication/service/NotificationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.service;
+package bny.training.spring.boot.notification.service;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.model.Todo;
 import reactor.core.publisher.Flux;
 
 import java.util.List;

diff --git a/...tion/service/NotificationServiceImpl.java → ...tion/service/NotificationServiceImpl.java b/...tion/service/NotificationServiceImpl.java → ...tion/service/NotificationServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.service;
+package bny.training.spring.boot.notification.service;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.Todo;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;

diff --git a/...ntroller/NotificationAPIContractTest.java → ...ntroller/NotificationAPIContractTest.java b/...ntroller/NotificationAPIContractTest.java → ...ntroller/NotificationAPIContractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.controller;
+package bny.training.spring.boot.notification.controller;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.service.NotificationService;
+import bny.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.service.NotificationService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...tion/service/NotificationServiceTest.java → ...tion/service/NotificationServiceTest.java b/...tion/service/NotificationServiceTest.java → ...tion/service/NotificationServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.service;
+package bny.training.spring.boot.notification.service;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.Todo;
 import org.apache.http.client.ResponseHandler;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -27,7 +27,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Flux;
@@ -36,7 +35,6 @@
 
 import java.time.Duration;
 import java.util.List;
-import java.util.function.Function;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;

diff --git a/spring-boot-with-admin/pom.xml b/spring-boot-with-admin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.training.spring.boot</groupId>
+    <groupId>bny.training.spring.boot</groupId>
     <artifactId>spring-boot-with-admin</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>

diff --git a/spring-boot-with-admin/registry/pom.xml b/spring-boot-with-admin/registry/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-	<groupId>bnymellon.training.spring.boot</groupId>
+	<groupId>bny.training.spring.boot</groupId>
 	<artifactId>registry</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>

diff --git a/...ng/boot/registry/RegistryApplication.java → ...ng/boot/registry/RegistryApplication.java b/...ng/boot/registry/RegistryApplication.java → ...ng/boot/registry/RegistryApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.registry;
+package bny.training.spring.boot.registry;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;