♻️ better module naming

Signed-off-by: dseurotech <[email protected]>
eclipse · Aug 1, 2024 · 85f8407 · 85f8407
1 parent 122bff7
commit 85f8407
Show file tree

Hide file tree

Showing 181 changed files with 358 additions and 499 deletions.
diff --git a/commons-web/pom.xml → commons-jersey/pom.xml b/commons-web/pom.xml → commons-jersey/pom.xml
@@ -21,10 +21,10 @@
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kapua-commons-web</artifactId>
+    <artifactId>kapua-commons-jersey</artifactId>
     <packaging>pom</packaging>
     <modules>
         <module>rest</module>
-        <module>jersey</module>
+        <module>web</module>
     </modules>
 </project>
diff --git a/commons-web/jersey/about.html → commons-jersey/rest/about.html b/commons-web/jersey/about.html → commons-jersey/rest/about.html
diff --git a/commons-web/rest/pom.xml → commons-jersey/rest/pom.xml b/commons-web/rest/pom.xml → commons-jersey/rest/pom.xml
@@ -16,12 +16,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>kapua-commons-web</artifactId>
+        <artifactId>kapua-commons-jersey</artifactId>
         <groupId>org.eclipse.kapua</groupId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kapua-commons-web-rest</artifactId>
+    <artifactId>kapua-commons-jersey-rest</artifactId>
 
     <dependencies>
         <!-- Internal dependencies -->

