refactor input transport adaptors

pull/17/head
Amalka Subasinghe 2 years ago
parent 9e7f36bc01
commit 66d7edf6ed

@ -49,33 +49,33 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>
org.wso2.carbon.device.mgt.input.adapter.extension.internal,
org.wso2.carbon.device.mgt.input.adapter.extension.internal.*
</Private-Package>
<Export-Package>
org.wso2.carbon.device.mgt.input.adapter.extension.*,
!org.wso2.carbon.device.mgt.input.adapter.extension.internal,
</Export-Package>
<Import-Package>
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}",
com.jayway.jsonpath,
org.apache.commons.logging,
org.json.simple,
org.json.simple.parser
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>
io.entgra.device.mgt.plugins.input.adapter.extension.internal,
io.entgra.device.mgt.plugins.input.adapter.extension.internal.*
</Private-Package>
<Export-Package>
io.entgra.device.mgt.plugins.input.adapter.extension.*,
!io.entgra.device.mgt.plugins.input.adapter.extension.internal,
</Export-Package>
<Import-Package>
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}",
com.jayway.jsonpath,
org.apache.commons.logging,
org.json.simple,
org.json.simple.parser
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>

@ -1,6 +1,6 @@
package org.wso2.carbon.device.mgt.input.adapter.extension;
package io.entgra.device.mgt.plugins.input.adapter.extension;
import org.wso2.carbon.device.mgt.input.adapter.extension.internal.InputAdapterServiceDataHolder;
import io.entgra.device.mgt.plugins.input.adapter.extension.internal.InputAdapterServiceDataHolder;
/**
* This hold the input adapter extension service implementation.

@ -15,31 +15,31 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.extension.internal;
package io.entgra.device.mgt.plugins.input.adapter.extension.internal;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionServiceImpl;
import org.wso2.carbon.device.mgt.input.adapter.extension.transformer.DefaultContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.transformer.MQTTContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.validator.DefaultContentValidator;
import org.wso2.carbon.device.mgt.input.adapter.extension.validator.HTTPContentValidator;
import org.wso2.carbon.device.mgt.input.adapter.extension.validator.MQTTContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService;
import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionServiceImpl;
import io.entgra.device.mgt.plugins.input.adapter.extension.transformer.DefaultContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.transformer.MQTTContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.validator.DefaultContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.validator.HTTPContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.validator.MQTTContentValidator;
/**
* @scr.component name="input.adapter.extension.adapterService.component" immediate="true"
* @scr.reference name="InputAdapterServiceComponent.content.validator.service"
* interface="org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator"
* interface="io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator"
* cardinality="0..n"
* policy="dynamic"
* bind="setContentValidator"
* unbind="unsetContentValidator"
* @scr.reference name="InputAdapterServiceComponent.transformer.service"
* interface="org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer"
* interface="io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer"
* cardinality="0..n"
* policy="dynamic"
* bind="setContentTransformer"

@ -12,10 +12,10 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.extension.internal;
package io.entgra.device.mgt.plugins.input.adapter.extension.internal;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator;
import java.util.HashMap;
import java.util.Map;

@ -16,9 +16,9 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.extension.transformer;
package io.entgra.device.mgt.plugins.input.adapter.extension.transformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
import java.util.Map;

@ -16,16 +16,15 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.extension.transformer;
package io.entgra.device.mgt.plugins.input.adapter.extension.transformer;
import com.jayway.jsonpath.JsonPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
import java.util.Map;

@ -16,10 +16,10 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.extension.validator;
package io.entgra.device.mgt.plugins.input.adapter.extension.validator;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentInfo;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentInfo;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator;
import java.util.Map;

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.extension.validator;
package io.entgra.device.mgt.plugins.input.adapter.extension.validator;
import com.jayway.jsonpath.JsonPath;
import org.apache.commons.logging.Log;
@ -24,10 +24,9 @@ import org.apache.commons.logging.LogFactory;
import org.json.simple.JSONArray;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentInfo;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentInfo;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator;
import java.util.List;
import java.util.Map;
public class HTTPContentValidator implements ContentValidator {

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.extension.validator;
package io.entgra.device.mgt.plugins.input.adapter.extension.validator;
import com.jayway.jsonpath.JsonPath;
import org.apache.commons.logging.Log;
@ -24,8 +24,8 @@ import org.apache.commons.logging.LogFactory;
import org.json.simple.JSONArray;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentInfo;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentInfo;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator;
import java.util.Map;

@ -125,13 +125,13 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>
org.wso2.carbon.device.mgt.input.adapter.http.internal,
org.wso2.carbon.device.mgt.input.adapter.http.internal.*
io.entgra.device.mgt.plugins.input.adapter.http.internal,
io.entgra.device.mgt.plugins.input.adapter.http.internal.*
</Private-Package>
<Export-Package>
!org.wso2.carbon.device.mgt.input.adapter.http.internal,
!org.wso2.carbon.device.mgt.input.adapter.http.internal.*,
org.wso2.carbon.device.mgt.input.adapter.http.*
!io.entgra.device.mgt.plugins.input.adapter.http.internal,
!io.entgra.device.mgt.plugins.input.adapter.http.internal.*,
io.entgra.device.mgt.plugins.input.adapter.http.*
</Export-Package>
<Import-Package>
org.wso2.carbon.event.input.adapter.core,
@ -154,7 +154,7 @@
feign.auth,
feign.codec,
feign.gson,
org.wso2.carbon.device.mgt.input.adapter.extension,
io.entgra.device.mgt.plugins.input.adapter.extension.*,
org.apache.axiom.util.base64,
org.apache.axis2.*,
org.apache.commons.httpclient.*,

@ -13,15 +13,15 @@
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http;
package io.entgra.device.mgt.plugins.input.adapter.http;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.service.http.HttpService;
import org.osgi.service.http.NamespaceException;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.input.adapter.http.internal.InputAdapterServiceDataHolder;
import org.wso2.carbon.device.mgt.input.adapter.http.util.HTTPEventAdapterConstants;
import io.entgra.device.mgt.plugins.input.adapter.http.internal.InputAdapterServiceDataHolder;
import io.entgra.device.mgt.plugins.input.adapter.http.util.HTTPEventAdapterConstants;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapter;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;

@ -12,14 +12,14 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http;
package io.entgra.device.mgt.plugins.input.adapter.http;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapter;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
import org.wso2.carbon.event.input.adapter.core.MessageType;
import org.wso2.carbon.event.input.adapter.core.Property;
import org.wso2.carbon.device.mgt.input.adapter.http.util.HTTPEventAdapterConstants;
import io.entgra.device.mgt.plugins.input.adapter.http.util.HTTPEventAdapterConstants;
import org.wso2.carbon.utils.CarbonUtils;
import java.util.ArrayList;

@ -13,25 +13,19 @@
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http;
package io.entgra.device.mgt.plugins.input.adapter.http;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.DeviceAuthorizer;
import io.entgra.device.mgt.plugins.input.adapter.http.internal.InputAdapterServiceDataHolder;
import io.entgra.device.mgt.plugins.input.adapter.http.oauth.OAuthAuthenticator;
import io.entgra.device.mgt.plugins.input.adapter.http.util.AuthenticationInfo;
import io.entgra.device.mgt.plugins.input.adapter.http.util.HTTPEventAdapterConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.DeviceAuthorizer;
import org.wso2.carbon.device.mgt.input.adapter.http.internal.InputAdapterServiceDataHolder;
import org.wso2.carbon.device.mgt.input.adapter.http.oauth.OAuthAuthenticator;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentInfo;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.transformer.DefaultContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.validator.DefaultContentValidator;
import org.wso2.carbon.device.mgt.input.adapter.http.exception.HTTPContentInitializationException;
import org.wso2.carbon.device.mgt.input.adapter.http.jwt.JWTAuthenticator;
import org.wso2.carbon.device.mgt.input.adapter.http.util.AuthenticationInfo;
import org.wso2.carbon.device.mgt.input.adapter.http.util.HTTPEventAdapterConstants;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.*;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.jwt;
package io.entgra.device.mgt.plugins.input.adapter.http;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWSVerifier;
@ -27,8 +27,8 @@ import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.core.util.KeyStoreManager;
import org.wso2.carbon.device.mgt.input.adapter.http.internal.InputAdapterServiceDataHolder;
import org.wso2.carbon.device.mgt.input.adapter.http.util.AuthenticationInfo;
import io.entgra.device.mgt.plugins.input.adapter.http.internal.InputAdapterServiceDataHolder;
import io.entgra.device.mgt.plugins.input.adapter.http.util.AuthenticationInfo;
import org.wso2.carbon.user.api.TenantManager;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.api.UserStoreManager;

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.authorization;
package io.entgra.device.mgt.plugins.input.adapter.http.authorization;
import feign.Client;
import feign.Feign;
@ -30,13 +30,13 @@ import feign.slf4j.Slf4jLogger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.base.ServerConfiguration;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.OAuthRequestInterceptor;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.AuthorizationRequest;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.DeviceAccessAuthorizationAdminService;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.DeviceAuthorizationResult;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.DeviceIdentifier;
import org.wso2.carbon.device.mgt.input.adapter.http.util.AuthenticationInfo;
import org.wso2.carbon.device.mgt.input.adapter.http.util.PropertyUtils;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.OAuthRequestInterceptor;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.AuthorizationRequest;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.DeviceAccessAuthorizationAdminService;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.DeviceAuthorizationResult;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.DeviceIdentifier;
import io.entgra.device.mgt.plugins.input.adapter.http.util.AuthenticationInfo;
import io.entgra.device.mgt.plugins.input.adapter.http.util.PropertyUtils;
import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterException;
import javax.net.ssl.*;

@ -12,7 +12,7 @@
*
*/
package org.wso2.carbon.device.mgt.input.adapter.http.authorization.client;
package io.entgra.device.mgt.plugins.input.adapter.http.authorization.client;
import feign.Client;
import feign.Feign;
@ -30,12 +30,12 @@ import feign.slf4j.Slf4jLogger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.base.ServerConfiguration;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.AccessTokenInfo;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.ApiApplicationKey;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.ApiApplicationRegistrationService;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.ApiRegistrationProfile;
import org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto.TokenIssuerService;
import org.wso2.carbon.device.mgt.input.adapter.http.util.PropertyUtils;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.AccessTokenInfo;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.ApiApplicationKey;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.ApiApplicationRegistrationService;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.ApiRegistrationProfile;
import io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto.TokenIssuerService;
import io.entgra.device.mgt.plugins.input.adapter.http.util.PropertyUtils;
import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterException;
import javax.net.ssl.*;

