Skip to content

Commit e67c82f

Browse files
dimas-bdimas-b
committed
Move nodeids to nosql package parent
Following up on apache#2728 this change moves "nodeids" code to the `org.apache.polaris.nosql.nodeids` package.
1 parent 3dd46b9 commit e67c82f

File tree

15 files changed

+40
-40
lines changed

15 files changed

+40
-40
lines changed

‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/Node.java‎ renamed to ‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nosql/nodeids/api/Node.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.api;
19+
package org.apache.polaris.nosql.nodeids.api;
2020

2121
import jakarta.annotation.Nullable;
2222
import java.time.Instant;

‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeLease.java‎ renamed to ‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nosql/nodeids/api/NodeLease.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.api;
19+
package org.apache.polaris.nosql.nodeids.api;
2020

2121
import jakarta.annotation.Nullable;
2222

‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagement.java‎ renamed to ‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nosql/nodeids/api/NodeManagement.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.api;
19+
package org.apache.polaris.nosql.nodeids.api;
2020

2121
import jakarta.annotation.Nonnull;
2222
import jakarta.enterprise.context.ApplicationScoped;

‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagementConfig.java‎ renamed to ‎persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nosql/nodeids/api/NodeManagementConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.api;
19+
package org.apache.polaris.nosql.nodeids.api;
2020

2121
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
2222
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

‎persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/NodeManagementImpl.java‎ renamed to ‎persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nosql/nodeids/impl/NodeManagementImpl.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.impl;
19+
package org.apache.polaris.nosql.nodeids.impl;
2020

2121
import static com.google.common.base.Preconditions.checkArgument;
2222
import static com.google.common.base.Preconditions.checkState;
@@ -51,18 +51,18 @@
5151
import org.apache.polaris.ids.api.MonotonicClock;
5252
import org.apache.polaris.ids.spi.IdGeneratorFactory;
5353
import org.apache.polaris.ids.spi.IdGeneratorSource;
54-
import org.apache.polaris.nodeids.api.ImmutableNode;
55-
import org.apache.polaris.nodeids.api.Node;
56-
import org.apache.polaris.nodeids.api.NodeLease;
57-
import org.apache.polaris.nodeids.api.NodeManagement;
58-
import org.apache.polaris.nodeids.api.NodeManagementConfig;
59-
import org.apache.polaris.nodeids.spi.ImmutableBuildableNodeManagementState;
60-
import org.apache.polaris.nodeids.spi.ImmutableNodeState;
61-
import org.apache.polaris.nodeids.spi.NodeState;
62-
import org.apache.polaris.nodeids.spi.NodeStore;
63-
import org.apache.polaris.nodeids.spi.NodeStoreFactory;
6454
import org.apache.polaris.nosql.async.AsyncExec;
6555
import org.apache.polaris.nosql.async.Cancelable;
56+
import org.apache.polaris.nosql.nodeids.api.ImmutableNode;
57+
import org.apache.polaris.nosql.nodeids.api.Node;
58+
import org.apache.polaris.nosql.nodeids.api.NodeLease;
59+
import org.apache.polaris.nosql.nodeids.api.NodeManagement;
60+
import org.apache.polaris.nosql.nodeids.api.NodeManagementConfig;
61+
import org.apache.polaris.nosql.nodeids.spi.ImmutableBuildableNodeManagementState;
62+
import org.apache.polaris.nosql.nodeids.spi.ImmutableNodeState;
63+
import org.apache.polaris.nosql.nodeids.spi.NodeState;
64+
import org.apache.polaris.nosql.nodeids.spi.NodeStore;
65+
import org.apache.polaris.nosql.nodeids.spi.NodeStoreFactory;
6666
import org.slf4j.Logger;
6767
import org.slf4j.LoggerFactory;
6868

‎persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/Util.java‎ renamed to ‎persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nosql/nodeids/impl/Util.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.impl;
19+
package org.apache.polaris.nosql.nodeids.impl;
2020

2121
import com.google.common.annotations.VisibleForTesting;
2222
import java.util.Optional;
2323
import org.apache.polaris.ids.api.IdGeneratorSpec;
2424
import org.apache.polaris.ids.api.ImmutableBuildableIdGeneratorSpec;
25-
import org.apache.polaris.nodeids.spi.NodeManagementState;
25+
import org.apache.polaris.nosql.nodeids.spi.NodeManagementState;
2626

