Skip to content

Commit b701871

Browse files
jojllmanjojllman
committed
Remove unnecessary functions.
1 parent 8a3315f commit b701871

31 files changed

+83
-766
lines changed

‎META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: IoT-Gateway
4-
Bundle-SymbolicName: tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway
4+
Bundle-SymbolicName: tw.edu.ntust.connectivitylab.jojllman.kura.gativity
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: jojllman
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

‎OSGI-INF/component.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" modified="update" name="tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway">
3-
<implementation class="tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.GatewayServiceActivator"/>
3+
<implementation class="tw.edu.ntust.connectivitylab.jojllman.kura.gativity.GatewayServiceActivator"/>
44
</scr:component>

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>tw.edu.ntust.connectivitylab.jojllman.kura</groupId>
5-
<artifactId>iot-gateway</artifactId>
5+
<artifactId>gativity</artifactId>
66
<version>1.0.0</version>
77
<packaging>bundle</packaging>
88
<repositories>
@@ -24,7 +24,7 @@
2424
<Bundle-Name>${project.name}</Bundle-Name>
2525
<Bundle-Version>${project.version}</Bundle-Version>
2626
<Export-EJB>ALL</Export-EJB>
27-
<Private-Package>tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.*</Private-Package>+
27+
<Private-Package>tw.edu.ntust.connectivitylab.jojllman.kura.gativity.*</Private-Package>+
2828
<Import-Package>
2929
javax.net,
3030
javax.net.ssl,

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/GatewayServiceActivator.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/GatewayServiceActivator.java

+8-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity;
22

33
import org.eclipse.paho.client.mqttv3.IMqttActionListener;
44
import org.eclipse.paho.client.mqttv3.IMqttToken;
@@ -9,22 +9,20 @@
99
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
1010
import org.osgi.framework.BundleContext;
1111
import org.osgi.framework.ServiceReference;
12-
import org.osgi.framework.ServiceRegistration;
1312
import org.osgi.service.component.ComponentContext;
1413
import org.osgi.service.http.HttpService;
1514
import org.osgi.util.tracker.ServiceTracker;
1615
import org.osgi.util.tracker.ServiceTrackerCustomizer;
1716
import org.slf4j.Logger;
1817
import org.slf4j.LoggerFactory;
1918

20-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST.RESTApplication;
21-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST.RESTServlet;
22-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access.AccessControlManager;
23-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access.GroupManager;
24-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access.UserManager;
25-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.DeviceManager;
26-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.discovery.DeviceDiscovery;
27-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.event.EventManager;
19+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST.RESTApplication;
20+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST.RESTServlet;
21+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access.AccessControlManager;
22+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access.GroupManager;
23+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access.UserManager;
24+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.DeviceManager;
25+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.discovery.DeviceDiscovery;
2826

