Skip to content

Implement filesystem catalog #962

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
jfallows merged 8 commits into from
Apr 19, 2024
Merged

Implement filesystem catalog #962

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1382381
checkpoint
bmaidics Apr 15, 2024
b4a581c
checkpoint
bmaidics Apr 17, 2024
28fa8dc
Revert accidental changes
bmaidics Apr 17, 2024
ea0688f
Rename
bmaidics Apr 17, 2024
28696c7
readURL from adaptContext?
bmaidics Apr 17, 2024
7154e49
deprecate grpc services option
bmaidics Apr 18, 2024
9975c63
Remove versiion
bmaidics Apr 18, 2024
142b699
Review comments
bmaidics Apr 19, 2024
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
Prev Previous commit
Next Next commit
Revert accidental changes
  • Loading branch information
@bmaidics
bmaidics committed Apr 17, 2024
commit 28fa8dc426b2d18a2196381923068c2d92af26ba
2 changes: 1 addition & 1 deletion ...main/java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioCatalogContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package io.aklivity.zilla.runtime.catalog.apicurio.internal;

import io.aklivity.zilla.runtime.catalog.filesystem.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.engine.EngineContext;
import io.aklivity.zilla.runtime.engine.catalog.CatalogContext;
import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioCatalogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
*/
package io.aklivity.zilla.runtime.catalog.apicurio.internal;

import static io.aklivity.zilla.runtime.catalog.filesystem.internal.config.ApicurioOptionsConfigBuilder.CONTENT_ID;
import static io.aklivity.zilla.runtime.catalog.filesystem.internal.config.ApicurioOptionsConfigBuilder.LEGACY_ID_ENCODING;
import static io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfigBuilder.CONTENT_ID;
import static io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfigBuilder.LEGACY_ID_ENCODING;
import static org.agrona.BitUtil.SIZE_OF_BYTE;
import static org.agrona.BitUtil.SIZE_OF_INT;
import static org.agrona.BitUtil.SIZE_OF_LONG;
Expand All @@ -38,8 +38,8 @@
import org.agrona.collections.Int2ObjectCache;
import org.agrona.concurrent.UnsafeBuffer;

import io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.catalog.apicurio.internal.types.ApicurioPrefixFW;
import io.aklivity.zilla.runtime.catalog.filesystem.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.engine.EngineContext;
import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer;
Expand Down
2 changes: 1 addition & 1 deletion ...nternal/config/ApicurioOptionsConfig.java → ...nternal/config/ApicurioOptionsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* WARRANTIES OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package io.aklivity.zilla.runtime.catalog.filesystem.internal.config;
package io.aklivity.zilla.runtime.catalog.apicurio.internal.config;

import java.time.Duration;
import java.util.function.Function;
Expand Down
2 changes: 1 addition & 1 deletion .../config/ApicurioOptionsConfigAdapter.java → .../config/ApicurioOptionsConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* WARRANTIES OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package io.aklivity.zilla.runtime.catalog.filesystem.internal.config;
package io.aklivity.zilla.runtime.catalog.apicurio.internal.config;

import java.time.Duration;

Expand Down
2 changes: 1 addition & 1 deletion .../config/ApicurioOptionsConfigBuilder.java → .../config/ApicurioOptionsConfigBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* WARRANTIES OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package io.aklivity.zilla.runtime.catalog.filesystem.internal.config;
package io.aklivity.zilla.runtime.catalog.apicurio.internal.config;

import java.time.Duration;
import java.util.function.Function;
Expand Down
2 changes: 1 addition & 1 deletion runtime/catalog-apicurio/src/main/moditect/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
with io.aklivity.zilla.runtime.catalog.apicurio.internal.ApicurioCatalogFactorySpi;

provides io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi
with io.aklivity.zilla.runtime.catalog.filesystem.internal.config.ApicurioOptionsConfigAdapter;
with io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfigAdapter;

provides io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi
with io.aklivity.zilla.runtime.catalog.apicurio.internal.ApicurioEventFormatterFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...sources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
io.aklivity.zilla.runtime.catalog.filesystem.internal.config.FilesystemOptionsConfigAdapter
io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfigAdapter
2 changes: 1 addition & 1 deletion .../java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioCatalogFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import org.junit.Test;

import io.aklivity.zilla.runtime.catalog.filesystem.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.engine.Configuration;
import io.aklivity.zilla.runtime.engine.EngineContext;
import io.aklivity.zilla.runtime.engine.catalog.Catalog;
Expand Down
2 changes: 1 addition & 1 deletion ...picurio/src/test/java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.kaazing.k3po.junit.annotation.Specification;
import org.kaazing.k3po.junit.rules.K3poRule;

import io.aklivity.zilla.runtime.catalog.filesystem.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfig;
import io.aklivity.zilla.runtime.engine.EngineContext;
import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer;
Expand Down
2 changes: 1 addition & 1 deletion ...fig/ApicurioOptionsConfigAdapterTest.java → ...fig/ApicurioOptionsConfigAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* WARRANTIES OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package io.aklivity.zilla.runtime.catalog.filesystem.internal.config;
package io.aklivity.zilla.runtime.catalog.apicurio.internal.config;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
Expand Down