Skip to content
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

Pulsar IO rename #1747

Merged
merged 16 commits into from
May 8, 2018
Merged

Pulsar IO rename #1747

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d2c31e9
begin renaming process
lucperkins Apr 23, 2018
52c5a28
more class and directory renames
lucperkins Apr 23, 2018
b7e3881
fix merge conflicts
lucperkins May 7, 2018
5ef005d
move Record classes into pulsar-io
lucperkins May 7, 2018
a51aa0c
apply rename to Maven configs
lucperkins May 7, 2018
daa8322
rename java imports
lucperkins May 7, 2018
d72304f
fix merge conflicts
lucperkins May 7, 2018
f217df5
fix merge conflict
lucperkins May 8, 2018
81d6af0
update versions in maven configs
lucperkins May 8, 2018
2cdf985
add missing imports
lucperkins May 8, 2018
230727a
remove Message class from pulsar-io
lucperkins May 8, 2018
71f799c
add missing import
lucperkins May 8, 2018
ee3f225
add Reflections util import
lucperkins May 8, 2018
25505d0
add Utils import
lucperkins May 8, 2018
635ad0a
add missing Record import
lucperkins May 8, 2018
9cc6697
supply missing Record imports
lucperkins May 8, 2018
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
rename java imports
  • Loading branch information
@lucperkins
lucperkins committed May 7, 2018
commit daa8322554f0a3b85febc8879a5819bcf3ea84fa
2 changes: 1 addition & 1 deletion pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageRecordImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.connect.core.Record;
import org.apache.pulsar.io.core.Record;

/**
* Abstract class that implements message api and connect record api.
Expand Down
2 changes: 1 addition & 1 deletion pulsar-functions/instance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</dependency>

<dependency>
<groupId>org.apache.pulsar</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-io-core</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...r-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.connect.core.Source;
import org.apache.pulsar.functions.api.Function;
import org.apache.pulsar.functions.proto.InstanceCommunication;
import org.apache.pulsar.io.core.Source;

import org.apache.pulsar.functions.source.PulsarSource;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions ...ons/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.impl.PulsarClientImpl;
import org.apache.pulsar.connect.core.Record;
import org.apache.pulsar.connect.core.Source;
import org.apache.pulsar.functions.api.Function;
import org.apache.pulsar.functions.proto.InstanceCommunication;
import org.apache.pulsar.functions.proto.Function.SourceSpec;
Expand All @@ -67,6 +65,8 @@
import org.apache.pulsar.functions.instance.state.StateContextImpl;
import org.apache.pulsar.functions.utils.FunctionDetailsUtils;
import org.apache.pulsar.functions.utils.Reflections;
import org.apache.pulsar.io.core.Record;
import org.apache.pulsar.io.core.Source;

/**
* A function container implemented using java thread.
Expand Down
2 changes: 1 addition & 1 deletion ...functions/instance/src/main/java/org/apache/pulsar/functions/sink/DefaultRuntimeSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.apache.pulsar.connect.core.Sink;
import org.apache.pulsar.io.core.Sink;

/**
* The default implementation of runtime sink.
Expand Down
2 changes: 1 addition & 1 deletion pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.connect.core.RecordContext;
import org.apache.pulsar.functions.api.SerDe;
import org.apache.pulsar.functions.api.utils.DefaultSerDe;
import org.apache.pulsar.functions.instance.InstanceUtils;
Expand All @@ -39,6 +38,7 @@
import org.apache.pulsar.functions.instance.producers.Producers;
import org.apache.pulsar.functions.source.PulsarRecord;
import org.apache.pulsar.functions.utils.FunctionConfig;
import org.apache.pulsar.io.core.RecordContext;

import java.util.Base64;
import java.util.Map;
Expand Down
2 changes: 0 additions & 2 deletions ...r-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import lombok.ToString;
import org.apache.pulsar.functions.utils.FunctionConfig;

import java.util.Map;

@Getter
@Setter
@ToString
Expand Down
4 changes: 2 additions & 2 deletions pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/RuntimeSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
package org.apache.pulsar.functions.sink;

import org.apache.pulsar.connect.core.RecordContext;
import org.apache.pulsar.connect.core.Sink;
import org.apache.pulsar.io.core.RecordContext;
import org.apache.pulsar.io.core.Sink;

/**
* This class extends connect sink.
Expand Down
2 changes: 1 addition & 1 deletion pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import lombok.Getter;
import lombok.ToString;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.connect.core.Record;
import org.apache.pulsar.io.core.Record;

@Data
@Builder
Expand Down
4 changes: 2 additions & 2 deletions pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
import org.apache.pulsar.client.impl.MessageIdImpl;
import org.apache.pulsar.client.impl.TopicMessageIdImpl;
import org.apache.pulsar.client.impl.TopicMessageImpl;
import org.apache.pulsar.connect.core.Record;
import org.apache.pulsar.connect.core.Source;
import org.apache.pulsar.functions.api.SerDe;
import org.apache.pulsar.functions.api.utils.DefaultSerDe;
import org.apache.pulsar.functions.instance.InstanceUtils;
import org.apache.pulsar.functions.utils.FunctionConfig;
import org.apache.pulsar.io.core.Record;
import org.apache.pulsar.io.core.Source;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
4 changes: 2 additions & 2 deletions ...tions/instance/src/test/java/org/apache/pulsar/functions/sink/DefaultRuntimeSinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.apache.pulsar.connect.core.RecordContext;
import org.apache.pulsar.connect.core.Sink;
import org.apache.pulsar.io.core.RecordContext;
import org.apache.pulsar.io.core.Sink;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

Expand Down
2 changes: 1 addition & 1 deletion pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Record.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 org.apache.pulsar.connect.core;
package org.apache.pulsar.io.core;

/**
* Pulsar Connect's Record interface. Record encapsulates the
Expand Down
2 changes: 1 addition & 1 deletion pulsar-io/core/src/main/java/org/apache/pulsar/io/core/RecordContext.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 org.apache.pulsar.connect.core;
package org.apache.pulsar.io.core;

/**
* A source context that can be used by the runtime to interact with source.
Expand Down