Added swagger tags to generate classes with custom names

.github/workflows/release-publish.yml

@@ -1,9 +1,6 @@
-name: Publish package to the Maven Central Repository and create GitHub Release
+name: Publish package to the Maven Central Repository
 
 on:
-  push:
-    tags:
-      - v*
   pull_request:
     branches: [ main ]
 

.github/workflows/snapshot-publish.yml

@@ -18,6 +18,6 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
       - name: Publish package
-        run: mvn --batch-mode deploy -DrepositoryId=github -Dmaven.deploy.skip=true
+        run: mvn --batch-mode deploy -DrepositoryId=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.extrawest</groupId>
     <artifactId>Extrawest-OCPI-2.2.1-CPO-Server</artifactId>
-    <version>2023.8.24</version>
+    <version>2023.8.27</version>
 
     <name>Extrawest-OCPI-2.2.1-CPO-Server</name>
     <description>Extrawest-OCPI-2.2.1-CPO-Server</description>
@@ -225,8 +225,8 @@
 
         <!-- GitHub Releases -->
         <snapshotRepository>
-            <id>github-releases</id>
-            <url>https://maven.pkg.github.com/extrawest/Extrawest-OCPI-2.2.1-CPO-Server</url>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/extrawest/extrawest-ocpi-2.2.1-cpo-server</url>
             <name>GitHub Package Registry</name>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>

src/main/java/com/extrawest/ocpi/controller/CPOCdrController.java

@@ -2,6 +2,7 @@
 
 import com.extrawest.ocpi.model.dto.CdrDTO;
 import com.extrawest.ocpi.service.CPOCdrService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +15,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/cdr")
+@Tag(name = "CPOCdr")
 public class CPOCdrController {
 
     protected final CPOCdrService cpoCdrService;

src/main/java/com/extrawest/ocpi/controller/CPOChargingProfilesController.java

@@ -3,6 +3,7 @@
 import com.extrawest.ocpi.model.dto.request.SetChargingProfileRequestDTO;
 import com.extrawest.ocpi.model.dto.response.ChargingProfileResponseDTO;
 import com.extrawest.ocpi.service.CPOChargingProfilesService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -11,6 +12,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/chargingProfiles")
+@Tag(name = "CPOChargingProfiles")
 public class CPOChargingProfilesController {
 
     protected final CPOChargingProfilesService cpoChargingProfilesService;

src/main/java/com/extrawest/ocpi/controller/CPOCommandsController.java

@@ -4,13 +4,15 @@
 import com.extrawest.ocpi.model.dto.response.CommandResponseDTO;
 import com.extrawest.ocpi.model.enums.CommandType;
 import com.extrawest.ocpi.service.CPOCommandsService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/commands")
+@Tag(name = "CPOCommands")
 public class CPOCommandsController {
 
     protected final CPOCommandsService cpoCommandsService;

src/main/java/com/extrawest/ocpi/controller/CPOCredentialsController.java

@@ -2,6 +2,7 @@
 
 import com.extrawest.ocpi.model.dto.CredentialsDTO;
 import com.extrawest.ocpi.service.CPOCredentialsService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -10,6 +11,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/credentials")
+@Tag(name = "CPOCredentials")
 public class CPOCredentialsController {
 
     protected final CPOCredentialsService cpoCredentialsService;

src/main/java/com/extrawest/ocpi/controller/CPOLocationController.java

@@ -3,6 +3,7 @@
 import com.extrawest.ocpi.model.AbstractDomainObject;
 import com.extrawest.ocpi.model.dto.LocationDTO;
 import com.extrawest.ocpi.service.CPOLocationService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +16,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/locations")
+@Tag(name = "CPOLocation")
 public class CPOLocationController {
 
     protected final CPOLocationService cpoLocationService;

src/main/java/com/extrawest/ocpi/controller/CPOSessionsController.java

@@ -3,6 +3,7 @@
 import com.extrawest.ocpi.model.dto.ChargingPreferencesDTO;
 import com.extrawest.ocpi.model.dto.SessionDTO;
 import com.extrawest.ocpi.service.CPOSessionsService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -13,6 +14,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/sessions")
+@Tag(name = "CPOSessions")
 public class CPOSessionsController {
 
     protected final CPOSessionsService cpoSessionsService;

src/main/java/com/extrawest/ocpi/controller/CPOTariffController.java

@@ -2,6 +2,7 @@
 
 import com.extrawest.ocpi.model.dto.TariffDTO;
 import com.extrawest.ocpi.service.CPOTariffService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +15,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/tariffs")
+@Tag(name = "CPOTariff")
 public class CPOTariffController {
 
     protected final CPOTariffService CPOTariffService;

src/main/java/com/extrawest/ocpi/controller/CPOTokensController.java

@@ -3,6 +3,7 @@
 import com.extrawest.ocpi.model.dto.TokenDTO;
 import com.extrawest.ocpi.model.enums.TokenType;
 import com.extrawest.ocpi.service.CPOTokensService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -11,6 +12,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/tokens")
+@Tag(name = "CPOTokens")
 public class CPOTokensController {
 
     protected final CPOTokensService cpoTokensService;

src/main/java/com/extrawest/ocpi/controller/CPOVersionController.java

@@ -4,6 +4,7 @@
 import com.extrawest.ocpi.model.dto.response.VersionResponseDTO;
 import com.extrawest.ocpi.model.enums.VersionNumber;
 import com.extrawest.ocpi.service.CPOVersionService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +16,7 @@
 
 @RestController
 @RequestMapping("/cpo/api/2.2.1/versions")
+@Tag(name = "CPOVersion")
 public class CPOVersionController {
 
     protected final CPOVersionService cpoVersionService;

src/main/java/com/extrawest/ocpi/controller/ClientInfoController.java

@@ -2,13 +2,15 @@
 
 import com.extrawest.ocpi.model.dto.ClientInfoDTO;
 import com.extrawest.ocpi.service.ClientInfoService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.constraints.Max;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/2.2.1/hubClientInfo")
+@Tag(name = "ClientInfo")
 public class ClientInfoController {
 
     protected final ClientInfoService clientInfoService;

src/main/java/com/extrawest/ocpi/controller/HubClientInfoController.java

@@ -2,6 +2,7 @@
 
 import com.extrawest.ocpi.model.dto.ClientInfoDTO;
 import com.extrawest.ocpi.service.HubClientInfoService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +15,7 @@
 
 @RestController
 @RequestMapping("/hub/api/2.2.1/hubClientInfo")
+@Tag(name = "HubClientInfo")
 public class HubClientInfoController {
 
     protected final HubClientInfoService hubClientInfoService;