diff --git a/.../rest/ExceptionConfigurationProvider.java → .../rest/ExceptionConfigurationProvider.java b/.../rest/ExceptionConfigurationProvider.java → .../rest/ExceptionConfigurationProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 public interface ExceptionConfigurationProvider {
 

diff --git a/...t/ExceptionConfigurationProviderImpl.java → ...t/ExceptionConfigurationProviderImpl.java b/...t/ExceptionConfigurationProviderImpl.java → ...t/ExceptionConfigurationProviderImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import javax.inject.Inject;
 import javax.inject.Named;

diff --git a/...commons/web/rest/JaxbContextResolver.java → ...mons/jersey/rest/JaxbContextResolver.java b/...commons/web/rest/JaxbContextResolver.java → ...mons/jersey/rest/JaxbContextResolver.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;

diff --git a/...s/web/rest/KapuaCommonApiCoreSetting.java → ...ersey/rest/KapuaCommonApiCoreSetting.java b/...s/web/rest/KapuaCommonApiCoreSetting.java → ...ersey/rest/KapuaCommonApiCoreSetting.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import javax.inject.Inject;
 

diff --git a/...b/rest/KapuaCommonApiCoreSettingKeys.java → ...y/rest/KapuaCommonApiCoreSettingKeys.java b/...b/rest/KapuaCommonApiCoreSettingKeys.java → ...y/rest/KapuaCommonApiCoreSettingKeys.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import org.eclipse.kapua.commons.setting.SettingKey;
 

diff --git a/...web/rest/KapuaSerializableBodyWriter.java → ...sey/rest/KapuaSerializableBodyWriter.java b/...web/rest/KapuaSerializableBodyWriter.java → ...sey/rest/KapuaSerializableBodyWriter.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...apua/commons/web/rest/ListBodyWriter.java → ...a/commons/jersey/rest/ListBodyWriter.java b/...apua/commons/web/rest/ListBodyWriter.java → ...a/commons/jersey/rest/ListBodyWriter.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...b/rest/MoxyJsonConfigContextResolver.java → ...y/rest/MoxyJsonConfigContextResolver.java b/...b/rest/MoxyJsonConfigContextResolver.java → ...y/rest/MoxyJsonConfigContextResolver.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import javax.ws.rs.ext.ContextResolver;
 

diff --git a/...a/commons/web/rest/RestApiErrorCodes.java → ...ommons/jersey/rest/RestApiErrorCodes.java b/...a/commons/web/rest/RestApiErrorCodes.java → ...ommons/jersey/rest/RestApiErrorCodes.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import org.eclipse.kapua.KapuaErrorCode;
 

diff --git a/...ons/web/rest/RestApiRuntimeException.java → .../jersey/rest/RestApiRuntimeException.java b/...ons/web/rest/RestApiRuntimeException.java → .../jersey/rest/RestApiRuntimeException.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import org.eclipse.kapua.KapuaRuntimeException;
 

diff --git a/...mmons/web/rest/ScopeIdParamConverter.java → ...ns/jersey/rest/ScopeIdParamConverter.java b/...mmons/web/rest/ScopeIdParamConverter.java → ...ns/jersey/rest/ScopeIdParamConverter.java
@@ -10,17 +10,17 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import java.math.BigInteger;
 import java.util.Base64;
 
 import javax.ws.rs.ext.ParamConverter;
 
+import org.eclipse.kapua.commons.jersey.rest.errors.SessionNotPopulatedException;
+import org.eclipse.kapua.commons.jersey.rest.model.ScopeId;
 import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
 import org.eclipse.kapua.commons.security.KapuaSession;
-import org.eclipse.kapua.commons.web.rest.errors.SessionNotPopulatedException;
-import org.eclipse.kapua.commons.web.rest.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
 
 public class ScopeIdParamConverter implements ParamConverter<ScopeId> {

diff --git a/...b/rest/ScopeIdParamConverterProvider.java → ...y/rest/ScopeIdParamConverterProvider.java b/...b/rest/ScopeIdParamConverterProvider.java → ...y/rest/ScopeIdParamConverterProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
@@ -19,7 +19,7 @@
 import javax.ws.rs.ext.ParamConverterProvider;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.model.ScopeId;
+import org.eclipse.kapua.commons.jersey.rest.model.ScopeId;
 
 @Provider
 public class ScopeIdParamConverterProvider implements ParamConverterProvider {

diff --git a/...t/errors/CleanJobDataExceptionMapper.java → ...t/errors/CleanJobDataExceptionMapper.java b/...t/errors/CleanJobDataExceptionMapper.java → ...t/errors/CleanJobDataExceptionMapper.java
@@ -10,15 +10,15 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
 import org.eclipse.kapua.job.engine.exception.CleanJobDataException;
 import org.eclipse.kapua.job.engine.exception.CleanJobDataExceptionInfo;
 import org.slf4j.Logger;

diff --git a/...agementRequestContentExceptionMapper.java → ...agementRequestContentExceptionMapper.java b/...agementRequestContentExceptionMapper.java → ...agementRequestContentExceptionMapper.java
@@ -10,16 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
-import org.eclipse.kapua.commons.web.rest.model.errors.DeviceManagementRequestContentExceptionInfo;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.model.errors.DeviceManagementRequestContentExceptionInfo;
 import org.eclipse.kapua.service.device.management.exception.DeviceManagementRequestContentException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...anagementResponseCodeExceptionMapper.java → ...anagementResponseCodeExceptionMapper.java b/...anagementResponseCodeExceptionMapper.java → ...anagementResponseCodeExceptionMapper.java
@@ -10,16 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
-import org.eclipse.kapua.commons.web.rest.model.errors.DeviceManagementResponseCodeExceptionInfo;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.model.errors.DeviceManagementResponseCodeExceptionInfo;
 import org.eclipse.kapua.service.device.management.exception.DeviceManagementResponseCodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...gementResponseContentExceptionMapper.java → ...gementResponseContentExceptionMapper.java b/...gementResponseContentExceptionMapper.java → ...gementResponseContentExceptionMapper.java
@@ -10,16 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
-import org.eclipse.kapua.commons.web.rest.model.errors.DeviceManagementResponseContentExceptionInfo;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.model.errors.DeviceManagementResponseContentExceptionInfo;
 import org.eclipse.kapua.service.device.management.exception.DeviceManagementResponseContentException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../DeviceManagementSendExceptionMapper.java → .../DeviceManagementSendExceptionMapper.java b/.../DeviceManagementSendExceptionMapper.java → .../DeviceManagementSendExceptionMapper.java
@@ -10,16 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
-import org.eclipse.kapua.commons.web.rest.model.errors.DeviceManagementSendExceptionInfo;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.model.errors.DeviceManagementSendExceptionInfo;
 import org.eclipse.kapua.service.device.management.exception.DeviceManagementSendException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...viceManagementTimeoutExceptionMapper.java → ...viceManagementTimeoutExceptionMapper.java b/...viceManagementTimeoutExceptionMapper.java → ...viceManagementTimeoutExceptionMapper.java
@@ -10,16 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
-import org.eclipse.kapua.commons.web.rest.model.errors.DeviceManagementTimeoutExceptionInfo;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.model.errors.DeviceManagementTimeoutExceptionInfo;
 import org.eclipse.kapua.service.device.management.exception.DeviceManagementTimeoutException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...rs/DeviceNotConnectedExceptionMapper.java → ...rs/DeviceNotConnectedExceptionMapper.java b/...rs/DeviceNotConnectedExceptionMapper.java → ...rs/DeviceNotConnectedExceptionMapper.java
@@ -10,16 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
-import org.eclipse.kapua.commons.web.rest.model.errors.DeviceNotConnectedExceptionInfo;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.model.errors.DeviceNotConnectedExceptionInfo;
 import org.eclipse.kapua.service.device.management.exception.DeviceNotConnectedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...rors/InternalUserOnlyExceptionMapper.java → ...rors/InternalUserOnlyExceptionMapper.java b/...rors/InternalUserOnlyExceptionMapper.java → ...rors/InternalUserOnlyExceptionMapper.java
@@ -10,16 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
-import org.eclipse.kapua.commons.web.rest.model.errors.InternalUserOnlyExceptionInfo;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.model.errors.InternalUserOnlyExceptionInfo;
 import org.eclipse.kapua.service.authorization.exception.InternalUserOnlyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ors/JobAlreadyRunningExceptionMapper.java → ...ors/JobAlreadyRunningExceptionMapper.java b/...ors/JobAlreadyRunningExceptionMapper.java → ...ors/JobAlreadyRunningExceptionMapper.java
@@ -10,15 +10,15 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
 import org.eclipse.kapua.job.engine.exception.JobAlreadyRunningException;
 import org.eclipse.kapua.job.engine.exception.JobAlreadyRunningExceptionInfo;
 import org.slf4j.Logger;

diff --git a/...rest/errors/JobEngineExceptionMapper.java → ...rest/errors/JobEngineExceptionMapper.java b/...rest/errors/JobEngineExceptionMapper.java → ...rest/errors/JobEngineExceptionMapper.java
@@ -10,15 +10,15 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
 import org.eclipse.kapua.job.engine.exception.JobEngineException;
 import org.eclipse.kapua.job.engine.exception.JobEngineExceptionInfo;
 import org.slf4j.Logger;

diff --git a/...rors/JobInvalidTargetExceptionMapper.java → ...rors/JobInvalidTargetExceptionMapper.java b/...rors/JobInvalidTargetExceptionMapper.java → ...rors/JobInvalidTargetExceptionMapper.java
@@ -10,15 +10,15 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
 import org.eclipse.kapua.job.engine.exception.JobInvalidTargetException;
 import org.eclipse.kapua.job.engine.exception.JobInvalidTargetExceptionInfo;
 import org.slf4j.Logger;

diff --git a/...errors/JobMissingStepExceptionMapper.java → ...errors/JobMissingStepExceptionMapper.java b/...errors/JobMissingStepExceptionMapper.java → ...errors/JobMissingStepExceptionMapper.java
@@ -10,15 +10,15 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.web.rest.errors;
+package org.eclipse.kapua.commons.jersey.rest.errors;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.kapua.commons.web.rest.ExceptionConfigurationProvider;
+import org.eclipse.kapua.commons.jersey.rest.ExceptionConfigurationProvider;
 import org.eclipse.kapua.job.engine.exception.JobMissingStepException;
 import org.eclipse.kapua.job.engine.exception.JobMissingStepExceptionInfo;
 import org.slf4j.Logger;