2727
public final class Util {
2828
private Util() {}

‎persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/package-info.java‎ renamed to ‎persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nosql/nodeids/impl/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
* under the License.
1818
*/
1919
/** Node management implementation, do not directly use the types in this package. */
20-
package org.apache.polaris.nodeids.impl;
20+
package org.apache.polaris.nosql.nodeids.impl;

‎persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeLeases.java‎ renamed to ‎persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nosql/nodeids/impl/TestNodeLeases.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.impl;
19+
package org.apache.polaris.nosql.nodeids.impl;
2020

2121
import static java.time.temporal.ChronoUnit.MILLIS;
2222
import static java.util.Objects.requireNonNull;
23-
import static org.apache.polaris.nodeids.impl.NodeManagementImpl.RESCHEDULE_AFTER_FAILURE;
23+
import static org.apache.polaris.nosql.nodeids.impl.NodeManagementImpl.RESCHEDULE_AFTER_FAILURE;
2424
import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
2525

2626
import jakarta.annotation.Nonnull;
@@ -29,9 +29,9 @@
2929
import java.util.concurrent.atomic.AtomicBoolean;
3030
import org.apache.polaris.ids.api.IdGeneratorSpec;
3131
import org.apache.polaris.ids.mocks.MutableMonotonicClock;
32-
import org.apache.polaris.nodeids.api.NodeManagementConfig;
33-
import org.apache.polaris.nodeids.spi.NodeState;
3432
import org.apache.polaris.nosql.async.MockAsyncExec;
33+
import org.apache.polaris.nosql.nodeids.api.NodeManagementConfig;
34+
import org.apache.polaris.nosql.nodeids.spi.NodeState;
3535
import org.assertj.core.api.SoftAssertions;
3636
import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
3737
import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;

‎persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeManagementImpl.java‎ renamed to ‎persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nosql/nodeids/impl/TestNodeManagementImpl.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.impl;
19+
package org.apache.polaris.nosql.nodeids.impl;
2020

2121
import static java.util.Objects.requireNonNull;
2222
import static org.assertj.core.api.InstanceOfAssertFactories.type;
@@ -34,14 +34,14 @@
3434
import org.apache.polaris.ids.api.SnowflakeIdGenerator;
3535
import org.apache.polaris.ids.impl.MonotonicClockImpl;
3636
import org.apache.polaris.ids.mocks.MutableMonotonicClock;
37-
import org.apache.polaris.nodeids.api.NodeLease;
38-
import org.apache.polaris.nodeids.api.NodeManagementConfig;
39-
import org.apache.polaris.nodeids.spi.ImmutableBuildableNodeManagementState;
40-
import org.apache.polaris.nodeids.spi.NodeManagementState;
41-
import org.apache.polaris.nodeids.spi.NodeStore;
42-
import org.apache.polaris.nodeids.spi.NodeStoreFactory;
4337
import org.apache.polaris.nosql.async.AsyncExec;
4438
import org.apache.polaris.nosql.async.java.JavaPoolAsyncExec;
39+
import org.apache.polaris.nosql.nodeids.api.NodeLease;
40+
import org.apache.polaris.nosql.nodeids.api.NodeManagementConfig;
41+
import org.apache.polaris.nosql.nodeids.spi.ImmutableBuildableNodeManagementState;
42+
import org.apache.polaris.nosql.nodeids.spi.NodeManagementState;
43+
import org.apache.polaris.nosql.nodeids.spi.NodeStore;
44+
import org.apache.polaris.nosql.nodeids.spi.NodeStoreFactory;
4545
import org.assertj.core.api.SoftAssertions;
4646
import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
4747
import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;

‎persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nodeids/impl/MockNodeStore.java‎ renamed to ‎persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nosql/nodeids/impl/MockNodeStore.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.nodeids.impl;
19+
package org.apache.polaris.nosql.nodeids.impl;
2020

2121
import jakarta.annotation.Nonnull;
2222
import jakarta.annotation.Nullable;
2323
import java.util.Map;
2424
import java.util.Optional;
2525
import java.util.concurrent.ConcurrentHashMap;
26-
import org.apache.polaris.nodeids.spi.NodeState;
27-
import org.apache.polaris.nodeids.spi.NodeStore;
26+
import org.apache.polaris.nosql.nodeids.spi.NodeState;
27+
import org.apache.polaris.nosql.nodeids.spi.NodeStore;
2828

2929
public class MockNodeStore implements NodeStore {
3030
private final Map<Integer, NodeState> nodeStates = new ConcurrentHashMap<>();

0 commit comments

Comments
 (0)