13: Make complex types available in client(s)

Task-Url: #13

classifier/client/src/main/java/mobi/openddr/classifier/Classifier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,8 +106,8 @@ public Map<String, String> classify(String text) {
 			return null;
 		}
 
-		Set<String> hitPatterns = new HashSet<String>();
-		Set<DeviceType> hitDevices = new HashSet<DeviceType>();
+		Set<String> hitPatterns = new HashSet<>();
+		Set<DeviceType> hitDevices = new HashSet<>();
 		DeviceType winner = null;
 		Pattern winnerPattern = null;
 		LOG.log(Level.FINE, "classify: ''{0}''", text);
@@ -163,7 +163,7 @@ public Map<String, String> classify(String text) {
 		if (winner != null) {
 			LOG.log(Level.FINE, "Result: {0}", winner);
 
-			UserAgent userAgent = UserAgent.of(text);
+			final UserAgent userAgent = UserAgent.of(text);
 			LOG.log(Level.FINE, "User Agent: {0}", userAgent);
 			return adjustFromUserAgent(winner, userAgent).getAttributes();
 		} else {

classifier/client/src/main/java/mobi/openddr/classifier/ClassifierBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/DeviceAdjuster.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
 /**
  * @author Werner Keil
- * @version 1.1
+ * @version 1.2
  */
 abstract class DeviceAdjuster {
 	private static final Logger LOG = Logger.getLogger(DeviceAdjuster.class.getName());
@@ -50,7 +50,7 @@ static final DeviceType adjustFromUserAgent(final DeviceType device, final UserA
 		Map<String, String> attributes;
 		if (device.isLocked()) {
 			// clone map
-			attributes = new HashMap<String, String>();
+			attributes = new HashMap<>();
 
 			attributes.putAll(device.getAttributes());
 		} else {

classifier/client/src/main/java/mobi/openddr/classifier/DeviceHints.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/Loader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/LoaderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/LoaderOption.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/Resource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/impl/DDRLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/impl/FileResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/impl/JarResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/impl/NoopLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/impl/URLResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/loader/impl/UninitializedLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/model/Device.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 /**
  * @author Werner Keil
- * @version 1.1
+ * @version 1.2
  */
 public class Device {
     public static final String UNKNOWN_ID = "unknown";
@@ -30,32 +30,32 @@ public class Device {
     private final Map<String, String> attributes;
 
     public Device(String id, Map<String, String> attributes) {
-	this.id = id;
-	this.attributes = attributes;
+    	this.id = id;
+    	this.attributes = attributes;
     }
 
     @Override
     public String toString() {
-	StringBuilder sb = new StringBuilder();
-
-	sb.append('{');
-	sb.append(JsonParser.outputKeyValue("id", id)).append(',');
-	sb.append(JsonParser.outputString("attributes")).append(':')
-		.append(JsonParser.outputMap(attributes));
-	sb.append('}');
-
-	return sb.toString();
+		final StringBuilder sb = new StringBuilder();
+	
+		sb.append('{');
+		sb.append(JsonParser.outputKeyValue("id", id)).append(',');
+		sb.append(JsonParser.outputString("attributes")).append(':')
+			.append(JsonParser.outputMap(attributes));
+		sb.append('}');
+	
+		return sb.toString();
     }
 
     public String getId() {
-	return id;
+    	return id;
     }
 
     public String getAttribute(String key) {
-	return attributes.get(key);
+    	return attributes.get(key);
     }
 
     public Map<String, String> getAttributes() {
-	return attributes;
+    	return attributes;
     }
 }

classifier/client/src/main/java/mobi/openddr/classifier/model/DeviceType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/model/UserAgent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/parser/JsonParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/parser/Pattern.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/parser/PatternSet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/client/src/main/java/mobi/openddr/classifier/parser/XMLParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

classifier/console/src/main/java/mobi/openddr/classifier/console/ClassifierConsole.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
 /**
  * @author Werner Keil
  * @author Reza Naghibi
- * @version 1.3
+ * @version 1.4
  */
 public class ClassifierConsole {
 	private static final String APP_NAME = "OpenDDR Classifier Console";
@@ -230,10 +230,10 @@ public static void main(String[] args) throws Exception {
 	}
 
 	private static void map(Classifier client, String text) {
-		StopWatch stopWatch = new StopWatch();
+		final StopWatch stopWatch = new StopWatch();
 		stopWatch.start();
 
-		Device device = client.classifyDevice(text);
+		final Device device = client.classifyDevice(text);
 		stopWatch.stop();
 		String deviceId = "unknown";
 		if (device != null) {

pom.xml

@@ -151,7 +151,7 @@
 						<header>src/license/header.txt</header>
 						<properties>
 							<owner>OpenDDR LLC and others</owner>
-							<currentYear>2017</currentYear>
+							<currentYear>2019</currentYear>
 						</properties>
 						<excludes>
 							<exclude>**/*.adoc</exclude>

simple/src/main/java/mobi/openddr/simple/DDRService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/VocabularyHolder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/VocabularyService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/Builder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/AndroidMobileBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/BlackBerryBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/ChromeBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/ChromeMobileBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/DefaultBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/DolfinBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/FennecBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/FirefoxBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/HintedResolutionBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/IEMobileBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/InternetExplorerBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/JasmineBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simple/src/main/java/mobi/openddr/simple/builder/browser/KonquerorBrowserBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2019 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.