2927
import java.util.Dictionary;
3028
import java.util.Hashtable;
@@ -36,7 +34,6 @@ public class GatewayServiceActivator {
3634
private DeviceDiscovery m_deviceDiscovery;
3735
private DeviceManager m_deviceManager;
3836
private AccessControlManager m_accessManager;
39-
private EventManager m_eventManager;
4037
private GroupManager m_groupManager;
4138
private UserManager m_userManager;
4239
private BundleContext _context;
@@ -169,12 +166,10 @@ public void onFailure(IMqttToken arg0, Throwable arg1) {
169166
m_deviceDiscovery = new DeviceDiscovery();
170167
m_deviceManager = new DeviceManager();
171168
m_accessManager = new AccessControlManager();
172-
m_eventManager = new EventManager();
173169
m_groupManager = new GroupManager();
174170
m_userManager = new UserManager();
175171

176172
m_deviceManager.setAccessControlManager(m_accessManager);
177-
m_eventManager.setDeviceManager(m_deviceManager);
178173
m_accessManager.setDeviceManager(m_deviceManager);
179174

180175
m_userManager.addUser("bpi", "123456789");
@@ -194,7 +189,6 @@ protected void deactivate(ComponentContext componentContext) {
194189
m_deviceDiscovery = null;
195190
m_deviceManager = null;
196191
m_accessManager = null;
197-
m_eventManager = null;
198192
m_groupManager = null;
199193
m_userManager = null;
200194
_tracker.remove(_tracker.getServiceReference());
@@ -208,7 +202,6 @@ protected void update(ComponentContext componentContext) {
208202
m_deviceDiscovery = null;
209203
m_deviceManager = null;
210204
m_accessManager = null;
211-
m_eventManager = null;
212205
m_groupManager = null;
213206
m_userManager = null;
214207

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/REST/HTTPHeaderNames.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/REST/HTTPHeaderNames.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST;
22

33
public interface HTTPHeaderNames {
44

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/REST/RESTApplication.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/REST/RESTApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST;
22

33
import java.util.HashSet;
44
import java.util.Set;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/REST/RESTRequestFilter.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/REST/RESTRequestFilter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST;
22

3-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access.Authenticator;
3+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access.Authenticator;
44

55
import java.io.IOException;
66
import java.util.logging.Logger;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/REST/RESTResource.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/REST/RESTResource.java

+5-115
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
5-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access.*;
6-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.DeviceManager;
7-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.IDeviceProfile;
8-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.TopicChannel;
9-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.event.Event;
10-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.event.EventManager;
5+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access.*;
6+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.DeviceManager;
7+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.IDeviceProfile;
8+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.TopicChannel;
119

1210
import java.security.GeneralSecurityException;
13-
import java.util.Iterator;
1411
import java.util.List;
15-
import java.util.Map;
1612
import javax.ejb.Stateless;
1713
import javax.json.Json;
1814
import javax.json.JsonArrayBuilder;
@@ -235,58 +231,6 @@ public Response queryDeviceList(HttpHeaders httpHeaders) {
235231
return getNoCacheResponseBuilder(Response.Status.OK).entity(jsonObj.toString()).build();
236232
}
237233

238-
@Override
239-
public Response queryEventList(HttpHeaders httpHeaders) {
240-
User caller = Authenticator.getInstance().
241-
getAuthenticatedUser(
242-
httpHeaders.getHeaderString(HTTPHeaderNames.SERVICE_KEY),
243-
httpHeaders.getHeaderString(HTTPHeaderNames.AUTH_TOKEN));
244-
245-
JsonObjectBuilder jsonObjBuilder = Json.createObjectBuilder();
246-
JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
247-
s_logger.debug("Query event list");
248-
if (caller.isAdministrator()) {
249-
Map<String, List<Event>> userEvents = EventManager.getInstance().getAllEvents();
250-
Iterator<Map.Entry<String, List<Event>>> it = userEvents.entrySet().iterator();
251-
while (it.hasNext()) {
252-
s_logger.debug("Has events");
253-
JsonArrayBuilder eventJsonArrayBuilder = Json.createArrayBuilder();
254-
Map.Entry<String, List<Event>> entry = it.next();
255-
String userid = entry.getKey();
256-
User user = UserManager.getInstance().findUserById(userid);
257-
List<Event> events = entry.getValue();
258-
for (Event event : events) {
259-
eventJsonArrayBuilder.add(Json.createObjectBuilder()
260-
.add("name", event.getEventName())
261-
.add("id", event.getEventId())
262-
.add("if", event.getIfString())
263-
.add("then", event.getThenString())
264-
.add("repeat", event.isRepeat())
265-
.add("period", event.getPeriod())
266-
.add("active", event.isActive()));
267-
}
268-
jsonArrayBuilder.add(Json.createObjectBuilder()
269-
.add("user_id", userid)
270-
.add("events", eventJsonArrayBuilder));
271-
}
272-
} else {
273-
List<Event> events = EventManager.getInstance().getUserEvents(caller.getUserId());
274-
JsonArrayBuilder eventJsonArrayBuilder = Json.createArrayBuilder();
275-
for (Event event : events) {
276-
eventJsonArrayBuilder.add(Json.createObjectBuilder()
277-
.add("name", event.getEventId())
278-
.add("if", event.getIfString())
279-
.add("then", event.getThenString()));
280-
}
281-
jsonArrayBuilder.add(Json.createObjectBuilder()
282-
.add("user_id", caller.getUserId())
283-
.add("events", eventJsonArrayBuilder));
284-
}
285-
jsonObjBuilder.add("user_events", jsonArrayBuilder);
286-
JsonObject jsonObj = jsonObjBuilder.build();
287-
return getNoCacheResponseBuilder(Response.Status.OK).entity(jsonObj.toString()).build();
288-
}
289-
290234
@Override
291235
public Response writeChannelData(HttpHeaders httpHeaders, String channelId, String type, String value) {
292236
User caller = Authenticator.getInstance().
@@ -672,60 +616,6 @@ public Response getChannelGroup(HttpHeaders httpHeaders, String channelId) {
672616
return null;
673617
}
674618

675-
@Override
676-
public Response addEvent(HttpHeaders httpHeaders,
677-
String eventName,
678-
String ifString,
679-
String thenString,
680-
String repeat,
681-
String period) {
682-
User caller = Authenticator.getInstance().
683-
getAuthenticatedUser(
684-
httpHeaders.getHeaderString(HTTPHeaderNames.SERVICE_KEY),
685-
httpHeaders.getHeaderString(HTTPHeaderNames.AUTH_TOKEN));
686-
687-
boolean repeatVal;
688-
if(repeat == null)
689-
repeatVal = false;
690-
else
691-
repeatVal = Boolean.valueOf(repeat);
692-
693-
int periodVal;
694-
if(period == null)
695-
periodVal = 1000;
696-
else
697-
periodVal = Integer.valueOf(period);
698-
699-
Event event = new Event(eventName, ifString, thenString, repeatVal, periodVal);
700-
//TODO: Access control
701-
String eventId = EventManager.getInstance().addEvent(caller.getUserId(), event);
702-
703-
JsonObjectBuilder jsonObjBuilder = Json.createObjectBuilder();
704-
jsonObjBuilder.add("message", "event has been added");
705-
jsonObjBuilder.add("event_id", eventId);
706-
JsonObject jsonObj = jsonObjBuilder.build();
707-
return getNoCacheResponseBuilder(Response.Status.ACCEPTED).entity(jsonObj.toString()).build();
708-
}
709-
710-
@Override
711-
public Response removeEvent(HttpHeaders httpHeaders, String eventId) {
712-
User caller = Authenticator.getInstance().
713-
getAuthenticatedUser(
714-
httpHeaders.getHeaderString(HTTPHeaderNames.SERVICE_KEY),
715-
httpHeaders.getHeaderString(HTTPHeaderNames.AUTH_TOKEN));
716-
717-
if(EventManager.getInstance().doesUserHasEvent(caller.getUserId(), eventId)) {
718-
EventManager.getInstance().removeEvent(caller.getUserId(),
719-
EventManager.getInstance().getUserEvent(caller.getUserId(), eventId));
720-
JsonObjectBuilder jsonObjBuilder = Json.createObjectBuilder();
721-
jsonObjBuilder.add("message", "event has been removed");
722-
JsonObject jsonObj = jsonObjBuilder.build();
723-
return getNoCacheResponseBuilder(Response.Status.ACCEPTED).entity(jsonObj.toString()).build();
724-
}
725-
726-
return null;
727-
}
728-
729619
@Override
730620
public Response logout(
731621
HttpHeaders httpHeaders) {

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/REST/RESTResourceProxy.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/REST/RESTResourceProxy.java

+1-22
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST;
22

33
import java.io.Serializable;
4-
import javax.ejb.Local;
54
import javax.ws.rs.FormParam;
65
import javax.ws.rs.GET;
76
import javax.ws.rs.POST;
@@ -58,11 +57,6 @@ public Response login(
5857
@Produces(MediaType.APPLICATION_JSON)
5958
public Response queryDeviceList(@Context HttpHeaders httpHeaders);
6059

61-
@GET
62-
@Path("/query-event-list")
63-
@Produces(MediaType.APPLICATION_JSON)
64-
public Response queryEventList(@Context HttpHeaders httpHeaders);
65-
6660
@POST
6761
@Path("/write-channel-data")
6862
@Produces(MediaType.APPLICATION_JSON)
@@ -168,21 +162,6 @@ public Response setChannelGroup(@Context HttpHeaders httpHeaders,
168162
public Response getChannelGroup(@Context HttpHeaders httpHeaders,
169163
@FormParam("channel_id") String channelId);
170164

171-
@POST
172-
@Path("/add-event")
173-
@Produces(MediaType.APPLICATION_JSON)
174-
public Response addEvent(@Context HttpHeaders httpHeaders,
175-
@FormParam("name") String eventName,
176-
@FormParam("if") String ifString,
177-
@FormParam("then") String thenString,
178-
@FormParam("repeat") String repeat,
179-
@FormParam("period") String period);
180-
181-
@POST
182-
@Path("/remove-event")
183-
@Produces(MediaType.APPLICATION_JSON)
184-
public Response removeEvent(@Context HttpHeaders httpHeaders,
185-
@FormParam("event_id") String eventId);
186165

187166
@POST
188167
@Path("/logout")

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/REST/RESTResponseFilter.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/REST/RESTResponseFilter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST;
22

33
import java.io.IOException;
44
import java.util.logging.Logger;
55
import javax.ws.rs.container.ContainerRequestContext;
66
import javax.ws.rs.container.ContainerResponseContext;
77
import javax.ws.rs.container.ContainerResponseFilter;
88
import javax.ws.rs.container.PreMatching;
9-
import javax.ws.rs.core.Response;
109
import javax.ws.rs.ext.Provider;
1110

1211
@Provider

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/REST/RESTServlet.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/REST/RESTServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.REST;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.REST;
22

33
import javax.servlet.ServletConfig;
44
import javax.servlet.ServletException;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/access/AccessControlManager.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/access/AccessControlManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access;
22

33
import java.util.*;
44

55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
77

8-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.DeviceManager;
9-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.IDeviceProfile;
10-
import tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.device.TopicChannel;
8+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.DeviceManager;
9+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.IDeviceProfile;
10+
import tw.edu.ntust.connectivitylab.jojllman.kura.gativity.device.TopicChannel;
1111

1212
public class AccessControlManager {
1313
private static final Logger s_logger = LoggerFactory.getLogger(AccessControlManager.class);

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/access/Authenticator.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/access/Authenticator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access;
22

33
import java.util.*;
44
import java.security.GeneralSecurityException;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/access/Group.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/access/Group.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/access/GroupManager.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/access/GroupManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/access/Permission.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/access/Permission.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/access/SessionIdentifierGenerator.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/access/SessionIdentifierGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access;
22

33
import java.security.SecureRandom;
44
import java.math.BigInteger;

‎src/tw/edu/ntust/connectivitylab/jojllman/kura/iotgateway/access/User.java ‎src/tw/edu/ntust/connectivitylab/jojllman/kura/gativity/access/User.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
package tw.edu.ntust.connectivitylab.jojllman.kura.iotgateway.access;
1+
package tw.edu.ntust.connectivitylab.jojllman.kura.gativity.access;
22

3-
import org.apache.commons.net.util.Base64;
43
import org.slf4j.Logger;
54
import org.slf4j.LoggerFactory;
65

7-
import javax.crypto.SecretKey;
8-
import javax.crypto.SecretKeyFactory;
9-
import javax.crypto.spec.PBEKeySpec;
10-
import java.security.SecureRandom;
116
import java.util.ArrayList;
127
import java.util.List;
138

0 commit comments

Comments
 (0)