From 2ed6f2722b753fd5249f2e658eae17def1bd4513 Mon Sep 17 00:00:00 2001 From: Stanimir Penkov Date: Tue, 25 Sep 2018 14:58:15 +0300 Subject: [PATCH] NY-3815: Unify names of tables and fields in Cassandra - unified names of tables and fields in Cassandra; - removed unused import statements. Signed-off-by: Stanimir Penkov --- .../biz/nynja/account/StartupScriptsListener.java | 8 ++++---- .../models/AccountByCommunicationProvider.java | 11 ++++------- .../java/biz/nynja/account/models/PendingAccount.java | 10 ++-------- .../PendingAccountByAuthenticationProvider.java | 7 ------- .../models/ProfileByAuthenticationProvider.java | 8 +++----- 5 files changed, 13 insertions(+), 31 deletions(-) diff --git a/src/main/java/biz/nynja/account/StartupScriptsListener.java b/src/main/java/biz/nynja/account/StartupScriptsListener.java index fb650ab..08acd3a 100644 --- a/src/main/java/biz/nynja/account/StartupScriptsListener.java +++ b/src/main/java/biz/nynja/account/StartupScriptsListener.java @@ -44,7 +44,7 @@ public class StartupScriptsListener { + ".accountbyauthenticationprovider AS SELECT * FROM account " + "WHERE authenticationprovider IS NOT NULL " + "PRIMARY KEY (authenticationprovider, accountid);"; - String scriptAccountViewByАccountName = "CREATE MATERIALIZED VIEW IF NOT EXISTS " + keyspace + String scriptAccountViewByAccountName = "CREATE MATERIALIZED VIEW IF NOT EXISTS " + keyspace + ".accountbyaccountname AS SELECT * FROM account " + "WHERE accountname IS NOT NULL " + "PRIMARY KEY (accountname, accountid);"; @@ -53,10 +53,10 @@ public class StartupScriptsListener { + "PRIMARY KEY (username, accountid);"; String scriptPendingAccountViewByAuthenticationProvider = "CREATE MATERIALIZED VIEW IF NOT EXISTS " + keyspace - + ".pendingaccountbyauthenticationprovider AS SELECT * FROM pending_account " + "WHERE authentication_provider IS NOT NULL " - + "PRIMARY KEY (authentication_provider, account_id);"; + + ".pendingaccountbyauthenticationprovider AS SELECT * FROM pendingaccount " + "WHERE authenticationprovider IS NOT NULL " + + "PRIMARY KEY (authenticationprovider, accountid);"; return Arrays.asList(scriptAccountViewByProfileId, scriptAccountViewByAuthProvider, - scriptAccountViewByАccountName, scriptAccountViewByUsername, scriptPendingAccountViewByAuthenticationProvider); + scriptAccountViewByAccountName, scriptAccountViewByUsername, scriptPendingAccountViewByAuthenticationProvider); } } \ No newline at end of file diff --git a/src/main/java/biz/nynja/account/models/AccountByCommunicationProvider.java b/src/main/java/biz/nynja/account/models/AccountByCommunicationProvider.java index a6354f5..f64d3a9 100644 --- a/src/main/java/biz/nynja/account/models/AccountByCommunicationProvider.java +++ b/src/main/java/biz/nynja/account/models/AccountByCommunicationProvider.java @@ -7,22 +7,19 @@ import java.nio.ByteBuffer; import java.util.UUID; import org.springframework.data.cassandra.core.cql.PrimaryKeyType; -import org.springframework.data.cassandra.core.mapping.Column; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -@Table("account_by_communication_provider") +@Table public class AccountByCommunicationProvider { - @PrimaryKeyColumn(name = "communication_provider", ordinal = 0, type = PrimaryKeyType.PARTITIONED) + @PrimaryKeyColumn(ordinal = 0, type = PrimaryKeyType.PARTITIONED) private String communicationProvider; - @PrimaryKeyColumn(name = "communication_provider_type", ordinal = 1, type = PrimaryKeyType.PARTITIONED) + @PrimaryKeyColumn(ordinal = 1, type = PrimaryKeyType.PARTITIONED) private String communicationProviderType; - @PrimaryKeyColumn(name = "account_id", ordinal = 2, type = PrimaryKeyType.CLUSTERED) + @PrimaryKeyColumn(ordinal = 2, type = PrimaryKeyType.CLUSTERED) private UUID accountId; - @Column("account_name") private String accountName; - @Column("first_name") private String firstName; private ByteBuffer avatar; diff --git a/src/main/java/biz/nynja/account/models/PendingAccount.java b/src/main/java/biz/nynja/account/models/PendingAccount.java index 5f95c67..11d7758 100644 --- a/src/main/java/biz/nynja/account/models/PendingAccount.java +++ b/src/main/java/biz/nynja/account/models/PendingAccount.java @@ -3,26 +3,20 @@ */ package biz.nynja.account.models; -import java.util.Date; import java.util.UUID; -import org.springframework.data.cassandra.core.mapping.Column; import org.springframework.data.cassandra.core.mapping.PrimaryKey; import org.springframework.data.cassandra.core.mapping.Table; import biz.nynja.account.grpc.CreatePendingAccountRequest; -@Table("pending_account") +@Table public class PendingAccount { - @PrimaryKey("account_id") + @PrimaryKey private UUID accountId; - @Column("profile_id") private UUID profileId; - @Column("authentication_provider") private String authenticationProvider; - @Column("authentication_provider_type") private String authenticationProviderType; - @Column("creation_timestamp") private Long creationTimestamp; public UUID getAccountId() { diff --git a/src/main/java/biz/nynja/account/models/PendingAccountByAuthenticationProvider.java b/src/main/java/biz/nynja/account/models/PendingAccountByAuthenticationProvider.java index 8c3dcdc..35c07e9 100644 --- a/src/main/java/biz/nynja/account/models/PendingAccountByAuthenticationProvider.java +++ b/src/main/java/biz/nynja/account/models/PendingAccountByAuthenticationProvider.java @@ -5,18 +5,11 @@ package biz.nynja.account.models; import java.util.UUID; -import org.springframework.data.cassandra.core.mapping.Column; - public class PendingAccountByAuthenticationProvider { - @Column("account_id") private UUID accountId; - @Column("profile_id") private UUID profileId; - @Column("authentication_provider") private String authenticationProvider; - @Column("authentication_provider_type") private String authenticationProviderType; - @Column("creation_timestamp") private Long creationTimestamp; public UUID getAccountId() { diff --git a/src/main/java/biz/nynja/account/models/ProfileByAuthenticationProvider.java b/src/main/java/biz/nynja/account/models/ProfileByAuthenticationProvider.java index fee3e5c..cbfd96b 100644 --- a/src/main/java/biz/nynja/account/models/ProfileByAuthenticationProvider.java +++ b/src/main/java/biz/nynja/account/models/ProfileByAuthenticationProvider.java @@ -6,18 +6,16 @@ package biz.nynja.account.models; import java.util.UUID; import org.springframework.data.cassandra.core.cql.PrimaryKeyType; -import org.springframework.data.cassandra.core.mapping.Column; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -@Table("profile_by_authentication_provider") +@Table public class ProfileByAuthenticationProvider { - @PrimaryKeyColumn(name = "authentication_provider", ordinal = 0, type = PrimaryKeyType.PARTITIONED) + @PrimaryKeyColumn(ordinal = 0, type = PrimaryKeyType.PARTITIONED) private String authenticationProvider; - @PrimaryKeyColumn(name = "authentication_provider_type", ordinal = 1, type = PrimaryKeyType.PARTITIONED) + @PrimaryKeyColumn(ordinal = 1, type = PrimaryKeyType.PARTITIONED) private String authenticationProviderType; - @Column("profile_id") private UUID profileId; public String getAuthenticationProvider() { -- GitLab