diff --git a/README.md b/README.md index 98559567..effbe1a0 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ To use a metric logger, you need to manually create and flush the logger. ```java -import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet; +import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger; +import software.amazon.cloudwatchlogs.emf.model.DimensionSet; class Example { public static void main(String[] args) { @@ -164,8 +164,8 @@ Example: ```java # in process -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; Configuration config = EnvironmentConfigurationProvider.getConfig(); config.setServiceName("MyApp") @@ -185,8 +185,8 @@ Example: ```java # in process -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; Configuration config = EnvironmentConfigurationProvider.getConfig(); config.setServiceType("JavaWebApp") @@ -206,8 +206,8 @@ Example: ```java # in process -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; Configuration config = EnvironmentConfigurationProvider.getConfig(); config.setLogGroupName("LogGroupName") @@ -227,8 +227,8 @@ Example: ```java # in process -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; Configuration config = EnvironmentConfigurationProvider.getConfig(); config.setLogStreamName(LogStreamName)) @@ -259,8 +259,8 @@ Example: ```java // in process -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; Configuration config = EnvironmentConfigurationProvider.getConfig(); config.setAgentEndpoint("udp://127.0.0.1:1000"); diff --git a/build.gradle b/build.gradle index 6c3b044c..9791720d 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'signing' } -group "software.amazon.awssdk" +group "software.amazon.cloudwatchlogs" allprojects { compileJava { diff --git a/canarytests/agent/src/main/java/emf/canary/ECSRunnable.java b/canarytests/agent/src/main/java/emf/canary/ECSRunnable.java index 17bba689..6c0a0cc2 100644 --- a/canarytests/agent/src/main/java/emf/canary/ECSRunnable.java +++ b/canarytests/agent/src/main/java/emf/canary/ECSRunnable.java @@ -1,10 +1,10 @@ package emf.canary; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; -import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger; +import software.amazon.cloudwatchlogs.emf.model.DimensionSet; +import software.amazon.cloudwatchlogs.emf.model.Unit; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; diff --git a/examples/lambda/src/main/java/Handler.java b/examples/lambda/src/main/java/Handler.java index bc55b1f1..2c24d653 100644 --- a/examples/lambda/src/main/java/Handler.java +++ b/examples/lambda/src/main/java/Handler.java @@ -1,8 +1,8 @@ import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit; +import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger; +import software.amazon.cloudwatchlogs.emf.model.DimensionSet; +import software.amazon.cloudwatchlogs.emf.model.Unit; import java.util.HashMap; import java.util.Map; diff --git a/src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/EMFIntegrationTestHelper.java b/src/integration-test/java/software/amazon/cloudwatchlogs/emf/EMFIntegrationTestHelper.java similarity index 54% rename from src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/EMFIntegrationTestHelper.java rename to src/integration-test/java/software/amazon/cloudwatchlogs/emf/EMFIntegrationTestHelper.java index d7bc490d..4ad9ad2e 100644 --- a/src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/EMFIntegrationTestHelper.java +++ b/src/integration-test/java/software/amazon/cloudwatchlogs/emf/EMFIntegrationTestHelper.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf; import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; import software.amazon.awssdk.services.cloudwatch.model.Datapoint; diff --git a/src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java b/src/integration-test/java/software/amazon/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java similarity index 81% rename from src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java rename to src/integration-test/java/software/amazon/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java index 4f60bbf1..7899fa31 100644 --- a/src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java +++ b/src/integration-test/java/software/amazon/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf; import static org.junit.Assert.assertTrue; @@ -13,12 +29,12 @@ import software.amazon.awssdk.services.cloudwatch.model.Dimension; import software.amazon.awssdk.services.cloudwatch.model.GetMetricStatisticsRequest; import software.amazon.awssdk.services.cloudwatch.model.Statistic; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.EnvironmentProvider; -import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider; +import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger; +import software.amazon.cloudwatchlogs.emf.model.DimensionSet; +import software.amazon.cloudwatchlogs.emf.model.Unit; public class MetricsLoggerIntegrationTest { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/Constants.java b/src/main/java/software/amazon/cloudwatchlogs/emf/Constants.java similarity index 92% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/Constants.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/Constants.java index 009c7941..443e651d 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/Constants.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/Constants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf; +package software.amazon.cloudwatchlogs.emf; public class Constants { public static final int DEFAULT_AGENT_PORT = 25888; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/Configuration.java b/src/main/java/software/amazon/cloudwatchlogs/emf/config/Configuration.java similarity index 92% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/Configuration.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/config/Configuration.java index 6d0cf8d3..1584c5d7 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/Configuration.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/config/Configuration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.config; +package software.amazon.cloudwatchlogs.emf.config; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.Setter; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments; -import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils; +import software.amazon.cloudwatchlogs.emf.environment.Environments; +import software.amazon.cloudwatchlogs.emf.util.StringUtils; /** Configuration for EMF logger. */ @AllArgsConstructor diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationKeys.java b/src/main/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationKeys.java similarity index 94% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationKeys.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationKeys.java index f207a0f7..97e5a50a 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationKeys.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationKeys.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.config; +package software.amazon.cloudwatchlogs.emf.config; /** The key of configurations used by EMF logger. */ public class ConfigurationKeys { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java b/src/main/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java similarity index 90% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java index 017340d2..7f2c4783 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.config; +package software.amazon.cloudwatchlogs.emf.config; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments; -import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils; +import software.amazon.cloudwatchlogs.emf.environment.Environments; +import software.amazon.cloudwatchlogs.emf.util.StringUtils; /** Loads configuration from environment variables. */ public class EnvironmentConfigurationProvider { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/SystemWrapper.java b/src/main/java/software/amazon/cloudwatchlogs/emf/config/SystemWrapper.java similarity index 92% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/SystemWrapper.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/config/SystemWrapper.java index ef932772..91ef3069 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/SystemWrapper.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/config/SystemWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.config; +package software.amazon.cloudwatchlogs.emf.config; /** A wrapper class that can be used to mock 'System.getenv' with PowerMock. */ public class SystemWrapper { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java similarity index 80% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java index 08bcbc73..d642c1c1 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.AgentSink; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.Endpoint; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.SocketClientFactory; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.sinks.AgentSink; +import software.amazon.cloudwatchlogs.emf.sinks.Endpoint; +import software.amazon.cloudwatchlogs.emf.sinks.ISink; +import software.amazon.cloudwatchlogs.emf.sinks.SocketClientFactory; @Slf4j public abstract class AgentBasedEnvironment implements Environment { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/DefaultEnvironment.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/DefaultEnvironment.java similarity index 81% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/DefaultEnvironment.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/DefaultEnvironment.java index bec68cb4..e3846ce0 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/DefaultEnvironment.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/DefaultEnvironment.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; @Slf4j class DefaultEnvironment extends AgentBasedEnvironment { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EC2Environment.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/EC2Environment.java similarity index 88% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EC2Environment.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/EC2Environment.java index 6185240a..6a0f3252 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EC2Environment.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/EC2Environment.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.net.URI; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.exception.EMFClientException; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.exception.EMFClientException; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; @Slf4j class EC2Environment extends AgentBasedEnvironment { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ECSEnvironment.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/ECSEnvironment.java similarity index 91% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ECSEnvironment.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/ECSEnvironment.java index 786b10f0..afd75810 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ECSEnvironment.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/ECSEnvironment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.MapperFeature; @@ -25,11 +25,11 @@ import java.util.Map; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.SystemWrapper; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.util.StringUtils; @Slf4j class ECSEnvironment extends AgentBasedEnvironment { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environment.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environment.java similarity index 88% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environment.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environment.java index 59650b81..37c68930 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environment.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environment.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.sinks.ISink; /** A runtime environment (e.g. Lambda, EKS, ECS, EC2). */ public interface Environment { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EnvironmentProvider.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/EnvironmentProvider.java similarity index 95% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EnvironmentProvider.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/EnvironmentProvider.java index 72380a67..9b105256 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EnvironmentProvider.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/EnvironmentProvider.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import java.util.Optional; import java.util.concurrent.CompletableFuture; import lombok.AllArgsConstructor; import lombok.Data; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; /** A provider that will detect the environment. */ public class EnvironmentProvider { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environments.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environments.java similarity index 91% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environments.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environments.java index bef1c339..24d7b956 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environments.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environments.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; public enum Environments { Local, diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LambdaEnvironment.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/LambdaEnvironment.java similarity index 88% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LambdaEnvironment.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/LambdaEnvironment.java index 03d6d3f3..269500fe 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LambdaEnvironment.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/LambdaEnvironment.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import java.util.Optional; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ConsoleSink; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink; +import software.amazon.cloudwatchlogs.emf.config.SystemWrapper; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.sinks.ConsoleSink; +import software.amazon.cloudwatchlogs.emf.sinks.ISink; /** An environment stands for the AWS Lambda environment. */ class LambdaEnvironment implements Environment { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LocalEnvironment.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/LocalEnvironment.java similarity index 81% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LocalEnvironment.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/LocalEnvironment.java index ec059f1e..b0ab7f35 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LocalEnvironment.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/LocalEnvironment.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ConsoleSink; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.sinks.ConsoleSink; +import software.amazon.cloudwatchlogs.emf.sinks.ISink; @Slf4j class LocalEnvironment implements Environment { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ResourceFetcher.java b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/ResourceFetcher.java similarity index 93% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ResourceFetcher.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/environment/ResourceFetcher.java index 8eb8c38c..f1faa813 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ResourceFetcher.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/environment/ResourceFetcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +package software.amazon.cloudwatchlogs.emf.environment; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -24,9 +24,9 @@ import java.net.Proxy; import java.net.URI; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.exception.EMFClientException; -import software.amazon.awssdk.services.cloudwatchlogs.emf.util.IOUtils; -import software.amazon.awssdk.services.cloudwatchlogs.emf.util.Jackson; +import software.amazon.cloudwatchlogs.emf.exception.EMFClientException; +import software.amazon.cloudwatchlogs.emf.util.IOUtils; +import software.amazon.cloudwatchlogs.emf.util.Jackson; @Slf4j class ResourceFetcher { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/exception/EMFClientException.java b/src/main/java/software/amazon/cloudwatchlogs/emf/exception/EMFClientException.java similarity index 92% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/exception/EMFClientException.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/exception/EMFClientException.java index c40b92bc..9cfe3882 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/exception/EMFClientException.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/exception/EMFClientException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.exception; +package software.amazon.cloudwatchlogs.emf.exception; public class EMFClientException extends RuntimeException { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/logger/MetricsLogger.java b/src/main/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLogger.java similarity index 92% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/logger/MetricsLogger.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLogger.java index ebed68eb..9f6a270e 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/logger/MetricsLogger.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLogger.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.logger; +package software.amazon.cloudwatchlogs.emf.logger; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environment; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.EnvironmentProvider; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink; +import software.amazon.cloudwatchlogs.emf.environment.Environment; +import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider; +import software.amazon.cloudwatchlogs.emf.model.DimensionSet; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.model.Unit; +import software.amazon.cloudwatchlogs.emf.sinks.ISink; /** * An metrics logger. Use this interface to publish logs to CloudWatch Logs and extract metrics to diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/DimensionSet.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/DimensionSet.java similarity index 98% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/DimensionSet.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/DimensionSet.java index 53a8decb..b55e833b 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/DimensionSet.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/DimensionSet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/EmptyMetricsFilter.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/EmptyMetricsFilter.java similarity index 96% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/EmptyMetricsFilter.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/EmptyMetricsFilter.java index 46ae7658..d10894a2 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/EmptyMetricsFilter.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/EmptyMetricsFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/Metadata.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/Metadata.java similarity index 91% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/Metadata.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/Metadata.java index 572adfb3..d3f6c8ec 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/Metadata.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/Metadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonFormat; @@ -28,8 +28,8 @@ import java.util.Map; import lombok.Getter; import lombok.Setter; -import software.amazon.awssdk.services.cloudwatchlogs.emf.serializers.InstantDeserializer; -import software.amazon.awssdk.services.cloudwatchlogs.emf.serializers.InstantSerializer; +import software.amazon.cloudwatchlogs.emf.serializers.InstantDeserializer; +import software.amazon.cloudwatchlogs.emf.serializers.InstantSerializer; /** Represents the MetaData part of the EMF schema. */ class Metadata { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDefinition.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDefinition.java similarity index 85% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDefinition.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDefinition.java index 9d04aee3..b4992acf 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDefinition.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -23,8 +23,8 @@ import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import software.amazon.awssdk.services.cloudwatchlogs.emf.serializers.UnitDeserializer; -import software.amazon.awssdk.services.cloudwatchlogs.emf.serializers.UnitSerializer; +import software.amazon.cloudwatchlogs.emf.serializers.UnitDeserializer; +import software.amazon.cloudwatchlogs.emf.serializers.UnitSerializer; /** Represents the MetricDefinition of the EMF schema. */ @AllArgsConstructor diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDirective.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDirective.java similarity index 97% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDirective.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDirective.java index b53e6314..a43d6b3a 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDirective.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDirective.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricsContext.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricsContext.java similarity index 99% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricsContext.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricsContext.java index a75c5199..1779d0f0 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricsContext.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricsContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import com.fasterxml.jackson.core.JsonProcessingException; import java.util.Arrays; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/RootNode.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/RootNode.java similarity index 98% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/RootNode.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/RootNode.java index 99db3a39..c9d33885 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/RootNode.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/RootNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonFilter; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/Unit.java b/src/main/java/software/amazon/cloudwatchlogs/emf/model/Unit.java similarity index 97% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/Unit.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/model/Unit.java index 41561b27..3ebc01bf 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/Unit.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/model/Unit.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +package software.amazon.cloudwatchlogs.emf.model; import java.util.stream.Stream; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/InstantDeserializer.java b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/InstantDeserializer.java similarity index 94% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/InstantDeserializer.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/serializers/InstantDeserializer.java index 94e10123..a929f48b 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/InstantDeserializer.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/InstantDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.serializers; +package software.amazon.cloudwatchlogs.emf.serializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/InstantSerializer.java b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/InstantSerializer.java similarity index 95% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/InstantSerializer.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/serializers/InstantSerializer.java index 2057f994..4f02f5dc 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/InstantSerializer.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/InstantSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.serializers; +package software.amazon.cloudwatchlogs.emf.serializers; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/UnitDeserializer.java b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/UnitDeserializer.java similarity index 90% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/UnitDeserializer.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/serializers/UnitDeserializer.java index f5382d2d..0a54cbdb 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/UnitDeserializer.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/UnitDeserializer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.serializers; +package software.amazon.cloudwatchlogs.emf.serializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit; +import software.amazon.cloudwatchlogs.emf.model.Unit; /** JSON deserializer for StandardUnit type. */ public class UnitDeserializer extends StdDeserializer { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/UnitSerializer.java b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/UnitSerializer.java similarity index 90% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/UnitSerializer.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/serializers/UnitSerializer.java index 2247a41a..99afffac 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/serializers/UnitSerializer.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/serializers/UnitSerializer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.serializers; +package software.amazon.cloudwatchlogs.emf.serializers; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit; +import software.amazon.cloudwatchlogs.emf.model.Unit; /** JSON serializer for Unit type. */ public class UnitSerializer extends StdSerializer { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/AgentSink.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/AgentSink.java similarity index 89% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/AgentSink.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/AgentSink.java index 507691ac..4572492a 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/AgentSink.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/AgentSink.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.util.StringUtils; /** An sink connecting to CloudWatch Agent. */ @Slf4j diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ConsoleSink.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/ConsoleSink.java similarity index 89% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ConsoleSink.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/ConsoleSink.java index d7dfeacc..9b5a4e9d 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ConsoleSink.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/ConsoleSink.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; import com.fasterxml.jackson.core.JsonProcessingException; import lombok.Builder; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; /** Write log items to the console in JSON format. */ @Slf4j diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/Endpoint.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/Endpoint.java similarity index 97% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/Endpoint.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/Endpoint.java index 6d73dee5..32c11083 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/Endpoint.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/Endpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ISink.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/ISink.java similarity index 85% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ISink.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/ISink.java index 5b1f5173..dd78fa28 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ISink.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/ISink.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; /** Interface for sinking log items to CloudWatch. */ public interface ISink { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/MultiSink.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/MultiSink.java similarity index 88% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/MultiSink.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/MultiSink.java index 603ccbf6..b40b6ae4 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/MultiSink.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/MultiSink.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; import java.util.List; import lombok.Builder; import lombok.NonNull; import lombok.Singular; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; /** * Convenience helper for sinking the same log items to multiple destinations. diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/Protocol.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/Protocol.java similarity index 93% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/Protocol.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/Protocol.java index 80143fae..fed49fc8 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/Protocol.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/Protocol.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; public enum Protocol { TCP, diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SocketClient.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/SocketClient.java similarity index 93% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SocketClient.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/SocketClient.java index 96d62e37..4222b97a 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SocketClient.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/SocketClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; import java.io.Closeable; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SocketClientFactory.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/SocketClientFactory.java similarity index 93% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SocketClientFactory.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/SocketClientFactory.java index 3fe67fe6..dacc205b 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SocketClientFactory.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/SocketClientFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; public class SocketClientFactory { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/TCPClient.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClient.java similarity index 97% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/TCPClient.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClient.java index b73616e6..225a360e 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/TCPClient.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/UDPClient.java b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/UDPClient.java similarity index 97% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/UDPClient.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/sinks/UDPClient.java index 33b59818..90c9b8a9 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/UDPClient.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/sinks/UDPClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +package software.amazon.cloudwatchlogs.emf.sinks; import java.io.IOException; import java.net.DatagramPacket; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/IOUtils.java b/src/main/java/software/amazon/cloudwatchlogs/emf/util/IOUtils.java similarity index 97% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/IOUtils.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/util/IOUtils.java index 6041d1dc..3bfe0e6f 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/IOUtils.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/util/IOUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.util; +package software.amazon.cloudwatchlogs.emf.util; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/Jackson.java b/src/main/java/software/amazon/cloudwatchlogs/emf/util/Jackson.java similarity index 93% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/Jackson.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/util/Jackson.java index c9923867..369b608f 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/Jackson.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/util/Jackson.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.util; +package software.amazon.cloudwatchlogs.emf.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import software.amazon.awssdk.services.cloudwatchlogs.emf.exception.EMFClientException; +import software.amazon.cloudwatchlogs.emf.exception.EMFClientException; public class Jackson { diff --git a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/StringUtils.java b/src/main/java/software/amazon/cloudwatchlogs/emf/util/StringUtils.java similarity index 92% rename from src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/StringUtils.java rename to src/main/java/software/amazon/cloudwatchlogs/emf/util/StringUtils.java index e1573221..1465135c 100644 --- a/src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/StringUtils.java +++ b/src/main/java/software/amazon/cloudwatchlogs/emf/util/StringUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package software.amazon.awssdk.services.cloudwatchlogs.emf.util; +package software.amazon.cloudwatchlogs.emf.util; public class StringUtils { diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SinkShunt.java b/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SinkShunt.java deleted file mode 100644 index a608b8cf..00000000 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/SinkShunt.java +++ /dev/null @@ -1,17 +0,0 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; - -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; - -public class SinkShunt implements ISink { - - private MetricsContext context; - - @Override - public void accept(MetricsContext context) { - this.context = context; - } - - public MetricsContext getContext() { - return context; - } -} diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/StringUtilsTest.java b/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/StringUtilsTest.java deleted file mode 100644 index a4935910..00000000 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/StringUtilsTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.util; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -public class StringUtilsTest { - - @Test - public void testIsNullOrEmpty() { - assertTrue(StringUtils.isNullOrEmpty(null)); - assertTrue(StringUtils.isNullOrEmpty("")); - assertFalse(StringUtils.isNullOrEmpty("test")); - } -} diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationTest.java similarity index 77% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationTest.java index 3b87d684..05ee4470 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.config; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -6,7 +22,7 @@ import com.github.javafaker.Faker; import org.junit.Before; import org.junit.Test; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments; +import software.amazon.cloudwatchlogs.emf.environment.Environments; public class ConfigurationTest { private Configuration config; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProviderTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProviderTest.java similarity index 61% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProviderTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProviderTest.java index b726f5c9..ac3f2b95 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProviderTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProviderTest.java @@ -1,13 +1,30 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.config; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.config; import static org.junit.Assert.*; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments; +import software.amazon.cloudwatchlogs.emf.environment.Environments; @RunWith(PowerMockRunner.class) @PrepareForTest({SystemWrapper.class}) @@ -30,7 +47,7 @@ public void getGetConfig() { assertEquals(config.getLogGroupName().get(), "TestLogGroup"); assertEquals(config.getLogStreamName().get(), "TestLogStream"); assertEquals(config.getAgentEndpoint().get(), "Endpoint"); - assertEquals(config.getEnvironmentOverride(), Environments.Agent); + Assert.assertEquals(config.getEnvironmentOverride(), Environments.Agent); } private void putEnv(String key, String value) { diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/DefaultEnvironmentTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/DefaultEnvironmentTest.java similarity index 76% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/DefaultEnvironmentTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/environment/DefaultEnvironmentTest.java index b03f7d1e..ecbd6c66 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/DefaultEnvironmentTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/DefaultEnvironmentTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.environment; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -7,7 +23,7 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.Configuration; public class DefaultEnvironmentTest { private DefaultEnvironment environment; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EC2EnvironmentTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/EC2EnvironmentTest.java similarity index 76% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EC2EnvironmentTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/environment/EC2EnvironmentTest.java index 8bbde47b..08ca0b6b 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EC2EnvironmentTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/EC2EnvironmentTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.environment; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; @@ -12,11 +28,11 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper; -import software.amazon.awssdk.services.cloudwatchlogs.emf.exception.EMFClientException; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.SystemWrapper; +import software.amazon.cloudwatchlogs.emf.exception.EMFClientException; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; @RunWith(PowerMockRunner.class) @PrepareForTest({SystemWrapper.class}) diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ECSEnvironmentTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/ECSEnvironmentTest.java similarity index 86% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ECSEnvironmentTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/environment/ECSEnvironmentTest.java index 907083b6..8c014882 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ECSEnvironmentTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/ECSEnvironmentTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.environment; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; @@ -18,10 +34,10 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.SystemWrapper; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; @RunWith(PowerMockRunner.class) @PrepareForTest({SystemWrapper.class}) diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EnvironmentProviderTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/EnvironmentProviderTest.java similarity index 84% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EnvironmentProviderTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/environment/EnvironmentProviderTest.java index 9a41517f..1b773310 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EnvironmentProviderTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/EnvironmentProviderTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.environment; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -13,9 +29,9 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider; +import software.amazon.cloudwatchlogs.emf.config.SystemWrapper; @RunWith(PowerMockRunner.class) @PrepareForTest({SystemWrapper.class, EnvironmentConfigurationProvider.class}) diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LambdaEnvironmentTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/LambdaEnvironmentTest.java similarity index 77% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LambdaEnvironmentTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/environment/LambdaEnvironmentTest.java index 21973a1d..9d7cf73f 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LambdaEnvironmentTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/LambdaEnvironmentTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.environment; import static org.junit.Assert.*; import static org.mockito.Mockito.when; @@ -10,9 +26,9 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ConsoleSink; +import software.amazon.cloudwatchlogs.emf.config.SystemWrapper; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.sinks.ConsoleSink; @RunWith(PowerMockRunner.class) @PrepareForTest({SystemWrapper.class}) diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LocalEnvironmentTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/LocalEnvironmentTest.java similarity index 71% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LocalEnvironmentTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/environment/LocalEnvironmentTest.java index 04a5ce56..22a8407f 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LocalEnvironmentTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/LocalEnvironmentTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.environment; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; @@ -8,9 +24,9 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; -import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants; -import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ConsoleSink; +import software.amazon.cloudwatchlogs.emf.Constants; +import software.amazon.cloudwatchlogs.emf.config.Configuration; +import software.amazon.cloudwatchlogs.emf.sinks.ConsoleSink; public class LocalEnvironmentTest { private LocalEnvironment environment; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ResourceFetcherTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/ResourceFetcherTest.java similarity index 84% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ResourceFetcherTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/environment/ResourceFetcherTest.java index c2b4aa9b..23aae5bb 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ResourceFetcherTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/environment/ResourceFetcherTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.environment; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.environment; import static com.github.tomakehurst.wiremock.client.WireMock.*; import static org.junit.Assert.*; @@ -14,7 +30,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import software.amazon.awssdk.services.cloudwatchlogs.emf.exception.EMFClientException; +import software.amazon.cloudwatchlogs.emf.exception.EMFClientException; public class ResourceFetcherTest { private ResourceFetcher fetcher; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/logger/MetricsLoggerTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLoggerTest.java similarity index 75% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/logger/MetricsLoggerTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLoggerTest.java index b073bc65..248c4b67 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/logger/MetricsLoggerTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/logger/MetricsLoggerTest.java @@ -1,17 +1,34 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.logger; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.logger; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.CompletableFuture; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environment; -import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.EnvironmentProvider; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; -import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.SinkShunt; +import software.amazon.cloudwatchlogs.emf.environment.Environment; +import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider; +import software.amazon.cloudwatchlogs.emf.model.DimensionSet; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.sinks.SinkShunt; public class MetricsLoggerTest { private MetricsLogger logger; @@ -38,7 +55,7 @@ public void testPutProperty() { logger.putProperty(propertyName, propertyValue); logger.flush(); - assertEquals(sink.getContext().getProperty(propertyName), propertyValue); + Assert.assertEquals(sink.getContext().getProperty(propertyName), propertyValue); } @Test @@ -48,8 +65,8 @@ public void testPutDimension() { logger.putDimensions(DimensionSet.of(dimensionName, dimensionValue)); logger.flush(); - assertEquals(sink.getContext().getDimensions().size(), 1); - assertEquals( + Assert.assertEquals(sink.getContext().getDimensions().size(), 1); + Assert.assertEquals( sink.getContext().getDimensions().get(0).getDimensionValue(dimensionName), dimensionValue); } @@ -68,8 +85,8 @@ public void testOverrideDefaultDimensions() { logger.setDimensions(DimensionSet.of(dimensionName, dimensionValue)); logger.flush(); - assertEquals(sink.getContext().getDimensions().size(), 1); - assertEquals( + Assert.assertEquals(sink.getContext().getDimensions().size(), 1); + Assert.assertEquals( sink.getContext().getDimensions().get(0).getDimensionValue(defaultDimName), null); } @@ -82,9 +99,9 @@ public void testOverridePreviousDimensions() { logger.setDimensions(DimensionSet.of(dimensionName, dimensionValue)); logger.flush(); - assertEquals(sink.getContext().getDimensions().size(), 1); - assertEquals(sink.getContext().getDimensions().get(0).getDimensionKeys().size(), 1); - assertEquals( + Assert.assertEquals(sink.getContext().getDimensions().size(), 1); + Assert.assertEquals(sink.getContext().getDimensions().get(0).getDimensionKeys().size(), 1); + Assert.assertEquals( sink.getContext().getDimensions().get(0).getDimensionValue(dimensionName), dimensionValue); } @@ -96,7 +113,7 @@ public void testSetNamespace() { logger.setNamespace(namespace); logger.flush(); - assertEquals(sink.getContext().getNamespace(), namespace); + Assert.assertEquals(sink.getContext().getNamespace(), namespace); } @Test diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetadataTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetadataTest.java similarity index 72% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetadataTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/model/MetadataTest.java index 8ef408bb..3d1c3c1e 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetadataTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetadataTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.model; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDefinitionTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDefinitionTest.java similarity index 62% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDefinitionTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDefinitionTest.java index 86b7a98a..a131fc4f 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDefinitionTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDefinitionTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.model; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDirectiveTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java similarity index 83% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDirectiveTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java index 3f96243b..d8480d88 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/MetricDirectiveTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.model; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/RootNodeTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/model/RootNodeTest.java similarity index 84% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/RootNodeTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/model/RootNodeTest.java index 2ff93bb7..98ca9736 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/model/RootNodeTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/model/RootNodeTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.model; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.model; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/AgentSinkTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/AgentSinkTest.java similarity index 79% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/AgentSinkTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/sinks/AgentSinkTest.java index ffdc5173..51ba7868 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/AgentSinkTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/AgentSinkTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.sinks; import static junit.framework.TestCase.*; import static org.mockito.ArgumentMatchers.any; @@ -11,7 +27,7 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext; +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; @SuppressWarnings("unchecked") public class AgentSinkTest { diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/EndpointTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/EndpointTest.java similarity index 57% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/EndpointTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/sinks/EndpointTest.java index e18df1b1..62af645e 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/EndpointTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/EndpointTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.sinks; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ProtocolTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/ProtocolTest.java similarity index 55% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ProtocolTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/sinks/ProtocolTest.java index 1bfc8e8f..d694c0e4 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/ProtocolTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/ProtocolTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.sinks; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/SinkShunt.java b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/SinkShunt.java new file mode 100644 index 00000000..ea39e990 --- /dev/null +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/SinkShunt.java @@ -0,0 +1,33 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.sinks; + +import software.amazon.cloudwatchlogs.emf.model.MetricsContext; + +public class SinkShunt implements ISink { + + private MetricsContext context; + + @Override + public void accept(MetricsContext context) { + this.context = context; + } + + public MetricsContext getContext() { + return context; + } +} diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/TCPClientTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClientTest.java similarity index 58% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/TCPClientTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClientTest.java index e2e7477c..ccbf4a44 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/sinks/TCPClientTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClientTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.sinks; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.sinks; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; diff --git a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/IOUtilsTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/util/IOUtilsTest.java similarity index 62% rename from src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/IOUtilsTest.java rename to src/test/java/software/amazon/cloudwatchlogs/emf/util/IOUtilsTest.java index f7c9eafb..8b6170c0 100644 --- a/src/test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/util/IOUtilsTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/util/IOUtilsTest.java @@ -1,4 +1,20 @@ -package software.amazon.awssdk.services.cloudwatchlogs.emf.util; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.util; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/software/amazon/cloudwatchlogs/emf/util/StringUtilsTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/util/StringUtilsTest.java new file mode 100644 index 00000000..3fb5076d --- /dev/null +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/util/StringUtilsTest.java @@ -0,0 +1,32 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * 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 software.amazon.cloudwatchlogs.emf.util; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class StringUtilsTest { + + @Test + public void testIsNullOrEmpty() { + assertTrue(StringUtils.isNullOrEmpty(null)); + assertTrue(StringUtils.isNullOrEmpty("")); + assertFalse(StringUtils.isNullOrEmpty("test")); + } +}