Remove redundant interfaces in cmprovider

thakursir · Jun 15, 2015 · 7372ae6 · 7372ae6
1 parent 2cc935a
commit 7372ae6
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 178 deletions.
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/AcademicSessionEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/AcademicSessionEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/CanonicalCourseEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/CanonicalCourseEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/CourseOfferingEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/CourseOfferingEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/CourseSetEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/CourseSetEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/EnrollmentEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/EnrollmentEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/EnrollmentSetEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/EnrollmentSetEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/MeetingEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/MeetingEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/SectionCategoryEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/SectionCategoryEntityProvider.java
diff --git a/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/SectionEntityProvider.java b/cmprovider/api/src/java/org/sakaiproject/cmprovider/api/SectionEntityProvider.java
diff --git a/...er/AcademicSessionEntityProviderImpl.java → ...ovider/AcademicSessionEntityProvider.java b/...er/AcademicSessionEntityProviderImpl.java → ...ovider/AcademicSessionEntityProvider.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.sakaiproject.cmprovider.api.AcademicSessionEntityProvider;
 import org.sakaiproject.cmprovider.api.data.AcademicSessionData;
 import org.sakaiproject.cmprovider.api.data.util.DateUtils;
 import org.sakaiproject.coursemanagement.api.AcademicSession;
@@ -21,10 +20,10 @@
  *
  * @author Christopher Schauer
  */
