Add interface for Dao classes

Author: BryanMLima

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDao.java

@@ -0,0 +1,24 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// the License.  You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gui.theme.GuiThemeVO;
+
+public interface GuiThemeDao extends GenericDao<GuiThemeVO, Long> {
+
+}

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDaoImpl.java

@@ -16,11 +16,10 @@
 // under the License.
 package org.apache.cloudstack.gui.theme.dao;
 
-import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.db.GenericDaoBase;
 import org.apache.cloudstack.gui.theme.GuiThemeVO;
 import org.springframework.stereotype.Component;
 
 @Component
-public class GuiThemeDaoImpl extends GenericDaoBase<GuiThemeVO, Long> implements GenericDao<GuiThemeVO, Long> {
+public class GuiThemeDaoImpl extends GenericDaoBase<GuiThemeVO, Long> implements GuiThemeDao {
 }

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDao.java

@@ -0,0 +1,30 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gui.theme.GuiThemeDetailsVO;
+
+import java.util.List;
+
+public interface GuiThemeDetailsDao extends GenericDao<GuiThemeDetailsVO, Long> {
+    List<Long> listGuiThemeIdsByCommonName(String commonName);
+
+    List<Long> listGuiThemeIdsByDomainUuids(String domainUuid);
+
+    void expungeByGuiThemeId(long guiThemeId);
+}

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDaoImpl.java

@@ -18,7 +18,6 @@
 
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
-import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
 import com.cloud.utils.db.JoinBuilder;
@@ -33,13 +32,13 @@
 import java.util.List;
 
 @Component
-public class GuiThemeDetailsDaoImpl extends GenericDaoBase<GuiThemeDetailsVO, Long> implements GenericDao<GuiThemeDetailsVO, Long> {
+public class GuiThemeDetailsDaoImpl extends GenericDaoBase<GuiThemeDetailsVO, Long> implements GuiThemeDetailsDao {
 
     @Inject
     DomainDao domainDao;
 
     @Inject
-    GuiThemeDaoImpl guiThemeDao;
+    GuiThemeDao guiThemeDao;
 
     public List<Long> listGuiThemeIdsByCommonName(String commonName) {
         GenericSearchBuilder<GuiThemeDetailsVO, Long> detailsDaoSearchBuilder = createSearchBuilder(Long.class);

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDao.java

@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gui.theme.GuiThemeJoinVO;
+
+import java.util.List;
+
+public interface GuiThemeJoinDao extends GenericDao<GuiThemeJoinVO, Long> {
+    GuiThemeJoinVO findDefaultTheme();
+
+    Pair<List<GuiThemeJoinVO>, Integer> listGuiThemesWithNoAuthentication(String commonName);
+
+    Pair<List<GuiThemeJoinVO>, Integer> listGuiThemes(Long id, String name, String commonName, String domainUuid, String accountUuid, boolean listAll, boolean showRemoved, Boolean showPublic);
+}

engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDaoImpl.java

@@ -18,7 +18,6 @@
 
 import com.cloud.utils.Pair;
 import com.cloud.utils.db.Filter;
-import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -33,9 +32,9 @@
 import java.util.List;
 
 @Component
-public class GuiThemeJoinDaoImpl extends GenericDaoBase<GuiThemeJoinVO, Long> implements GenericDao<GuiThemeJoinVO, Long> {
+public class GuiThemeJoinDaoImpl extends GenericDaoBase<GuiThemeJoinVO, Long> implements GuiThemeJoinDao {
     @Inject
-    GuiThemeDetailsDaoImpl guiThemeDetailsDao;
+    GuiThemeDetailsDao guiThemeDetailsDao;
 
     public static final Long INVALID_ID = -1L;
 

server/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImpl.java

@@ -40,12 +40,13 @@
 import org.apache.cloudstack.api.response.GuiThemeResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.gui.theme.dao.GuiThemeDaoImpl;
-import org.apache.cloudstack.gui.theme.dao.GuiThemeDetailsDaoImpl;
-import org.apache.cloudstack.gui.theme.dao.GuiThemeJoinDaoImpl;
+import org.apache.cloudstack.gui.theme.dao.GuiThemeDao;
+import org.apache.cloudstack.gui.theme.dao.GuiThemeDetailsDao;
+import org.apache.cloudstack.gui.theme.dao.GuiThemeJoinDao;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
 import java.util.ArrayList;
@@ -54,6 +55,7 @@
 import java.util.Map;
 import java.util.Set;
 
+@Component
 public class GuiThemeServiceImpl implements GuiThemeService {
 
     protected Logger logger = LogManager.getLogger(getClass());
@@ -69,13 +71,13 @@ public class GuiThemeServiceImpl implements GuiThemeService {
     private static final String PLUGINS = "plugins";
 
     @Inject
-    GuiThemeDaoImpl guiThemeDao;
+    GuiThemeDao guiThemeDao;
 
     @Inject
-    GuiThemeDetailsDaoImpl guiThemeDetailsDao;
+    GuiThemeDetailsDao guiThemeDetailsDao;
 
     @Inject
-    GuiThemeJoinDaoImpl guiThemeJoinDao;
+    GuiThemeJoinDao guiThemeJoinDao;
 
     @Inject
     ResponseGenerator responseGenerator;