Redo Package (Azure#34169)

mrm9084 · web-flow · commit fb8215a48f93 · 2023-03-22T15:38:08.000-07:00
diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/src/main/java/com/azure/spring/cloud/feature/manager/FeatureHandler.java b/sdk/spring/spring-cloud-azure-feature-management-web/src/main/java/com/azure/spring/cloud/feature/manager/FeatureHandler.java
@@ -15,6 +15,8 @@
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 
+import com.azure.spring.cloud.feature.management.FeatureManager;
+
 import reactor.core.publisher.Mono;
 
 /**
diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/src/main/java/com/azure/spring/cloud/feature/manager/FeatureManagerSnapshot.java b/sdk/spring/spring-cloud-azure-feature-management-web/src/main/java/com/azure/spring/cloud/feature/manager/FeatureManagerSnapshot.java
@@ -4,6 +4,8 @@
 
 import java.util.HashMap;
 
+import com.azure.spring.cloud.feature.management.FeatureManager;
+
 import reactor.core.publisher.Mono;
 
 /**
diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/src/main/java/com/azure/spring/cloud/feature/manager/implementation/FeatureManagementWebConfiguration.java b/sdk/spring/spring-cloud-azure-feature-management-web/src/main/java/com/azure/spring/cloud/feature/manager/implementation/FeatureManagementWebConfiguration.java
@@ -10,8 +10,8 @@
 import org.springframework.web.context.annotation.RequestScope;
 
 import com.azure.spring.cloud.feature.manager.FeatureHandler;
-import com.azure.spring.cloud.feature.manager.FeatureManager;
 import com.azure.spring.cloud.feature.manager.FeatureManagerSnapshot;
+import com.azure.spring.cloud.feature.management.FeatureManager;
 import com.azure.spring.cloud.feature.manager.DisabledFeaturesHandler;
 
 /**
diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/src/test/java/com/azure/spring/cloud/feature/manager/FeatureHandlerTest.java b/sdk/spring/spring-cloud-azure-feature-management-web/src/test/java/com/azure/spring/cloud/feature/manager/FeatureHandlerTest.java
@@ -29,6 +29,8 @@
 import org.mockito.MockitoAnnotations;
 import org.springframework.web.method.HandlerMethod;
 
+import com.azure.spring.cloud.feature.management.FeatureManager;
+
 import reactor.core.publisher.Mono;
 
 /**
diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/src/test/java/com/azure/spring/cloud/feature/manager/FeatureManagerSnapshotTest.java b/sdk/spring/spring-cloud-azure-feature-management-web/src/test/java/com/azure/spring/cloud/feature/manager/FeatureManagerSnapshotTest.java
@@ -20,6 +20,8 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
+import com.azure.spring.cloud.feature.management.FeatureManager;
+
 import reactor.core.publisher.Mono;
 
 public class FeatureManagerSnapshotTest {
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager;
+package com.azure.spring.cloud.feature.management;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.azure.spring.cloud.feature.manager.implementation.FeatureManagementConfigProperties;
-import com.azure.spring.cloud.feature.manager.implementation.FeatureManagementProperties;
+import com.azure.spring.cloud.feature.management.implementation.FeatureManagementConfigProperties;
+import com.azure.spring.cloud.feature.management.implementation.FeatureManagementProperties;
 
 /**
  * Configuration for setting up FeatureManager
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManager.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManager.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager;
+package com.azure.spring.cloud.feature.management;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -13,12 +13,12 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.ReflectionUtils;
 
-import com.azure.spring.cloud.feature.manager.filters.FeatureFilter;
-import com.azure.spring.cloud.feature.manager.implementation.FeatureManagementConfigProperties;
-import com.azure.spring.cloud.feature.manager.implementation.FeatureManagementProperties;
-import com.azure.spring.cloud.feature.manager.implementation.models.Feature;
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
-import com.azure.spring.cloud.feature.manager.models.FilterNotFoundException;
+import com.azure.spring.cloud.feature.management.filters.FeatureFilter;
+import com.azure.spring.cloud.feature.management.implementation.FeatureManagementConfigProperties;
+import com.azure.spring.cloud.feature.management.implementation.FeatureManagementProperties;
+import com.azure.spring.cloud.feature.management.implementation.models.Feature;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.FilterNotFoundException;
 
 import reactor.core.publisher.Mono;
 
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/AlwaysOnFilter.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/AlwaysOnFilter.java
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.filters;
+package com.azure.spring.cloud.feature.management.filters;
 
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
 
 /**
  * A filter that always returns true
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/FeatureFilter.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/FeatureFilter.java
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.filters;
+package com.azure.spring.cloud.feature.management.filters;
 
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
 
 /**
  * A Filter for Feature Management that is attached to Features. The filter needs to have @Component set to be found by
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/PercentageFilter.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/PercentageFilter.java
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.filters;
+package com.azure.spring.cloud.feature.management.filters;
 
-import static com.azure.spring.cloud.feature.manager.models.FilterParameters.PERCENTAGE_FILTER_SETTING;
+import static com.azure.spring.cloud.feature.management.models.FilterParameters.PERCENTAGE_FILTER_SETTING;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
 
 /**
  * A feature filter that can be used to activate a feature based on a random percentage.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/TargetingFilter.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/TargetingFilter.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.filters;
+package com.azure.spring.cloud.feature.management.filters;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -15,14 +15,14 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
-import com.azure.spring.cloud.feature.manager.implementation.targeting.Audience;
-import com.azure.spring.cloud.feature.manager.implementation.targeting.GroupRollout;
-import com.azure.spring.cloud.feature.manager.implementation.targeting.TargetingFilterSettings;
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
-import com.azure.spring.cloud.feature.manager.models.TargetingException;
-import com.azure.spring.cloud.feature.manager.targeting.TargetingContextAccessor;
-import com.azure.spring.cloud.feature.manager.targeting.TargetingFilterContext;
-import com.azure.spring.cloud.feature.manager.targeting.TargetingEvaluationOptions;
+import com.azure.spring.cloud.feature.management.implementation.targeting.Audience;
+import com.azure.spring.cloud.feature.management.implementation.targeting.GroupRollout;
+import com.azure.spring.cloud.feature.management.implementation.targeting.TargetingFilterSettings;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.TargetingException;
+import com.azure.spring.cloud.feature.management.targeting.TargetingContextAccessor;
+import com.azure.spring.cloud.feature.management.targeting.TargetingEvaluationOptions;
+import com.azure.spring.cloud.feature.management.targeting.TargetingFilterContext;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/TimeWindowFilter.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/TimeWindowFilter.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.filters;
+package com.azure.spring.cloud.feature.management.filters;
 
-import static com.azure.spring.cloud.feature.manager.models.FilterParameters.TIME_WINDOW_FILTER_SETTING_END;
-import static com.azure.spring.cloud.feature.manager.models.FilterParameters.TIME_WINDOW_FILTER_SETTING_START;
+import static com.azure.spring.cloud.feature.management.models.FilterParameters.TIME_WINDOW_FILTER_SETTING_END;
+import static com.azure.spring.cloud.feature.management.models.FilterParameters.TIME_WINDOW_FILTER_SETTING_START;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -13,7 +13,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
 
 /**
  * A feature filter that can be used at activate a feature based on a time window.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/package-info.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/package-info.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 /**
  * * Package contains the built-in Feature Filters, which implement
- * {@link com.azure.spring.cloud.feature.manager.filters.FeatureFilter}.
+ * {@link com.azure.spring.cloud.feature.management.filters.FeatureFilter}.
  * 
  */
-package com.azure.spring.cloud.feature.manager.filters;
+package com.azure.spring.cloud.feature.management.filters;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/FeatureManagementConfigProperties.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/FeatureManagementConfigProperties.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.implementation;
+package com.azure.spring.cloud.feature.management.implementation;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/FeatureManagementProperties.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/FeatureManagementProperties.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.implementation;
+package com.azure.spring.cloud.feature.management.implementation;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-import com.azure.spring.cloud.feature.manager.implementation.models.Feature;
+import com.azure.spring.cloud.feature.management.implementation.models.Feature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/models/Feature.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/models/Feature.java
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.implementation.models;
+package com.azure.spring.cloud.feature.management.implementation.models;
 
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.HashMap;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/Audience.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/Audience.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.implementation.targeting;
+package com.azure.spring.cloud.feature.management.implementation.targeting;
 
 import java.util.List;
 
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/GroupRollout.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/GroupRollout.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.implementation.targeting;
+package com.azure.spring.cloud.feature.management.implementation.targeting;
 
 /**
  * Properties for defining a rollout for a given group.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/TargetingFilterSettings.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/TargetingFilterSettings.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.implementation.targeting;
+package com.azure.spring.cloud.feature.management.implementation.targeting;
 
 /**
  * The settings that are used to configure the TargetingFilter feature filter.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/package-info.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/implementation/targeting/package-info.java
@@ -0,0 +1 @@
+package com.azure.spring.cloud.feature.management.implementation.targeting;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureFilterEvaluationContext.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureFilterEvaluationContext.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.models;
+package com.azure.spring.cloud.feature.management.models;
 
 import java.util.Map;
 
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureManagementException.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureManagementException.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.models;
+package com.azure.spring.cloud.feature.management.models;
 
 /**
  * This class defines a custom exception type for when an expected Filter is not found when checking if a Feature is
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FilterNotFoundException.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FilterNotFoundException.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.models;
+package com.azure.spring.cloud.feature.management.models;
 
 /**
  * This class defines a custom exception type for when an expected Filter is not found when checking if a Feature is
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FilterParameters.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FilterParameters.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.models;
+package com.azure.spring.cloud.feature.management.models;
 
 /**
  * Parameters for the predefined filters.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/TargetingException.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/TargetingException.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.models;
+package com.azure.spring.cloud.feature.management.models;
 
 /**
  * This class defines a custom exception type for when an expected Filter is not found when checking if a Feature is
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/package-info.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/package-info.java
@@ -3,4 +3,4 @@
 /**
  * Package containing models classes for setting up Feature Flags, Feature Filters.
  */
-package com.azure.spring.cloud.feature.manager.models;
+package com.azure.spring.cloud.feature.management.models;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/package-info.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/package-info.java
@@ -3,4 +3,4 @@
 /**
  * Package contains classes for accessing and creating Feature Flags, Feature Filters.
  */
-package com.azure.spring.cloud.feature.manager;
+package com.azure.spring.cloud.feature.management;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingContext.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingContext.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.targeting;
+package com.azure.spring.cloud.feature.management.targeting;
 
 import java.util.List;
 
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingContextAccessor.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingContextAccessor.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.targeting;
+package com.azure.spring.cloud.feature.management.targeting;
 
 /**
  * Interface for providing a Targeting Context to the `Microsoft.TargetingFilter`.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingEvaluationOptions.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingEvaluationOptions.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.targeting;
+package com.azure.spring.cloud.feature.management.targeting;
 
 /**
  * Configuration options for the `Microsoft.TargetingFilter`.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingFilterContext.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/TargetingFilterContext.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager.targeting;
+package com.azure.spring.cloud.feature.management.targeting;
 
 import java.util.List;
 
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/package-info.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/targeting/package-info.java
@@ -3,4 +3,4 @@
 /**
  * Package containing models classes for targeting user and groups with the targeting filter.
  */
-package com.azure.spring.cloud.feature.manager.targeting;
+package com.azure.spring.cloud.feature.management.targeting;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/manager/implementation/targeting/package-info.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/manager/implementation/targeting/package-info.java
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/FeatureManagerTest.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/FeatureManagerTest.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager;
+package com.azure.spring.cloud.feature.management;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -23,12 +23,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 
-import com.azure.spring.cloud.feature.manager.filters.FeatureFilter;
-import com.azure.spring.cloud.feature.manager.implementation.FeatureManagementConfigProperties;
-import com.azure.spring.cloud.feature.manager.implementation.FeatureManagementProperties;
-import com.azure.spring.cloud.feature.manager.implementation.models.Feature;
-import com.azure.spring.cloud.feature.manager.models.FeatureFilterEvaluationContext;
-import com.azure.spring.cloud.feature.manager.models.FilterNotFoundException;
+import com.azure.spring.cloud.feature.management.filters.FeatureFilter;
+import com.azure.spring.cloud.feature.management.implementation.FeatureManagementConfigProperties;
+import com.azure.spring.cloud.feature.management.implementation.FeatureManagementProperties;
+import com.azure.spring.cloud.feature.management.implementation.models.Feature;
+import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
+import com.azure.spring.cloud.feature.management.models.FilterNotFoundException;
 
 /**
  * Unit tests for FeatureManager.
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/SpringBootTest.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/SpringBootTest.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager;
+package com.azure.spring.cloud.feature.management;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/TestConfiguration.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/TestConfiguration.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.feature.manager;
+package com.azure.spring.cloud.feature.management;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.azure.spring.cloud.feature.manager.implementation.FeatureManagementConfigProperties;
+import com.azure.spring.cloud.feature.management.implementation.FeatureManagementConfigProperties;
 
 @Configuration
 @ConfigurationProperties
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/filters/PercentageFilterTest.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/filters/PercentageFilterTest.java
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/filters/TargetingFilterTest.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/filters/TargetingFilterTest.java
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/filters/TimeWindowFilterTest.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/filters/TimeWindowFilterTest.java
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/testobjects/BasicObject.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/testobjects/BasicObject.java
diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/testobjects/DiscountBanner.java b/sdk/spring/spring-cloud-azure-feature-management/src/test/java/com/azure/spring/cloud/feature/management/testobjects/DiscountBanner.java