-public class AcademicSessionEntityProviderImpl extends AbstractCmEntityProvider implements AcademicSessionEntityProvider {
+public class AcademicSessionEntityProvider extends AbstractCmEntityProvider {
 
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-academic-session";
   }
 
   public Object getSampleEntity() {

diff --git a/...er/CanonicalCourseEntityProviderImpl.java → ...ovider/CanonicalCourseEntityProvider.java b/...er/CanonicalCourseEntityProviderImpl.java → ...ovider/CanonicalCourseEntityProvider.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.sakaiproject.cmprovider.api.CanonicalCourseEntityProvider;
 import org.sakaiproject.cmprovider.api.data.CanonicalCourseData;
 import org.sakaiproject.coursemanagement.api.CanonicalCourse;
 import org.sakaiproject.entitybroker.EntityReference;
@@ -14,9 +13,9 @@
  *
  * @author Christopher Schauer 
  */
-public class CanonicalCourseEntityProviderImpl extends AbstractCmEntityProvider implements CanonicalCourseEntityProvider {
+public class CanonicalCourseEntityProvider extends AbstractCmEntityProvider {
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-canonical-course";
   }
 
   @Override

diff --git a/...der/CourseOfferingEntityProviderImpl.java → ...rovider/CourseOfferingEntityProvider.java b/...der/CourseOfferingEntityProviderImpl.java → ...rovider/CourseOfferingEntityProvider.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.sakaiproject.cmprovider.api.CourseOfferingEntityProvider;
 import org.sakaiproject.cmprovider.api.data.CourseOfferingData;
 import org.sakaiproject.cmprovider.api.data.MembershipData;
 import org.sakaiproject.cmprovider.api.data.util.DateUtils;
@@ -17,9 +16,9 @@
  *
  * @author Christopher Schauer
  */
-public class CourseOfferingEntityProviderImpl extends AbstractContainerEntityProvider implements CourseOfferingEntityProvider {
+public class CourseOfferingEntityProvider extends AbstractContainerEntityProvider {
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-course-offering";
   }
 
   public Object getSampleEntity() {

diff --git a/...provider/CourseSetEntityProviderImpl.java → ...t/cmprovider/CourseSetEntityProvider.java b/...provider/CourseSetEntityProviderImpl.java → ...t/cmprovider/CourseSetEntityProvider.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.sakaiproject.cmprovider.api.CourseSetEntityProvider;
 import org.sakaiproject.cmprovider.api.data.CourseSetData;
 import org.sakaiproject.cmprovider.api.data.MembershipData;
 import org.sakaiproject.coursemanagement.api.CourseSet;
@@ -17,9 +16,9 @@
  *
  * @author Christopher Schauer
  */
-public class CourseSetEntityProviderImpl extends AbstractContainerEntityProvider implements CourseSetEntityProvider {
+public class CourseSetEntityProvider extends AbstractContainerEntityProvider {
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-course-set";
   }
 
   public List getEntities(EntityReference ref, Search search) {

diff --git a/...rovider/EnrollmentEntityProviderImpl.java → .../cmprovider/EnrollmentEntityProvider.java b/...rovider/EnrollmentEntityProviderImpl.java → .../cmprovider/EnrollmentEntityProvider.java
@@ -8,7 +8,6 @@
 import org.sakaiproject.authz.api.AuthzGroup;
 import org.sakaiproject.authz.api.AuthzPermissionException;
 import org.sakaiproject.authz.api.GroupNotDefinedException;
-import org.sakaiproject.cmprovider.api.EnrollmentEntityProvider;
 import org.sakaiproject.cmprovider.api.data.EnrollmentData;
 import org.sakaiproject.cmprovider.api.data.util.DateUtils;
 import org.sakaiproject.coursemanagement.api.Enrollment;
@@ -21,9 +20,9 @@
  *
  * @author Christopher Schauer
  */
-public class EnrollmentEntityProviderImpl extends AbstractCmEntityProvider implements EnrollmentEntityProvider {
+public class EnrollmentEntityProvider extends AbstractCmEntityProvider {
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-enrollment";
   }
 
   public Object getSampleEntity() {

diff --git a/...ider/EnrollmentSetEntityProviderImpl.java → ...provider/EnrollmentSetEntityProvider.java b/...ider/EnrollmentSetEntityProviderImpl.java → ...provider/EnrollmentSetEntityProvider.java
@@ -8,7 +8,6 @@
 import org.sakaiproject.authz.api.AuthzGroup;
 import org.sakaiproject.authz.api.AuthzPermissionException;
 import org.sakaiproject.authz.api.GroupNotDefinedException;
-import org.sakaiproject.cmprovider.api.EnrollmentSetEntityProvider;
 import org.sakaiproject.cmprovider.api.data.EnrollmentSetData;
 import org.sakaiproject.coursemanagement.api.EnrollmentSet;
 import org.sakaiproject.coursemanagement.impl.EnrollmentSetCmImpl;
@@ -21,9 +20,9 @@
  *
  * @author Christopher Schauer
  */
-public class EnrollmentSetEntityProviderImpl extends AbstractCmEntityProvider implements EnrollmentSetEntityProvider {
+public class EnrollmentSetEntityProvider extends AbstractCmEntityProvider {
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-enrollment-set";
   }
 
   public Object getSampleEntity() {

diff --git a/cmprovider/impl/src/java/org/sakaiproject/cmprovider/MeetingEntityProviderImpl.java b/cmprovider/impl/src/java/org/sakaiproject/cmprovider/MeetingEntityProviderImpl.java
diff --git a/...er/SectionCategoryEntityProviderImpl.java → ...ovider/SectionCategoryEntityProvider.java b/...er/SectionCategoryEntityProviderImpl.java → ...ovider/SectionCategoryEntityProvider.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.sakaiproject.cmprovider.api.SectionCategoryEntityProvider;
 import org.sakaiproject.cmprovider.api.data.SectionCategoryData;
 import org.sakaiproject.coursemanagement.api.SectionCategory;
 import org.sakaiproject.entitybroker.EntityReference;
@@ -14,9 +13,9 @@
  * 
  * @author Christopher Schauer
  */
-public class SectionCategoryEntityProviderImpl extends AbstractCmEntityProvider implements SectionCategoryEntityProvider {
+public class SectionCategoryEntityProvider extends AbstractCmEntityProvider {
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-section-category";
   }
 
   public Object getSampleEntity() {

diff --git a/...cmprovider/SectionEntityProviderImpl.java → ...ect/cmprovider/SectionEntityProvider.java b/...cmprovider/SectionEntityProviderImpl.java → ...ect/cmprovider/SectionEntityProvider.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.sakaiproject.cmprovider.api.SectionEntityProvider;
 import org.sakaiproject.cmprovider.api.data.MembershipData;
 import org.sakaiproject.cmprovider.api.data.SectionData;
 import org.sakaiproject.coursemanagement.api.Section;
@@ -15,9 +14,9 @@
  *
  * @author Christopher Schauer
  */
-public class SectionEntityProviderImpl extends AbstractContainerEntityProvider implements SectionEntityProvider {
+public class SectionEntityProvider extends AbstractContainerEntityProvider {
   public String getEntityPrefix() {
-    return ENTITY_PREFIX;
+    return "cm-section";
   }
 
   public Object getSampleEntity() {

diff --git a/cmprovider/pack/src/webapp/WEB-INF/components.xml b/cmprovider/pack/src/webapp/WEB-INF/components.xml
@@ -17,30 +17,27 @@
     <property name="hibernateService" ref="hibernateService" />
   </bean>
 
-  <bean id="org.sakaiproject.cmprovider.api.AcademicSessionEntityProvider"
-    class="org.sakaiproject.cmprovider.AcademicSessionEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.AcademicSessionEntityProvider"
+    class="org.sakaiproject.cmprovider.AcademicSessionEntityProvider" parent="AbstractCmEntityProvider" />
 
-  <bean id="org.sakaiproject.cmprovider.api.CanonicalCourseEntityProvider"
-    class="org.sakaiproject.cmprovider.CanonicalCourseEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.CanonicalCourseEntityProvider"
+    class="org.sakaiproject.cmprovider.CanonicalCourseEntityProvider" parent="AbstractCmEntityProvider" />
 
-  <bean id="org.sakaiproject.cmprovider.api.CourseOfferingEntityProvider"
-    class="org.sakaiproject.cmprovider.CourseOfferingEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.CourseOfferingEntityProvider"
+    class="org.sakaiproject.cmprovider.CourseOfferingEntityProvider" parent="AbstractCmEntityProvider" />
 
-  <bean id="org.sakaiproject.cmprovider.api.CourseSetEntityProvider"
-    class="org.sakaiproject.cmprovider.CourseSetEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.CourseSetEntityProvider"
+    class="org.sakaiproject.cmprovider.CourseSetEntityProvider" parent="AbstractCmEntityProvider" />
 
-  <bean id="org.sakaiproject.cmprovider.api.EnrollmentEntityProvider"
-    class="org.sakaiproject.cmprovider.EnrollmentEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.EnrollmentEntityProvider"
+    class="org.sakaiproject.cmprovider.EnrollmentEntityProvider" parent="AbstractCmEntityProvider" />
 
-  <bean id="org.sakaiproject.cmprovider.api.EnrollmentSetEntityProvider"
-    class="org.sakaiproject.cmprovider.EnrollmentSetEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.EnrollmentSetEntityProvider"
+    class="org.sakaiproject.cmprovider.EnrollmentSetEntityProvider" parent="AbstractCmEntityProvider" />
 
-  <bean id="org.sakaiproject.cmprovider.api.SectionEntityProvider"
-    class="org.sakaiproject.cmprovider.SectionEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.SectionEntityProvider"
+    class="org.sakaiproject.cmprovider.SectionEntityProvider" parent="AbstractCmEntityProvider" />
 
-  <bean id="org.sakaiproject.cmprovider.api.SectionCategoryEntityProvider"
-    class="org.sakaiproject.cmprovider.SectionCategoryEntityProviderImpl" parent="AbstractCmEntityProvider" />
-
-  <bean id="org.sakaiproject.cmprovider.api.MeetingEntityProvider"
-    class="org.sakaiproject.cmprovider.MeetingEntityProviderImpl" parent="AbstractCmEntityProvider" />
+  <bean id="org.sakaiproject.cmprovider.SectionCategoryEntityProvider"
+    class="org.sakaiproject.cmprovider.SectionCategoryEntityProvider" parent="AbstractCmEntityProvider" />
 </beans>