Skip to content

Rename packages to org.apache.polaris #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snazy merged 1 commit into from
Aug 25, 2024
Merged

Rename packages to org.apache.polaris #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...seLinkPolarisMetaStoreManagerFactory.java → ...seLinkPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.extension.persistence.impl.eclipselink;
package org.apache.polaris.extension.persistence.impl.eclipselink;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import io.polaris.core.PolarisDiagnostics;
import io.polaris.core.context.RealmContext;
import io.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
import io.polaris.core.persistence.PolarisMetaStoreManager;
import io.polaris.core.persistence.PolarisMetaStoreSession;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreSession;
import org.jetbrains.annotations.NotNull;

/**
Expand Down
46 changes: 23 additions & 23 deletions ...larisEclipseLinkMetaStoreSessionImpl.java → ...larisEclipseLinkMetaStoreSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.extension.persistence.impl.eclipselink;
package org.apache.polaris.extension.persistence.impl.eclipselink;

import static org.eclipse.persistence.config.PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML;
import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_URL;

import com.google.common.base.Predicates;
import io.polaris.core.PolarisCallContext;
import io.polaris.core.context.RealmContext;
import io.polaris.core.entity.PolarisBaseEntity;
import io.polaris.core.entity.PolarisChangeTrackingVersions;
import io.polaris.core.entity.PolarisEntitiesActiveKey;
import io.polaris.core.entity.PolarisEntityActiveRecord;
import io.polaris.core.entity.PolarisEntityCore;
import io.polaris.core.entity.PolarisEntityId;
import io.polaris.core.entity.PolarisEntityType;
import io.polaris.core.entity.PolarisGrantRecord;
import io.polaris.core.entity.PolarisPrincipalSecrets;
import io.polaris.core.persistence.PolarisMetaStoreManagerImpl;
import io.polaris.core.persistence.PolarisMetaStoreSession;
import io.polaris.core.persistence.RetryOnConcurrencyException;
import io.polaris.core.persistence.models.ModelEntity;
import io.polaris.core.persistence.models.ModelEntityActive;
import io.polaris.core.persistence.models.ModelEntityChangeTracking;
import io.polaris.core.persistence.models.ModelGrantRecord;
import io.polaris.core.persistence.models.ModelPrincipalSecrets;
import io.polaris.core.storage.PolarisStorageConfigurationInfo;
import io.polaris.core.storage.PolarisStorageIntegration;
import io.polaris.core.storage.PolarisStorageIntegrationProvider;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.EntityTransaction;
Expand All @@ -69,6 +47,28 @@
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.entity.PolarisBaseEntity;
import org.apache.polaris.core.entity.PolarisChangeTrackingVersions;
import org.apache.polaris.core.entity.PolarisEntitiesActiveKey;
import org.apache.polaris.core.entity.PolarisEntityActiveRecord;
import org.apache.polaris.core.entity.PolarisEntityCore;
import org.apache.polaris.core.entity.PolarisEntityId;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.entity.PolarisGrantRecord;
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
import org.apache.polaris.core.persistence.PolarisMetaStoreManagerImpl;
import org.apache.polaris.core.persistence.PolarisMetaStoreSession;
import org.apache.polaris.core.persistence.RetryOnConcurrencyException;
import org.apache.polaris.core.persistence.models.ModelEntity;
import org.apache.polaris.core.persistence.models.ModelEntityActive;
import org.apache.polaris.core.persistence.models.ModelEntityChangeTracking;
import org.apache.polaris.core.persistence.models.ModelGrantRecord;
import org.apache.polaris.core.persistence.models.ModelPrincipalSecrets;
import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
import org.apache.polaris.core.storage.PolarisStorageIntegration;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
Expand Down
34 changes: 17 additions & 17 deletions .../eclipselink/PolarisEclipseLinkStore.java → .../eclipselink/PolarisEclipseLinkStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.extension.persistence.impl.eclipselink;

import io.polaris.core.PolarisDiagnostics;
import io.polaris.core.entity.PolarisBaseEntity;
import io.polaris.core.entity.PolarisEntitiesActiveKey;
import io.polaris.core.entity.PolarisEntityActiveRecord;
import io.polaris.core.entity.PolarisEntityCore;
import io.polaris.core.entity.PolarisEntityId;
import io.polaris.core.entity.PolarisEntityType;
import io.polaris.core.entity.PolarisGrantRecord;
import io.polaris.core.entity.PolarisPrincipalSecrets;
import io.polaris.core.persistence.models.ModelEntity;
import io.polaris.core.persistence.models.ModelEntityActive;
import io.polaris.core.persistence.models.ModelEntityChangeTracking;
import io.polaris.core.persistence.models.ModelEntityDropped;
import io.polaris.core.persistence.models.ModelGrantRecord;
import io.polaris.core.persistence.models.ModelPrincipalSecrets;
package org.apache.polaris.extension.persistence.impl.eclipselink;

import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.entity.PolarisBaseEntity;
import org.apache.polaris.core.entity.PolarisEntitiesActiveKey;
import org.apache.polaris.core.entity.PolarisEntityActiveRecord;
import org.apache.polaris.core.entity.PolarisEntityCore;
import org.apache.polaris.core.entity.PolarisEntityId;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.entity.PolarisGrantRecord;
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
import org.apache.polaris.core.persistence.models.ModelEntity;
import org.apache.polaris.core.persistence.models.ModelEntityActive;
import org.apache.polaris.core.persistence.models.ModelEntityChangeTracking;
import org.apache.polaris.core.persistence.models.ModelEntityDropped;
import org.apache.polaris.core.persistence.models.ModelGrantRecord;
import org.apache.polaris.core.persistence.models.ModelPrincipalSecrets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
Expand Down
14 changes: 7 additions & 7 deletions extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<class>io.polaris.core.persistence.models.ModelEntity</class>
<class>io.polaris.core.persistence.models.ModelEntityActive</class>
<class>io.polaris.core.persistence.models.ModelEntityChangeTracking</class>
<class>io.polaris.core.persistence.models.ModelEntityDropped</class>
<class>io.polaris.core.persistence.models.ModelGrantRecord</class>
<class>io.polaris.core.persistence.models.ModelPrincipalSecrets</class>
<class>io.polaris.core.persistence.models.ModelSequenceId</class>
<class>org.apache.polaris.core.persistence.models.ModelEntity</class>
<class>org.apache.polaris.core.persistence.models.ModelEntityActive</class>
<class>org.apache.polaris.core.persistence.models.ModelEntityChangeTracking</class>
<class>org.apache.polaris.core.persistence.models.ModelEntityDropped</class>
<class>org.apache.polaris.core.persistence.models.ModelGrantRecord</class>
<class>org.apache.polaris.core.persistence.models.ModelPrincipalSecrets</class>
<class>org.apache.polaris.core.persistence.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url"
Expand Down
16 changes: 8 additions & 8 deletions ...link/PolarisEclipseLinkMetaStoreTest.java → ...link/PolarisEclipseLinkMetaStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.extension.persistence.impl.eclipselink;
package org.apache.polaris.extension.persistence.impl.eclipselink;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import io.polaris.core.PolarisCallContext;
import io.polaris.core.PolarisConfigurationStore;
import io.polaris.core.PolarisDefaultDiagServiceImpl;
import io.polaris.core.PolarisDiagnostics;
import io.polaris.core.persistence.PolarisMetaStoreManagerImpl;
import io.polaris.core.persistence.PolarisMetaStoreManagerTest;
import io.polaris.core.persistence.PolarisTestMetaStoreManager;
import java.time.ZoneId;
import java.util.stream.Stream;
import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.PolarisConfigurationStore;
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.persistence.PolarisMetaStoreManagerImpl;
import org.apache.polaris.core.persistence.PolarisMetaStoreManagerTest;
import org.apache.polaris.core.persistence.PolarisTestMetaStoreManager;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
Expand Down
14 changes: 7 additions & 7 deletions extension/persistence/eclipselink/src/test/resources/META-INF/persistence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

<persistence-unit name="polaris-dev" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<class>io.polaris.core.persistence.models.ModelEntity</class>
<class>io.polaris.core.persistence.models.ModelEntityActive</class>
<class>io.polaris.core.persistence.models.ModelEntityChangeTracking</class>
<class>io.polaris.core.persistence.models.ModelEntityDropped</class>
<class>io.polaris.core.persistence.models.ModelGrantRecord</class>
<class>io.polaris.core.persistence.models.ModelPrincipalSecrets</class>
<class>io.polaris.core.persistence.models.ModelSequenceId</class>
<class>org.apache.polaris.core.persistence.models.ModelEntity</class>
<class>org.apache.polaris.core.persistence.models.ModelEntityActive</class>
<class>org.apache.polaris.core.persistence.models.ModelEntityChangeTracking</class>
<class>org.apache.polaris.core.persistence.models.ModelEntityDropped</class>
<class>org.apache.polaris.core.persistence.models.ModelGrantRecord</class>
<class>org.apache.polaris.core.persistence.models.ModelPrincipalSecrets</class>
<class>org.apache.polaris.core.persistence.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
group=io.polaris
group=org.apache.polaris
version=1.0.0

# enable the Gradle build cache
Expand Down
2 changes: 1 addition & 1 deletion polaris-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ tasks.register<GenerateTask>("generatePolarisService").configure {
inputSpec = "$rootDir/spec/polaris-management-service.yml"
generatorName = "jaxrs-resteasy"
outputDir = "$projectDir/build/generated"
modelPackage = "io.polaris.core.admin.model"
modelPackage = "org.apache.polaris.core.admin.model"
ignoreFileOverride = "$rootDir/.openapi-generator-ignore"
removeOperationIdPrefix = true
templateDir = "$rootDir/server-templates"
Expand Down
4 changes: 2 additions & 2 deletions ...a/io/polaris/core/PolarisCallContext.java → ...ache/polaris/core/PolarisCallContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.core;
package org.apache.polaris.core;

import io.polaris.core.persistence.PolarisMetaStoreSession;
import java.time.Clock;
import java.time.ZoneId;
import org.apache.polaris.core.persistence.PolarisMetaStoreSession;
import org.jetbrains.annotations.NotNull;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...io/polaris/core/PolarisConfiguration.java → ...he/polaris/core/PolarisConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.core;
package org.apache.polaris.core;

import java.util.Optional;

Expand Down
4 changes: 2 additions & 2 deletions ...laris/core/PolarisConfigurationStore.java → ...laris/core/PolarisConfigurationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.core;
package org.apache.polaris.core;

import com.google.common.base.Preconditions;
import io.polaris.core.entity.CatalogEntity;
import org.apache.polaris.core.entity.CatalogEntity;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion ...s/core/PolarisDefaultDiagServiceImpl.java → ...s/core/PolarisDefaultDiagServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.core;
package org.apache.polaris.core;

import com.google.common.base.Preconditions;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion ...a/io/polaris/core/PolarisDiagnostics.java → ...ache/polaris/core/PolarisDiagnostics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.core;
package org.apache.polaris.core;

import org.jetbrains.annotations.Contract;

Expand Down
6 changes: 3 additions & 3 deletions ...e/auth/AuthenticatedPolarisPrincipal.java → ...e/auth/AuthenticatedPolarisPrincipal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.polaris.core.auth;
package org.apache.polaris.core.auth;

import io.polaris.core.entity.PolarisEntity;
import io.polaris.core.entity.PrincipalRoleEntity;
import java.util.List;
import java.util.Set;
import org.apache.polaris.core.entity.PolarisEntity;
import org.apache.polaris.core.entity.PrincipalRoleEntity;
import org.jetbrains.annotations.NotNull;

/** Holds the results of request authentication. */
Expand Down
Loading