Skip to content

Commit 91ca146

Browse files
BryanMLimaBryanMLima
committed
Refactoring gui theme classes
1 parent fffd627 commit 91ca146

File tree

23 files changed

+231
-259
lines changed

23 files changed

+231
-259
lines changed

‎api/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,6 @@
7171
<artifactId>cloud-framework-direct-download</artifactId>
7272
<version>${project.version}</version>
7373
</dependency>
74-
<dependency>
75-
<groupId>org.eclipse.persistence</groupId>
76-
<artifactId>javax.persistence</artifactId>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.apache.cloudstack</groupId>
80-
<artifactId>cloud-framework-db</artifactId>
81-
<version>${project.version}</version>
82-
</dependency>
8374
</dependencies>
8475
<build>
8576
<plugins>

‎api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
import org.apache.cloudstack.direct.download.DirectDownloadCertificate;
155155
import org.apache.cloudstack.direct.download.DirectDownloadCertificateHostMap;
156156
import org.apache.cloudstack.direct.download.DirectDownloadManager;
157-
import org.apache.cloudstack.gui.themes.GuiThemeJoinVO;
157+
import org.apache.cloudstack.gui.themes.GuiThemeJoin;
158158
import org.apache.cloudstack.management.ManagementServerHost;
159159
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
160160
import org.apache.cloudstack.region.PortableIp;
@@ -571,5 +571,5 @@ List<TemplateResponse> createTemplateResponses(ResponseView view, VirtualMachine
571571

572572
SharedFSResponse createSharedFSResponse(ResponseView view, SharedFS sharedFS);
573573

574-
GuiThemeResponse createGuiThemeResponse(GuiThemeJoinVO guiThemeJoinVO);
574+
GuiThemeResponse createGuiThemeResponse(GuiThemeJoin guiThemeJoin);
575575
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/gui/themes/CreateGuiThemeCmd.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import org.apache.cloudstack.api.ServerApiException;
2626
import org.apache.cloudstack.api.response.GuiThemeResponse;
2727
import org.apache.cloudstack.context.CallContext;
28-
import org.apache.cloudstack.gui.themes.GuiThemeJoinVO;
29-
import org.apache.cloudstack.gui.themes.GuiThemeVO;
28+
import org.apache.cloudstack.gui.themes.GuiTheme;
29+
import org.apache.cloudstack.gui.themes.GuiThemeJoin;
3030
import org.apache.cloudstack.gui.themes.GuiThemeService;
3131

3232
import javax.inject.Inject;
3333

3434
@APICommand(name = "createGuiTheme", description = "Creates a customized GUI theme for a set of Common Names (fixed or wildcard), a set of domain UUIDs, and/or a set of " +
35-
"account UUIDs.", responseObject = GuiThemeResponse.class, entityType = {GuiThemeVO.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
35+
"account UUIDs.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
3636
since = "4.20.0.0", authorized = {RoleType.Admin})
3737
public class CreateGuiThemeCmd extends BaseCmd {
3838

@@ -111,13 +111,13 @@ public Boolean getRecursiveDomains() {
111111

112112
@Override
113113
public void execute() {
114-
GuiThemeJoinVO guiTheme = guiThemeService.createGuiTheme(this);
114+
GuiThemeJoin guiThemeJoin = guiThemeService.createGuiTheme(this);
115115

116-
if (guiTheme == null) {
116+
if (guiThemeJoin == null) {
117117
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create the GUI theme.");
118118
}
119119

120-
GuiThemeResponse response = _responseGenerator.createGuiThemeResponse(guiTheme);
120+
GuiThemeResponse response = _responseGenerator.createGuiThemeResponse(guiThemeJoin);
121121
response.setResponseName(getCommandName());
122122
this.setResponseObject(response);
123123
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/gui/themes/ListGuiThemesCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import org.apache.cloudstack.api.response.DomainResponse;
2626
import org.apache.cloudstack.api.response.GuiThemeResponse;
2727
import org.apache.cloudstack.api.response.ListResponse;
28-
import org.apache.cloudstack.gui.themes.GuiThemeVO;
28+
import org.apache.cloudstack.gui.themes.GuiTheme;
2929
import org.apache.cloudstack.gui.themes.GuiThemeService;
3030

3131
import javax.inject.Inject;
3232

33-
@APICommand(name = "listGuiThemes", description = "Lists GUI themes.", responseObject = GuiThemeResponse.class, entityType = {GuiThemeVO.class},
33+
@APICommand(name = "listGuiThemes", description = "Lists GUI themes.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class},
3434
since = "4.20.0.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.User, RoleType.DomainAdmin,
3535
RoleType.ResourceAdmin})
3636
public class ListGuiThemesCmd extends BaseListCmd {

‎api/src/main/java/org/apache/cloudstack/api/command/user/gui/themes/RemoveGuiThemeCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.apache.cloudstack.api.response.GuiThemeResponse;
2525
import org.apache.cloudstack.api.response.SuccessResponse;
2626
import org.apache.cloudstack.context.CallContext;
27-
import org.apache.cloudstack.gui.themes.GuiThemeVO;
27+
import org.apache.cloudstack.gui.themes.GuiTheme;
2828
import org.apache.cloudstack.gui.themes.GuiThemeService;
2929

3030
import javax.inject.Inject;
3131

32-
@APICommand(name = "removeGuiTheme", description = "Removes an existing GUI theme.", responseObject = GuiThemeResponse.class, entityType = {GuiThemeVO.class},
32+
@APICommand(name = "removeGuiTheme", description = "Removes an existing GUI theme.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class},
3333
since = "4.20.0.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
3434
public class RemoveGuiThemeCmd extends BaseCmd {
3535

‎api/src/main/java/org/apache/cloudstack/api/command/user/gui/themes/UpdateGuiThemeCmd.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import org.apache.cloudstack.api.ServerApiException;
2626
import org.apache.cloudstack.api.response.GuiThemeResponse;
2727
import org.apache.cloudstack.context.CallContext;
28-
import org.apache.cloudstack.gui.themes.GuiThemeJoinVO;
29-
import org.apache.cloudstack.gui.themes.GuiThemeVO;
28+
import org.apache.cloudstack.gui.themes.GuiTheme;
29+
import org.apache.cloudstack.gui.themes.GuiThemeJoin;
3030
import org.apache.cloudstack.gui.themes.GuiThemeService;
3131

3232
import javax.inject.Inject;
3333

3434

35-
@APICommand(name = "updateGuiTheme", description = "Updates an existing GUI theme.", responseObject = GuiThemeResponse.class, entityType = {GuiThemeVO.class},
35+
@APICommand(name = "updateGuiTheme", description = "Updates an existing GUI theme.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class},
3636
since = "4.20.0.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
3737
public class UpdateGuiThemeCmd extends BaseCmd {
3838

@@ -118,13 +118,13 @@ public Boolean getIsPublic() {
118118

119119
@Override
120120
public void execute() {
121-
GuiThemeJoinVO guiThemeJoinVO = guiThemeService.updateGuiTheme(this);
121+
GuiThemeJoin guiThemeJoin = guiThemeService.updateGuiTheme(this);
122122

123-
if (guiThemeJoinVO == null) {
123+
if (guiThemeJoin == null) {
124124
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update the GUI theme.");
125125
}
126126

127-
GuiThemeResponse response = _responseGenerator.createGuiThemeResponse(guiThemeJoinVO);
127+
GuiThemeResponse response = _responseGenerator.createGuiThemeResponse(guiThemeJoin);
128128
response.setResponseName(getCommandName());
129129
this.setResponseObject(response);
130130
}

‎api/src/main/java/org/apache/cloudstack/api/response/GuiThemeResponse.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.apache.cloudstack.api.ApiConstants;
2222
import org.apache.cloudstack.api.BaseResponse;
2323
import org.apache.cloudstack.api.EntityReference;
24-
import org.apache.cloudstack.gui.themes.GuiThemeJoinVO;
24+
import org.apache.cloudstack.gui.themes.GuiThemeJoin;
2525

2626
import java.util.Date;
2727

28-
@EntityReference(value = {GuiThemeJoinVO.class})
28+
@EntityReference(value = {GuiThemeJoin.class})
2929
public class GuiThemeResponse extends BaseResponse {
3030

3131
@SerializedName(ApiConstants.ID)

‎api/src/main/java/org/apache/cloudstack/gui/themes/GuiTheme.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package org.apache.cloudstack.gui.themes;
18+
19+
import org.apache.cloudstack.api.Identity;
20+
import org.apache.cloudstack.api.InternalIdentity;
21+
22+
import java.util.Date;
23+
24+
public interface GuiTheme extends InternalIdentity, Identity {
25+
26+
String getName();
27+
28+
String getDescription();
29+
30+
String getCss();
31+
32+
String getJsonConfiguration();
33+
34+
Date getCreated();
35+
36+
Date getRemoved();
37+
38+
boolean getIsPublic();
39+
40+
void setId(Long id);
41+
42+
void setUuid(String uuid);
43+
44+
void setName(String name);
45+
46+
void setDescription(String description);
47+
48+
void setCss(String css);
49+
50+
void setJsonConfiguration(String jsonConfiguration);
51+
52+
void setCreated(Date created);
53+
54+
void setRemoved(Date removed);
55+
56+
void setIsPublic(boolean isPublic);
57+
58+
boolean isRecursiveDomains();
59+
60+
void setRecursiveDomains(boolean recursiveDomains);
61+
}

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDao.java renamed to api/src/main/java/org/apache/cloudstack/gui/themes/GuiThemeDetails.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,23 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package org.apache.cloudstack.gui.theme.dao;
17+
package org.apache.cloudstack.gui.themes;
1818

19-
import com.cloud.utils.db.GenericDao;
20-
import org.apache.cloudstack.gui.themes.GuiThemeVO;
19+
import org.apache.cloudstack.api.InternalIdentity;
2120

22-
public interface GuiThemeDao extends GenericDao<GuiThemeVO, Long> {
21+
public interface GuiThemeDetails extends InternalIdentity {
22+
23+
void setId(Long id);
24+
25+
Long getGuiThemeId();
26+
27+
void setGuiThemeId(Long guiThemeId);
28+
29+
String getType();
30+
31+
void setType(String type);
32+
33+
String getValue();
34+
35+
void setValue(String value);
2336
}

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDao.java renamed to api/src/main/java/org/apache/cloudstack/gui/themes/GuiThemeJoin.java

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,34 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package org.apache.cloudstack.gui.theme.dao;
17+
package org.apache.cloudstack.gui.themes;
1818

19-
import com.cloud.utils.db.GenericDao;
20-
import org.apache.cloudstack.gui.themes.GuiThemeDetailsVO;
19+
import org.apache.cloudstack.api.Identity;
20+
import org.apache.cloudstack.api.InternalIdentity;
2121

22-
import java.util.List;
22+
import java.util.Date;
2323

24-
public interface GuiThemeDetailsDao extends GenericDao<GuiThemeDetailsVO, Long> {
25-
List<Long> listGuiThemeIdsByCommonName(String commonName);
24+
public interface GuiThemeJoin extends InternalIdentity, Identity {
2625

27-
List<Long> listGuiThemeIdsByDomainUuids(String domainUuid);
26+
String getName();
2827

29-
void expungeByGuiThemeId(long guiThemeId);
28+
String getDescription();
29+
30+
String getCss();
31+
32+
String getJsonConfiguration();
33+
34+
String getCommonNames();
35+
36+
String getDomains();
37+
38+
String getAccounts();
39+
40+
boolean isRecursiveDomains();
41+
42+
boolean getIsPublic();
43+
44+
Date getCreated();
45+
46+
Date getRemoved();
3047
}

0 commit comments

Comments
 (0)