@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and limitations under the License.
*
*/
package org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto;
package io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;

@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and limitations under the License.
*
*/
package org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto;
package io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto;
import java.util.List;

@ -24,7 +24,7 @@
* See the License for the specific language governing permissions and limitations under the License.
*
*/
package org.wso2.carbon.device.mgt.input.adapter.http.authorization.client.dto;
package io.entgra.device.mgt.plugins.input.adapter.http.authorization.client.dto;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.exception;
package io.entgra.device.mgt.plugins.input.adapter.http.exception;
/**
* This exception will thrown when content validator is failed to intialiaze.

@ -15,16 +15,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.internal;
package io.entgra.device.mgt.plugins.input.adapter.http.internal;
import io.entgra.device.mgt.plugins.input.adapter.http.HTTPEventAdapterFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.device.mgt.input.adapter.http.HTTPEventAdapterFactory;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
import org.wso2.carbon.user.core.service.RealmService;
import io.entgra.device.mgt.plugins.input.adapter.extension.*;
/**
* @scr.component name="input.iot.http.AdapterService.component" immediate="true"
@ -38,7 +38,7 @@ import org.wso2.carbon.user.core.service.RealmService;
* policy="dynamic"
* bind="setHttpService"
* unbind="unsetHttpService"
* @scr.reference name="input.extension.service" interface="org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService"
* @scr.reference name="input.extension.service" interface="io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService"
* cardinality="1..1"
* policy="dynamic"
* bind="setInputAdapterExtensionService"

@ -12,11 +12,11 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.internal;
package io.entgra.device.mgt.plugins.input.adapter.http.internal;
import org.osgi.service.http.HttpService;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.user.core.service.RealmService;
import io.entgra.device.mgt.plugins.input.adapter.extension.*;
/**
* common place to hold some OSGI service references.

@ -16,15 +16,15 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.oauth;
package io.entgra.device.mgt.plugins.input.adapter.http.oauth;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.wso2.carbon.device.mgt.input.adapter.http.internal.InputAdapterServiceDataHolder;
import org.wso2.carbon.device.mgt.input.adapter.http.util.AuthenticationInfo;
import io.entgra.device.mgt.plugins.input.adapter.http.internal.InputAdapterServiceDataHolder;
import io.entgra.device.mgt.plugins.input.adapter.http.util.AuthenticationInfo;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO;

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.oauth;
package io.entgra.device.mgt.plugins.input.adapter.http.oauth;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@ -33,8 +33,8 @@ import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
import org.apache.commons.pool.BasePoolableObjectFactory;
import org.apache.log4j.Logger;
import org.wso2.carbon.core.util.Utils;
import org.wso2.carbon.device.mgt.input.adapter.http.oauth.exception.OAuthTokenValidationException;
import org.wso2.carbon.device.mgt.input.adapter.http.util.HTTPEventAdapterConstants;
import io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception.OAuthTokenValidationException;
import io.entgra.device.mgt.plugins.input.adapter.http.util.HTTPEventAdapterConstants;
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
import java.io.IOException;

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.oauth.exception;
package io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception;
/**
* This Exception will be thrown, when there any interference with token validation flow.

@ -12,7 +12,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.http.util;
package io.entgra.device.mgt.plugins.input.adapter.http.util;
/**
* This holds the constants related to HTTP event adapter.

@ -117,13 +117,13 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>
org.wso2.carbon.device.mgt.input.adapter.mqtt.internal,
org.wso2.carbon.device.mgt.input.adapter.mqtt.internal.*
io.entgra.device.mgt.plugins.input.adapter.mqtt.internal,
io.entgra.device.mgt.plugins.input.adapter.mqtt.internal.*
</Private-Package>
<Export-Package>
!org.wso2.carbon.device.mgt.input.adapter.mqtt.internal,
!org.wso2.carbon.device.mgt.input.adapter.mqtt.internal.*,
org.wso2.carbon.device.mgt.input.adapter.mqtt.*
!io.entgra.device.mgt.plugins.input.adapter.mqtt.internal,
!io.entgra.device.mgt.plugins.input.adapter.mqtt.internal.*,
io.entgra.device.mgt.plugins.input.adapter.mqtt.*
</Export-Package>
<Import-Package>
org.wso2.carbon.event.input.adapter.core,
@ -150,7 +150,7 @@
org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.wso2.carbon.core,
org.wso2.carbon.device.mgt.input.adapter.extension,
io.entgra.device.mgt.plugins.input.adapter.extension,
org.wso2.carbon.user.api,
org.wso2.carbon.utils.multitenancy,
org.apache.axis2.context,

@ -15,15 +15,14 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt.internal;
package io.entgra.device.mgt.plugins.input.adapter.mqtt;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.device.mgt.input.adapter.mqtt.MQTTEventAdapterFactory;
import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;
import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
@ -31,7 +30,7 @@ import org.wso2.carbon.utils.ConfigurationContextService;
/**
* @scr.component name="input.iot.mqtt.AdapterService.component" immediate="true"
* @scr.reference name="input.extension.service" interface="org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService"
* @scr.reference name="input.extension.service" interface="io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService"
* cardinality="1..1"
* policy="dynamic"
* bind="setInputAdapterExtensionService"

@ -12,11 +12,11 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt.internal;
package io.entgra.device.mgt.plugins.input.adapter.mqtt;
import org.apache.axis2.context.ConfigurationContext;
import org.osgi.service.http.HttpService;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService;
import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;

@ -15,13 +15,13 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt;
package io.entgra.device.mgt.plugins.input.adapter.mqtt;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.core.ServerStatus;
import org.wso2.carbon.device.mgt.input.adapter.mqtt.util.MQTTAdapterListener;
import org.wso2.carbon.device.mgt.input.adapter.mqtt.util.MQTTBrokerConnectionConfiguration;
import org.wso2.carbon.device.mgt.input.adapter.mqtt.util.MQTTEventAdapterConstants;
import io.entgra.device.mgt.plugins.input.adapter.mqtt.util.MQTTAdapterListener;
import io.entgra.device.mgt.plugins.input.adapter.mqtt.util.MQTTBrokerConnectionConfiguration;
import io.entgra.device.mgt.plugins.input.adapter.mqtt.util.MQTTEventAdapterConstants;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapter;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;

@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt;
package io.entgra.device.mgt.plugins.input.adapter.mqtt;
import org.wso2.carbon.device.mgt.input.adapter.mqtt.util.MQTTEventAdapterConstants;
import io.entgra.device.mgt.plugins.input.adapter.mqtt.util.MQTTEventAdapterConstants;
import org.wso2.carbon.event.input.adapter.core.*;
import java.util.*;

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt.exception;
package io.entgra.device.mgt.plugins.input.adapter.mqtt.exception;
/**
* This exception will thrown when content validator is failed to intialiaze.

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt.util;
package io.entgra.device.mgt.plugins.input.adapter.mqtt.util;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
@ -32,10 +32,10 @@ import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.core.ServerStatus;
import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentInfo;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import org.wso2.carbon.device.mgt.input.adapter.mqtt.internal.InputAdapterServiceDataHolder;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentInfo;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.mqtt.InputAdapterServiceDataHolder;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;
import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterRuntimeException;

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt.util;
package io.entgra.device.mgt.plugins.input.adapter.mqtt.util;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterException;

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.mqtt.util;
package io.entgra.device.mgt.plugins.input.adapter.mqtt.util;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterException;

@ -97,22 +97,22 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>
org.wso2.carbon.device.mgt.input.adapter.thrift.internal,
org.wso2.carbon.device.mgt.input.adapter.thrift.internal.*,
</Private-Package>
io.entgra.device.mgt.plugins.input.adapter.thrift.internal,
io.entgra.device.mgt.plugins.input.adapter.thrift.internal.*,
</Private-Package>
<Export-Package>
!org.wso2.carbon.device.mgt.input.adapter.thrift.internal,
!org.wso2.carbon.device.mgt.input.adapter.thrift.internal.*,
org.wso2.carbon.device.mgt.input.adapter.thrift.*,
</Export-Package>
!io.entgra.device.mgt.plugins.input.adapter.thrift.internal,
!io.entgra.device.mgt.plugins.input.adapter.thrift.internal.*,
io.entgra.device.mgt.plugins.input.adapter.thrift.*,
</Export-Package>
<Import-Package>
org.wso2.carbon.event.input.adapter.core,
org.wso2.carbon.event.input.adapter.core.*,
!javax.xml.namespace,
javax.xml.namespace; version=0.0.0,
org.apache.commons.logging,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.wso2.carbon.databridge.commons,
org.wso2.carbon.databridge.core,

@ -12,12 +12,12 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.thrift;
package io.entgra.device.mgt.plugins.input.adapter.thrift;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.input.adapter.thrift.internal.ThriftEventAdapterServiceHolder;
import io.entgra.device.mgt.plugins.input.adapter.thrift.internal.ThriftEventAdapterServiceHolder;
import org.wso2.carbon.event.input.adapter.core.EventAdapterConstants;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapter;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;

@ -12,7 +12,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.thrift;
package io.entgra.device.mgt.plugins.input.adapter.thrift;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapter;

@ -12,7 +12,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.thrift.internal;
package io.entgra.device.mgt.plugins.input.adapter.thrift.internal;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
@ -25,9 +25,9 @@ import org.wso2.carbon.databridge.commons.Event;
import org.wso2.carbon.databridge.commons.StreamDefinition;
import org.wso2.carbon.databridge.core.AgentCallback;
import org.wso2.carbon.databridge.core.DataBridgeSubscriberService;
import org.wso2.carbon.device.mgt.input.adapter.thrift.ThriftAdapter;
import io.entgra.device.mgt.plugins.input.adapter.thrift.ThriftAdapter;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
import org.wso2.carbon.device.mgt.input.adapter.thrift.ThriftEventAdapterFactory;
import io.entgra.device.mgt.plugins.input.adapter.thrift.ThriftEventAdapterFactory;
import org.wso2.carbon.utils.ConfigurationContextService;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;

@ -12,11 +12,11 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.thrift.internal;
package io.entgra.device.mgt.plugins.input.adapter.thrift.internal;
import org.apache.axis2.context.ConfigurationContext;
import org.wso2.carbon.databridge.core.DataBridgeSubscriberService;
import org.wso2.carbon.device.mgt.input.adapter.thrift.ThriftAdapter;
import io.entgra.device.mgt.plugins.input.adapter.thrift.ThriftAdapter;
import java.util.concurrent.ConcurrentHashMap;

@ -101,13 +101,13 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>
org.wso2.carbon.device.mgt.input.adapter.xmpp.internal,
org.wso2.carbon.device.mgt.input.adapter.http.internal.*
io.entgra.device.mgt.plugins.input.adapter.xmpp.internal,
io.entgra.device.mgt.plugins.input.adapter.http.internal.*
</Private-Package>
<Export-Package>
!org.wso2.carbon.device.mgt.input.adapter.xmpp.internal,
!org.wso2.carbon.device.mgt.input.adapter.xmpp.internal.*,
org.wso2.carbon.device.mgt.input.adapter.xmpp.*
!io.entgra.device.mgt.plugins.input.adapter.xmpp.internal,
!io.entgra.device.mgt.plugins.input.adapter.xmpp.internal.*,
io.entgra.device.mgt.plugins.input.adapter.xmpp.*
</Export-Package>
<Import-Package>
org.wso2.carbon.event.input.adapter.core,
@ -117,13 +117,13 @@
org.apache.log4j,
org.wso2.carbon.base,
org.wso2.carbon.core.util,
org.apache.commons.logging,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.wso2.carbon.core,
org.wso2.carbon.device.mgt.input.adapter.extension,
org.wso2.carbon.user.core.service
org.apache.commons.logging,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.wso2.carbon.core,
io.entgra.device.mgt.plugins.input.adapter.extension,
org.wso2.carbon.user.core.service
</Import-Package>
</instructions>
</configuration>

@ -15,12 +15,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.xmpp;
package io.entgra.device.mgt.plugins.input.adapter.xmpp;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.input.adapter.xmpp.util.XMPPAdapterListener;
import org.wso2.carbon.device.mgt.input.adapter.xmpp.util.XMPPEventAdapterConstants;
import org.wso2.carbon.device.mgt.input.adapter.xmpp.util.XMPPServerConnectionConfiguration;
import io.entgra.device.mgt.plugins.input.adapter.xmpp.util.XMPPAdapterListener;
import io.entgra.device.mgt.plugins.input.adapter.xmpp.util.XMPPEventAdapterConstants;
import io.entgra.device.mgt.plugins.input.adapter.xmpp.util.XMPPServerConnectionConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapter;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;

@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.xmpp;
package io.entgra.device.mgt.plugins.input.adapter.xmpp;
import org.wso2.carbon.device.mgt.input.adapter.xmpp.util.XMPPEventAdapterConstants;
import io.entgra.device.mgt.plugins.input.adapter.xmpp.util.XMPPEventAdapterConstants;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapter;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.xmpp.exception;
package io.entgra.device.mgt.plugins.input.adapter.xmpp.exception;
/**
* This exception will thrown when content validator is failed to intialiaze.

@ -15,14 +15,14 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.xmpp.internal;
package io.entgra.device.mgt.plugins.input.adapter.xmpp.internal;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.device.mgt.input.adapter.xmpp.XMPPEventAdapterFactory;
import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService;
import io.entgra.device.mgt.plugins.input.adapter.xmpp.XMPPEventAdapterFactory;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
import org.wso2.carbon.user.core.service.RealmService;
@ -31,7 +31,7 @@ import org.wso2.carbon.user.core.service.RealmService;
* @scr.reference name="user.realmservice.default"
* interface="org.wso2.carbon.user.core.service.RealmService" cardinality="1..1"
* policy="dynamic" bind="setRealmService" unbind="unsetRealmService"
* @scr.reference name="input.extension.service" interface="org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService"
* @scr.reference name="input.extension.service" interface="io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService"
* cardinality="1..1"
* policy="dynamic"
* bind="setInputAdapterExtensionService"

@ -12,10 +12,10 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.xmpp.internal;
package io.entgra.device.mgt.plugins.input.adapter.xmpp.internal;
import org.osgi.service.http.HttpService;
import org.wso2.carbon.device.mgt.input.adapter.extension.InputAdapterExtensionService;
import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService;
import org.wso2.carbon.user.core.service.RealmService;
/**

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.xmpp.util;
package io.entgra.device.mgt.plugins.input.adapter.xmpp.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -32,13 +32,12 @@ import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.core.ServerStatus;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentInfo;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.ContentValidator;
import org.wso2.carbon.device.mgt.input.adapter.extension.transformer.DefaultContentTransformer;
import org.wso2.carbon.device.mgt.input.adapter.extension.validator.DefaultContentValidator;
import org.wso2.carbon.device.mgt.input.adapter.xmpp.exception.XMPPContentInitializationException;
import org.wso2.carbon.device.mgt.input.adapter.xmpp.internal.InputAdapterServiceDataHolder;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentInfo;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.transformer.DefaultContentTransformer;
import io.entgra.device.mgt.plugins.input.adapter.extension.validator.DefaultContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.xmpp.internal.InputAdapterServiceDataHolder;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;
import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterRuntimeException;
import java.util.HashMap;

@ -15,9 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.input.adapter.xmpp.util;
import java.util.Map;
package io.entgra.device.mgt.plugins.input.adapter.xmpp.util;
/**
* This holds the configurations related to MQTT Broker.
Loading…
Cancel
Save