From c8ba9dbb536aa90326cc482ae990fb732a44d213 Mon Sep 17 00:00:00 2001 From: Rostislav_Dublin <Rostislav_Dublin@epam.com> Date: Thu, 9 Dec 2021 11:50:50 +0300 Subject: [PATCH] author labels removed. EPAM license added --- .../oqm/MqOqmConfigurationProperties.java | 21 ++++++++++++++----- .../oqm/MqTenantOqmDestinationResolver.java | 20 ++++++++++++++---- .../oqm/OqmConfigurationProperties.java | 21 ++++++++++++++----- .../oqm/PsTenantOqmDestinationResolver.java | 19 ++++++++++++++--- .../gcp/pubsub/di/OqmSignatureService.java | 21 ++++++++++++++----- 5 files changed, 80 insertions(+), 22 deletions(-) diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java index b367df2cd..f87188a27 100644 --- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java +++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java @@ -1,3 +1,19 @@ +/* + Copyright 2020 Google LLC + Copyright 2020 EPAM Systems, Inc + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ package org.opengroup.osdu.notification.provider.gcp.mappers.oqm; import lombok.Getter; @@ -6,11 +22,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; -/** - * @author Rostislav_Dublin - * @since 28.11.2021 - */ - @Configuration @ConditionalOnProperty(name = "oqmDriver", havingValue = "rabbitmq") @ConfigurationProperties(prefix = "oqm.rabbitmq") diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqTenantOqmDestinationResolver.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqTenantOqmDestinationResolver.java index bce450ee0..c8da3f492 100644 --- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqTenantOqmDestinationResolver.java +++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqTenantOqmDestinationResolver.java @@ -1,4 +1,19 @@ -package org.opengroup.osdu.notification.provider.gcp.mappers.oqm; +/* + Copyright 2020 Google LLC + Copyright 2020 EPAM Systems, Inc + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */package org.opengroup.osdu.notification.provider.gcp.mappers.oqm; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.http.client.Client; @@ -30,9 +45,6 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_SING /** * For RabbitMQ. Tenant Based OQM destination resolver - * - * @author Rostislav_Dublin - * @since 09.11.2021 */ @Component @Scope(SCOPE_SINGLETON) diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/OqmConfigurationProperties.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/OqmConfigurationProperties.java index 3167c7f08..f062ae3ee 100644 --- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/OqmConfigurationProperties.java +++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/OqmConfigurationProperties.java @@ -1,3 +1,19 @@ +/* + Copyright 2020 Google LLC + Copyright 2020 EPAM Systems, Inc + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ package org.opengroup.osdu.notification.provider.gcp.mappers.oqm; import lombok.Getter; @@ -6,11 +22,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; -/** - * @author Rostislav_Dublin - * @since 28.11.2021 - */ - @Configuration @ConditionalOnProperty(name = "oqmDriver") @ConfigurationProperties(prefix = "oqm") diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/PsTenantOqmDestinationResolver.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/PsTenantOqmDestinationResolver.java index 5c7293412..2ddca9beb 100644 --- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/PsTenantOqmDestinationResolver.java +++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/PsTenantOqmDestinationResolver.java @@ -1,3 +1,19 @@ +/* + Copyright 2020 Google LLC + Copyright 2020 EPAM Systems, Inc + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ package org.opengroup.osdu.notification.provider.gcp.mappers.oqm; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; @@ -25,9 +41,6 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_SING /** * For GCP PubSub. Tenant Based OQM destination resolver - * - * @author Rostislav_Dublin - * @since 09.11.2021 */ @Component @Scope(SCOPE_SINGLETON) diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java index 0578733c9..28e65f7be 100644 --- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java +++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java @@ -1,3 +1,19 @@ +/* + Copyright 2020 Google LLC + Copyright 2020 EPAM Systems, Inc + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ package org.opengroup.osdu.notification.provider.gcp.pubsub.di; import lombok.extern.slf4j.Slf4j; @@ -5,17 +21,12 @@ import org.opengroup.osdu.core.common.cryptographic.SignatureService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Scope; -import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_SINGLETON; -/** - * @author Rostislav_Dublin - * @since 17.11.2021 - */ @Component @Scope(SCOPE_SINGLETON) @Primary -- GitLab