change some nullity Decorators

Author: isac322

src/main/java/com/bhyoo/onedrive/container/facet/FolderFacet.java

@@ -17,9 +17,10 @@
  */
 public class FolderFacet {
 	@Getter protected final long childCount;
-	@Getter protected final @NotNull FolderViewFacet view;
+	// Nullable on onedrive for business
+	@Getter protected final @Nullable FolderViewFacet view;
 
-	protected FolderFacet(@NotNull Long childCount, @NotNull FolderViewFacet view) {
+	protected FolderFacet(@NotNull Long childCount, @Nullable FolderViewFacet view) {
 		this.childCount = childCount;
 		this.view = view;
 	}
@@ -45,7 +46,6 @@ public static FolderFacet deserialize(@NotNull JsonParser parser) throws IOExcep
 		}
 
 		assert childCount != null : "childCount is null";
-		assert view != null : "view is null";
 
 		return new FolderFacet(childCount, view);
 	}

src/main/java/com/bhyoo/onedrive/container/items/AbstractDriveItem.java

@@ -508,7 +508,8 @@ else if (folder.pathPointer != null)
 	}
 
 	@Override
-	public @NotNull AsyncJobMonitor copyTo(@NotNull BasePointer dest, @NotNull String newName) throws ErrorResponseException {
+	public @NotNull AsyncJobMonitor copyTo(@NotNull BasePointer dest, @NotNull String newName)
+			throws ErrorResponseException {
 		return client.copyItem(idPointer, dest, newName);
 	}
 
@@ -518,7 +519,8 @@ else if (folder.pathPointer != null)
 	}
 
 	@Override
-	public @NotNull AsyncJobMonitor copyTo(@NotNull String destId, @NotNull String newName) throws ErrorResponseException {
+	public @NotNull AsyncJobMonitor copyTo(@NotNull String destId, @NotNull String newName)
+			throws ErrorResponseException {
 		return client.copyItem(this.id, destId, newName);
 	}
 
@@ -560,7 +562,9 @@ public void moveTo(@NotNull BasePointer pointer) throws ErrorResponseException {
 
 
 	@Override
-	public final @NotNull ItemReference newReference() {return new ItemReference(getDriveId(), id, pathPointer);}
+	public final @NotNull ItemReference newReference() {
+		return new ItemReference(getDriveId(), parentReference.driveType, id, pathPointer);
+	}
 
 
 

src/main/java/com/bhyoo/onedrive/container/items/ItemReference.java

@@ -25,15 +25,27 @@
 @EqualsAndHashCode(of = {"id", "driveId"})
 public class ItemReference {
 	@Getter protected @NotNull String driveId;
-	@Getter protected @Nullable DriveType driveType;
+	@Getter protected @NotNull DriveType driveType;
+	/**
+	 * only null when root directory
+ 	 */
 	@Getter protected @Nullable String id;
+	/**
+	 * only null on Business version
+	 */
 	@Getter protected @Nullable String name;
+	/**
+	 * only null when root directory
+	 */
 	@Getter protected @Nullable PathPointer pathPointer;
+	/**
+	 * only null when root directory
+	 */
 	@Getter protected @Nullable String rawPath;
 	@Getter protected @Nullable String shareId;
 	@Getter protected @Nullable SharePointIdsFacet sharepointIds;
 
-	protected ItemReference(@NotNull String driveId, @Nullable DriveType driveType, @Nullable String id,
+	protected ItemReference(@NotNull String driveId, @NotNull DriveType driveType, @Nullable String id,
 							@Nullable String name, @Nullable String rawPath, @Nullable String shareId,
 							@Nullable SharePointIdsFacet sharepointIds) {
 		this.driveId = driveId;
@@ -49,8 +61,10 @@ protected ItemReference(@NotNull String driveId, @Nullable DriveType driveType,
 		}
 	}
 
-	ItemReference(@NotNull String driveId, @Nullable String id, @Nullable PathPointer pathPointer) {
+	ItemReference(@NotNull String driveId, @NotNull DriveType driveType,
+				  @Nullable String id, @Nullable PathPointer pathPointer) {
 		this.driveId = driveId;
+		this.driveType = driveType;
 		this.id = id;
 		this.pathPointer = pathPointer;
 
@@ -101,6 +115,7 @@ public static ItemReference deserialize(@NotNull JsonParser parser) throws IOExc
 		}
 
 		assert driveId != null : "driveId is null";
+		assert driveType != null : "driveType is null";
 
 		return new ItemReference(driveId, driveType, id, name, rawPath, shareId, sharepointIds);
 	}