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.

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

Move cluster related classes from c.h.core to c.h.cluster and c.h.client #15046

Merged
merged 1 commit into from Jun 10, 2019

Conversation

@mdogan
Copy link
Member

mdogan commented May 16, 2019

  • Member and membership related classes are moved to c.h.cluster
  • Client related classes are moved to c.h.client.api
  • AbstractMember and MemberImpl are moved to c.h.cluster.impl
  • NOTE: Keeping c.h.core.Member as a deprecated interface for now,
    because client protocol relies on that and cannot remove it directly
    because of cyclic-dependency. It will be removed after client protocol
    is updated.

EE: hazelcast/hazelcast-enterprise#2972
Client: hazelcast/hazelcast-client-protocol#187

@mdogan

This comment has been minimized.

Copy link
Member Author

mdogan commented May 16, 2019

There are too many files changed, but they are mostly import changes. Diff is very small compared to number of files; ~+800 / ~-800

@mdogan mdogan force-pushed the mdogan:cluster-package branch 3 times, most recently from 59fa205 to bdb1d20 May 16, 2019
@mdogan mdogan force-pushed the mdogan:cluster-package branch 2 times, most recently from d122fbe to efceb77 May 27, 2019
@@ -68,7 +68,7 @@
}

@Override
public void handleMemberEventV10(Member member, int eventType) {
public void handleMemberEventV10(com.hazelcast.core.Member member, int eventType) {

This comment has been minimized.

Copy link
@pveentjer

pveentjer Jun 3, 2019

Member

Do we need included package name?

This comment has been minimized.

Copy link
@mdogan

mdogan Jun 3, 2019

Author Member

For now yes, client protocol depends on com.hazelcast.core.Member interface. After this PR gets merged, we should fix the client protocol and then remove com.hazelcast.core.Member from codebase completely.

@@ -14,7 +14,9 @@
* limitations under the License.
*/

package com.hazelcast.core;

This comment has been minimized.

Copy link
@pveentjer

pveentjer Jun 3, 2019

Member

I guess this is related to Java 9 package issues?

This comment has been minimized.

Copy link
@mdogan

mdogan Jun 3, 2019

Author Member

Yes, c.h.client package is used by hazelcast-client module and cannot move these classes into c.h.client in core module. That's why c.h.client.api package..

Copy link
Member

pveentjer left a comment

Looks good. Only minor comments.

@mdogan mdogan force-pushed the mdogan:cluster-package branch from efceb77 to d2931d3 Jun 3, 2019
@vojtechtoman vojtechtoman self-requested a review Jun 3, 2019
Copy link
Contributor

vojtechtoman left a comment

Looks good to me.

@mmedenjak

This comment has been minimized.

Copy link
Contributor

mmedenjak commented Jun 4, 2019

@mdogan can you rebase and can we get it merged?

@mdogan mdogan force-pushed the mdogan:cluster-package branch from d2931d3 to 3aa3e25 Jun 10, 2019
- Member and membership related classes are moved to `c.h.cluster`
- Client related classes are moved to `c.h.client`
- `AbstractMember` and `MemberImpl` are moved to `c.h.cluster.impl`
- NOTE: Keeping `c.h.core.Member` as a deprecated interface for now,
because client protocol relies on that and cannot remove it directly
because of cyclic-dependency. It will be removed after client protocol
is updated.
@mdogan mdogan force-pushed the mdogan:cluster-package branch from 3aa3e25 to 6aac696 Jun 10, 2019
@mdogan mdogan merged commit 030fb8a into hazelcast:master Jun 10, 2019
1 check passed
1 check passed
default Test PASSed.
Details
@mdogan mdogan deleted the mdogan:cluster-package branch Jun 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.